GNServer 0.0.0.0.10__tar.gz → 0.0.0.0.11__tar.gz

{gnserver-0.0.0.0.10 → gnserver-0.0.0.0.11}/GNServer/GNServer/_app.py

@@ -158,8 +158,31 @@ def extract_template_vars(filedata: bytes, mime: str) -> List[str]:
     return list(set(m.group(1) for m in TPL_VAR_RE.finditer(text)))
 
 
+import re
+from urllib.parse import urlparse
 
-
+def resolve_cors(origin_url: str, rules: list[str]) -> bool:
+    origin = origin_url.rstrip("/")
+    parsed = urlparse(origin)
+    
+    for rule in rules:
+        rule = rule.rstrip("/")
+        if rule.startswith("!"):
+            pattern = rule[1:]
+            if re.match(pattern, origin):
+                return True
+        elif "*" in rule:
+            r = urlparse(rule.replace("*.", ""))
+            if r.scheme and r.scheme != parsed.scheme:
+                continue
+            regex = "^" + re.escape(rule).replace("\\*", "[^.]+") + "$"
+            if re.match(regex, origin):
+                return True
+        else:
+            if origin == rule:
+                return True
+    
+    return False
 
 
 
@@ -307,6 +330,14 @@ class App:
             if r.method != method:
                 continue
 
+            if r.cors is not None:
+                if request._origin is None:
+                    return gn.GNResponse("gn:backend:801", {'error': 'Cors error. Route has cors but request has no origin url.'})
+                if not resolve_cors(request._origin, r.cors._allow_origins):
+                    return gn.GNResponse("gn:backend:802", {'error': 'Cors error: origin'})
+                if request.method not in r.cors._allow_methods:
+                    return gn.GNResponse("gn:backend:803", {'error': 'Cors error: method'})
+
             sig = inspect.signature(r.handler)
             def _ann(name: str):
                 param = sig.parameters.get(name)
@@ -331,10 +362,18 @@ class App:
 
             result = await r.handler(**kw)
             if isinstance(result, gn.GNResponse):
+                if result._cors is not None and result._cors != r.cors:
+                    if request._origin is None:
+                        return gn.GNResponse("gn:backend:801", {'error': 'Cors error. Route has cors but request has no origin url.'})
+                    if not resolve_cors(request._origin, r.cors._allow_origins):
+                        return gn.GNResponse("gn:backend:802", {'error': 'Cors error: origin'})
+                    if request.method not in r.cors._allow_methods:
+                        return gn.GNResponse("gn:backend:803", {'error': 'Cors error: method'})
                 return result
-            raise TypeError(
-                f"{r.handler.__name__} returned {type(result)}; GNResponse expected"
-            )
+            else:
+                raise TypeError(
+                    f"{r.handler.__name__} returned {type(result)}; GNResponse expected"
+                )
 
         if allowed:
             return gn.GNResponse("gn:backend:405", {'error': 'Method Not Allowed'})

{gnserver-0.0.0.0.10 → gnserver-0.0.0.0.11}/GNServer/GNServer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.10
+Version: 0.0.0.0.11
 Summary: GNServer
 Home-page: https://github.com/KeyisB/libs/tree/main/GNServer
 Author: KeyisB

{gnserver-0.0.0.0.10 → gnserver-0.0.0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.10
+Version: 0.0.0.0.11
 Summary: GNServer
 Home-page: https://github.com/KeyisB/libs/tree/main/GNServer
 Author: KeyisB

{gnserver-0.0.0.0.10 → gnserver-0.0.0.0.11}/setup.py

@@ -5,7 +5,7 @@ filesName = 'GNServer'
 
 setup(
     name=name,
-    version='0.0.0.0.10',
+    version='0.0.0.0.11',
     author="KeyisB",
     author_email="keyisb.pip@gmail.com",
     description=name,