clear-skies 1.18.7__tar.gz → 1.18.8__tar.gz

{clear_skies-1.18.7 → clear_skies-1.18.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.18.7
+Version: 1.18.8
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.18.7 → clear_skies-1.18.8}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.18.7"
+version = "1.18.8"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

clear_skies-1.18.8/src/clearskies/column_types/created_by_authorization_data.py

@@ -0,0 +1,26 @@
+from .string import String
+
+
+class CreatedByAuthorizationData(String):
+    required_configs = [
+        "authorization_data_key_name",
+    ]
+
+    def __init__(self, di):
+        super().__init__(di)
+
+    @property
+    def is_writeable(self):
+        return False
+
+    def pre_save(self, data, model):
+        if model.exists:
+            return data
+
+        authorization_data = self.di.build("input_output", cache=True).get_authorization_data()
+        # data comes last so that it can override the info in the authorization data.  This seems counter-intuitive,
+        # but is important.  You would think that you *don't* want the data from the authorization data to be
+        # overridden (since this is mainly used for logging), but the trouble is that there are a variety of use-cases
+        # where the application must provide the audit data.  Examples include registration and login.  In these
+        # cases, authorization data will be empty, and must be provided by the applicaiton.
+        return {self.name: authorization_data.get(self.config("authorization_data_key_name"), "N/A"), **data}

{clear_skies-1.18.7 → clear_skies-1.18.8}/src/clearskies/handlers/simple_routing_route.py

@@ -1,9 +1,13 @@
+import logging
 import urllib.parse
 import re
+import json
 from ..autodoc.request import URLPath
 from ..autodoc.schema import String
 from . import simple_routing
 
+logger = logging.getLogger(__name__)
+
 
 class SimpleRoutingRoute:
     _di = None
@@ -91,26 +95,45 @@ class SimpleRoutingRoute:
         to understand if there was no route match at all.
         """
         # if we're routing to a simple router then defer to it
+        incoming = f"Incoming request: [{request_method}] {full_path}.  Check against route with url '{self._path}' "
+        if not self._methods:
+            incoming += " configured for any method except OPTIONS"
+        elif isinstance(self._methods, str):
+            incoming += f" with method '{self._methods}'"
+        else:
+            incoming += " with any of the following methods: " + ", ".join(self._methods)
         if self._routes_to_simple_routing:
             return self._handler.can_handle(full_path, request_method, is_cors=is_cors)
         # If we're routing for CORS then ignore the request method (since it won't match)
         if not is_cors and self._methods is not None and request_method not in self._methods:
+            logger.debug(
+                f"{incoming} Skipped because this route is not specifically configured for CORS, and this is an OPTIONS request."
+            )
             return None
         if self._resource_paths:
-            return self._resource_path_match(full_path, self._path_parts, self._resource_paths)
+            results = self._resource_path_match(full_path, self._path_parts, self._resource_paths)
+            if not results:
+                logger.debug(f"{incoming} Not a match.")
+            else:
+                logger.debug(f"{incoming} Matched and extracted route data: " + json.dumps(results))
+            return results
         if self._path is not None:
             full_path = full_path.strip("/")
             my_path = self._path.strip("/")
             my_path_length = len(my_path)
             full_path_length = len(full_path)
             if my_path_length > full_path_length:
+                logger.debug(f"{incoming} Not a match. I'm too long to bother checking.")
                 return None
             if full_path[:my_path_length] != my_path:
+                logger.debug(f"{incoming} Not a match.  Our prefixes just don't match.")
                 return None
             # make sure we don't get confused by partial matches.  `user` should match `user/` and `user/5`,
             # but it shouldn't match `users/`
             if full_path_length > my_path_length and full_path[my_path_length] != "/":
+                logger.debug(f"{incoming} Not a match.  I only partially matched the URL but not as a sub-directory.")
                 return None
+        logger.debug(f"{incoming} Match!")
         return {}
 
     def _resource_path_match(self, requested_path, path_parts, resource_paths):

clear_skies-1.18.7/src/clearskies/column_types/created_by_authorization_data.py

@@ -1,21 +0,0 @@
-from .string import String
-
-
-class CreatedByAuthorizationData(String):
-    required_configs = [
-        "authorization_data_key_name",
-    ]
-
-    def __init__(self, di):
-        super().__init__(di)
-
-    @property
-    def is_writeable(self):
-        return False
-
-    def pre_save(self, data, model):
-        if model.exists:
-            return data
-
-        authorization_data = self.di.build("input_output", cache=True).get_authorization_data()
-        return {**data, self.name: authorization_data.get(self.config("authorization_data_key_name"), "N/A")}