tina4-python 0.2.114__tar.gz → 0.2.115__tar.gz

{tina4_python-0.2.114 → tina4_python-0.2.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.114
+Version: 0.2.115
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.114 → tina4_python-0.2.115}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.114"
+version = "0.2.115"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.114 → tina4_python-0.2.115}/tina4_python/Router.py

@@ -73,6 +73,7 @@ class Router:
         tina4_python.tina4_current_request["url"] = url
         tina4_python.tina4_current_request["headers"] = headers
 
+        validated = False
         # we can add other methods later but right now we validate posts
         if method in [Constant.TINA4_GET, Constant.TINA4_POST, Constant.TINA4_PUT, Constant.TINA4_PATCH,
                       Constant.TINA4_DELETE]:
@@ -86,7 +87,6 @@ class Router:
                 content = Template.render_twig_template(
                     "errors/403.twig", {"server": {"url": url}})
 
-            validated = False
             # check to see if we have an auth ability
             if "authorization" in headers:
                 token = headers["authorization"].replace("Bearer", "").strip()
@@ -103,12 +103,9 @@ class Router:
                 if tina4_python.tina4_auth.valid(token):
                     validated = True
 
-            if not validated and method != Constant.TINA4_GET:
-                return Response.Response(content, Constant.HTTP_FORBIDDEN, Constant.TEXT_HTML)
-            else:
-                if request["body"] is not None and "formToken" in request["body"]:
-                    request["params"]["formToken"] = request["body"]["formToken"]
-                    del request["body"]["formToken"]
+            if request["body"] is not None and "formToken" in request["body"]:
+                request["params"]["formToken"] = request["body"]["formToken"]
+                del request["body"]["formToken"]
 
         # split URL and extract query string
         url_parts = url.split('?')
@@ -129,16 +126,19 @@ class Router:
                 continue
             Debug("Matching route " + route['route'] + " to " + url, Constant.TINA4_LOG_DEBUG)
             if Router.match(url, route['route']):
-                if "swagger" in route and route["swagger"] is not None and "secure" in route["swagger"]:
-                    if route["swagger"]["secure"] and not validated:
-                        return Response.Response(content, Constant.HTTP_FORBIDDEN, Constant.TEXT_HTML)
+                if not "noauth" in route:
+                    if "secure" in route or ("swagger" in route and route["swagger"] is not None and "secure" in route["swagger"]):
+                        if (("secure" in route and route["secure"]) or ("swagger" in route and route["swagger"] is not None and route["swagger"]["secure"])) and not validated:
+                            return Response.Response(content, Constant.HTTP_FORBIDDEN, Constant.TEXT_HTML)
+                    else:
+                        if not validated:
+                            return Response.Response(content, Constant.HTTP_FORBIDDEN, Constant.TEXT_HTML)
 
                 router_response = route["callback"]
 
-                # Add the inline variables  & construct a Request variable
+                # Add the inline variables & construct a Request variable
                 request["params"].update(Router.variables)
 
-
                 Request.request = request  # Add the request object
                 Request.headers = headers  # Add the headers
                 Request.params = request["params"]
@@ -152,7 +152,6 @@ class Router:
                 Request.transport = request["transport"] if "transport" in request else None
                 Request.asgi_response = request["asgi_response"] if "asgi_response" in request else None
 
-
                 tina4_python.tina4_current_request = Request
 
                 old_stdout = sys.stdout  # Memorize the default stdout stream
@@ -396,3 +395,29 @@ def middleware(middleware, specific_methods=[]):
         return callback
 
     return actual_middleware
+
+def secured():
+    """
+    Makes a route secure - secured vs secure with swagger
+    :return:
+    """
+    def actual_secure(callback):
+        if callback not in tina4_python.tina4_routes:
+            tina4_python.tina4_routes[callback] = {}
+        tina4_python.tina4_routes[callback]["secure"] = True
+        return callback
+
+    return actual_secure
+
+def noauth():
+    """
+    Defines a route with no auth
+    :return:
+    """
+    def actual_noauth(callback):
+        if callback not in tina4_python.tina4_routes:
+            tina4_python.tina4_routes[callback] = {}
+        tina4_python.tina4_routes[callback]["noauth"] = True
+        return callback
+
+    return actual_noauth