Handle more generic error cases

Signed-off-by: Ivan Kanakarakis <[email protected]>

Author: c00kiemon5ter

src/satosa/base.py

@@ -10,6 +10,7 @@
 from satosa import util
 from satosa.response import Redirect
 from satosa.response import BadRequest
+from satosa.response import NotFound
 from .context import Context
 from .exception import SATOSAError
 from .exception import SATOSAAuthenticationError
@@ -268,7 +269,11 @@ def run(self, context):
             }
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
             logger.error(logline)
-            return BadRequest(e.error)
+            generic_error_url = self.config.get("ERROR_URL")
+            if generic_error_url:
+                return Redirect(generic_error_url)
+            else:
+                return BadRequest(e.error)
         except SATOSAMissingStateError as e:
             msg = {
                 "message": "Missing SATOSA State",
@@ -277,8 +282,9 @@ def run(self, context):
             }
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
             logger.error(logline)
-            if self.config.get("ERROR_URL"):
-                return Redirect(self.config.get("ERROR_URL"))
+            generic_error_url = self.config.get("ERROR_URL")
+            if generic_error_url:
+                return Redirect(generic_error_url)
             else:
                 raise
         except SATOSAAuthenticationFlowError as e:
@@ -289,30 +295,43 @@ def run(self, context):
             }
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
             logger.error(logline)
-            if self.config.get("ERROR_URL"):
-                return Redirect(self.config.get("ERROR_URL"))
+            generic_error_url = self.config.get("ERROR_URL")
+            if generic_error_url:
+                return Redirect(generic_error_url)
             else:
                 raise
-        except SATOSANoBoundEndpointError:
-            raise
+        except SATOSANoBoundEndpointError as e:
+            msg = str(e)
+            logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
+            logger.error(logline)
+            return NotFound("The Service or Identity Provider you requested could not be found.")
         except SATOSAError:
             msg = "Uncaught SATOSA error"
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
-            logger.error(logline, exc_info=True)
-            raise
-        except UnknownSystemEntity as err:
-            msg = "configuration error: unknown system entity " + str(err)
+            logger.error(logline)
+            generic_error_url = self.config.get("ERROR_URL")
+            if generic_error_url:
+                return Redirect(generic_error_url)
+            else:
+                raise
+        except UnknownSystemEntity as e:
+            msg = f"Configuration error: unknown system entity: {e}"
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
-            logger.error(logline, exc_info=False)
-            raise
-        except Exception as err:
+            logger.error(logline)
+            generic_error_url = self.config.get("ERROR_URL")
+            if generic_error_url:
+                return Redirect(generic_error_url)
+            else:
+                raise
+        except Exception as e:
             msg = "Uncaught exception"
             logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
-            logger.error(logline, exc_info=True)
-            if self.config.get("ERROR_URL"):
-                return Redirect(self.config.get("ERROR_URL"))
+            logger.error(logline)
+            generic_error_url = self.config.get("ERROR_URL")
+            if generic_error_url:
+                return Redirect(generic_error_url)
             else:
-                raise SATOSAUnknownError("Unknown error") from err
+                raise SATOSAUnknownError("Unknown error") from e
         return resp
 
 

src/satosa/proxy_server.py

@@ -7,13 +7,12 @@
 from cookies_samesite_compat import CookiesSameSiteCompatMiddleware
 
 import satosa
-import satosa.logging_util as lu
 
 from .base import SATOSABase
 from .context import Context
-from .response import ServiceError, NotFound
-from .routing import SATOSANoBoundEndpointError
-from saml2.s_utils import UnknownSystemEntity
+from .response import ServiceError
+from .response import NotFound
+
 
 logger = logging.getLogger(__name__)
 
@@ -160,16 +159,8 @@ def __call__(self, environ, start_response, debug=False):
             if isinstance(resp, Exception):
                 raise resp
             return resp(environ, start_response)
-        except SATOSANoBoundEndpointError as e:
-            msg = str(e)
-            logline = lu.LOG_FMT.format(id=lu.get_session_id(context.state), message=msg)
-            logger.debug(logline)
-            resp = NotFound("The Service or Identity Provider you requested could not be found.")
-            return resp(environ, start_response)
         except Exception as e:
-            if type(e) != UnknownSystemEntity:
-                logline = "{}".format(e)
-                logger.exception(logline)
+            logger.exception(str(e))
             if debug:
                 raise