Move error handling into separate package.

3 files changed, 51 insertions, 0 deletions

diff --git a/gn_auth/errors/http/__init__.py b/gn_auth/errors/http/__init__.py
new file mode 100644
index 0000000..f4164d1
--- /dev/null
+++ b/gn_auth/errors/http/__init__.py
@@ -0,0 +1,13 @@
+"""HTTP error handlers."""
+
+from .http_4xx_errors import http_4xx_error_handlers
+from .http_5xx_errors import http_5xx_error_handlers
+
+__all__ = ["http_error_handlers"]
+
+def http_error_handlers() -> dict:
+    """Return *ALL* HTTP error handlers."""
+    return {
+        **http_4xx_error_handlers(),
+        **http_5xx_error_handlers()
+    }
diff --git a/gn_auth/errors/http/http_4xx_errors.py b/gn_auth/errors/http/http_4xx_errors.py
new file mode 100644
index 0000000..704f11b
--- /dev/null
+++ b/gn_auth/errors/http/http_4xx_errors.py
@@ -0,0 +1,31 @@
+"""Handlers for HTTP 4** errors"""
+import logging
+from werkzeug.exceptions import NotFound
+
+from flask import request, jsonify, render_template
+
+from gn_auth.errors.tracing import add_trace
+
+__all__ = ["http_4xx_error_handlers"]
+
+logger = logging.getLogger(__name__)
+
+def page_not_found(exc):
+    """404 handler."""
+    logger.error("Page '%s' was not found.", request.url, exc_info=True)
+    content_type = request.content_type
+    if bool(content_type) and content_type.lower() == "application/json":
+        return jsonify(add_trace(exc, {
+            "error": exc.name,
+            "error_description": (f"The page '{request.url}' does not exist on "
+                                  "this server.")
+        })), exc.code
+
+    return render_template("404.html", page=request.url), exc.code
+
+
+def http_4xx_error_handlers() -> dict:
+    """Return handlers for HTTP errors in the 400-499 range"""
+    return {
+        NotFound: page_not_found
+    }
diff --git a/gn_auth/errors/http/http_5xx_errors.py b/gn_auth/errors/http/http_5xx_errors.py
new file mode 100644
index 0000000..71d09d8
--- /dev/null
+++ b/gn_auth/errors/http/http_5xx_errors.py
@@ -0,0 +1,7 @@
+"""Handlers for HTTP 5** errors."""
+
+__all__ = ["http_5xx_error_handlers"]
+
+def http_5xx_error_handlers() -> dict:
+    """Return handlers for HTTP errors in the 500-599 range"""
+    return {}