clear-skies 1.18.7__py3-none-any.whl → 1.18.8__py3-none-any.whl

{clear_skies-1.18.7.dist-info → clear_skies-1.18.8.dist-info}/METADATA

@@ -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.dist-info → clear_skies-1.18.8.dist-info}/RECORD

@@ -61,7 +61,7 @@ clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR5
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
 clearskies/column_types/column.py,sha256=TCGqtsCEYJr6BHs-PS1yFoUHGIwcx5oTujytNkTAcrk,13243
 clearskies/column_types/created.py,sha256=R8P3egUb7JEHoU_NtbmN9OIwBUHQ0XFi1GoAb5RpSkI,339
-clearskies/column_types/created_by_authorization_data.py,sha256=TBcALV3uchur2Aq9JCRCAihjZrZKc95VZJSIYgY3Ve0,557
+clearskies/column_types/created_by_authorization_data.py,sha256=--1w1TOSo2CMwrpn6Y_iorl2RTqLgG8MbR8k27qreew,1108
 clearskies/column_types/created_by_ip.py,sha256=wwCUoEwHEVGN89x4xP7NJ6QR85Aum6v3JmxofoQrqtg,395
 clearskies/column_types/created_by_user_agent.py,sha256=sSYDRrqSjsCwcYlhF_s9NO-iDww3PaH6aO2ATp_SKGQ,419
 clearskies/column_types/datetime.py,sha256=MuVaeI6FMgevTdgv6djZjlHogs72TC1HTuYdw_6MF2M,3824
@@ -143,7 +143,7 @@ clearskies/handlers/restful_api.py,sha256=1rJ2REX1sTAdbqaRuCclP375agrho4zNNQx6hX
 clearskies/handlers/routing.py,sha256=uWKWcEaiHVqfDebPkQVuG9AS8pOixW31wW0yIQ-25Aw,3079
 clearskies/handlers/schema_helper.py,sha256=62644USvFlZu_6tT7rb-k6t_5J3Q0uZsJwP5KREk_WM,4961
 clearskies/handlers/simple_routing.py,sha256=8T4eKLIurZO3ZdIPgi-0pypQp_X4BKkbet_Ymba5br4,9332
-clearskies/handlers/simple_routing_route.py,sha256=C-dDLubkUnAazxAcXoyGxMX4g24Iwz7wX5rf5T8T8kU,7376
+clearskies/handlers/simple_routing_route.py,sha256=bdJh1Py6FhWU8kO_9au0rkjbRUXhafPInskg2tOfnVU,8609
 clearskies/handlers/simple_search.py,sha256=hZ0rMfhS-BB6LTpdl0I53pEUBgbgIwtXvcW_8ZEOZOs,6003
 clearskies/handlers/update.py,sha256=VCZkoID7i5VHq78fkIpjbRdXQ4Z3IuXEE5dfC8z4RZI,4088
 clearskies/handlers/write.py,sha256=VduGtjnFMQOvo3l0t-tUP4PExPJ9JEpuziHsquF08rE,9344
@@ -187,7 +187,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.18.7.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.18.7.dist-info/METADATA,sha256=UhL9HJMycdJjUww9mGxmeUfsI2fPtOuYdlnw1aPuLlw,1366
-clear_skies-1.18.7.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-clear_skies-1.18.7.dist-info/RECORD,,
+clear_skies-1.18.8.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.18.8.dist-info/METADATA,sha256=C2EEmkDNduNK0DI7pww5bcCHX0oEzAkNBn4S3F3FsJQ,1366
+clear_skies-1.18.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+clear_skies-1.18.8.dist-info/RECORD,,

clearskies/column_types/created_by_authorization_data.py

@@ -18,4 +18,9 @@ class CreatedByAuthorizationData(String):
             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")}
+        # 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}

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):