GNServer 0.0.0.0.42__tar.gz → 0.0.0.0.44__tar.gz

{gnserver-0.0.0.0.42 → gnserver-0.0.0.0.44}/GNServer/GNServer/_app.py

@@ -113,9 +113,6 @@ def guess_type(filename: str) -> str:
 
 
 
-
-
-
 class App:
     def __init__(self):
         self._routes: List[Route] = []
@@ -192,9 +189,6 @@ class App:
                     else:
                         await func()
 
-        
-    
-    
 
 
     async def dispatchRequest(
@@ -214,13 +208,7 @@ class App:
             if r.method != method:
                 continue
 
-            if r.cors is not None and r.cors.allow_origins is not None:
-                if request._origin is None:
-                    return 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 GNResponse("gn:backend:802", {'error': 'Cors error: origin'})
-                if r.cors.allow_methods is not None and request.method not in r.cors.allow_methods and '*' not in r.cors.allow_methods:
-                    return GNResponse("gn:backend:803", {'error': 'Cors error: method'})
+            _resolve_cors(request, r.cors)
 
             sig = inspect.signature(r.handler)
             def _ann(name: str):
@@ -261,14 +249,8 @@ class App:
                 else:
                     result._cors = r.cors
 
-                if result._cors is not None and result._cors != r.cors and result._cors.allow_origins is not None:
-                    if request._origin is None:
-                        print(result._cors.allow_origins)
-                        return GNResponse("gn:backend:801", {'error': 'Cors error. Route has cors but request has no origin url. [2]'})
-                    if not resolve_cors(request._origin, result._cors.allow_origins):
-                        return GNResponse("gn:backend:802", {'error': 'Cors error: origin'})
-                    if result._cors.allow_methods is not None and request.method not in result._cors.allow_methods and '*' not in result._cors.allow_methods:
-                        return GNResponse("gn:backend:803", {'error': 'Cors error: method'})
+                _resolve_cors(request, result._cors)
+
                 return result
             else:
                 raise TypeError(
@@ -342,8 +324,8 @@ class App:
                 # получаем длинну пакета
                 mode, stream, lenght = GNRequest.type(buf)
 
-                if mode not in (1, 2): # не наш пакет
-                    logger.debug(f'Пакет отклонен: mode пакета {mode}. Разрешен 1, 2')
+                if mode not in (1, 2, 4): # не наш пакет
+                    logger.debug(f'Пакет отклонен: mode пакета {mode}. Разрешен 1, 2, 3')
                     return
                 
                 if not stream: # если не стрим, то ждем конец quic стрима и запускаем обработку ответа

{gnserver-0.0.0.0.42 → gnserver-0.0.0.0.44}/GNServer/GNServer/_client.py

@@ -299,7 +299,7 @@ class AsyncClient:
 
 
 
-    async def isDNSCore(self, domain: str) -> bool:
+    def isDNSCore(self, domain: str) -> bool:
         return domain.endswith(('.core', '.gw', '.gn', '.cdn', '.sys', '.gwis', '.abs'))
 
     @overload

{gnserver-0.0.0.0.42 → gnserver-0.0.0.0.44}/GNServer/GNServer/_cors_resolver.py

@@ -1,8 +1,11 @@
 
 import re
+from typing import Optional
 from urllib.parse import urlparse
+from gnobjects.net.objects import GNRequest, CORSObject
+from gnobjects.net.fastcommands import AllGNFastCommands
 
-def resolve_cors(origin_url: str, rules: list[str]) -> bool:
+def _resolve_cors(origin_url: str, rules: list[str]) -> bool:
     """
     Возвращает origin_url если он матчится хотя бы с одним правилом.
     Правила:
@@ -126,4 +129,28 @@ def _host_matches_pattern(host: str, pattern: str) -> bool:
                 return match(hi + 1, pi + 1)
             return False
 
-    return match(0, 0)
+    return match(0, 0)
+
+
+
+def resolve_cors(request: GNRequest, cors: Optional[CORSObject]):
+    if cors is None:
+        return
+    
+    if request.client.type not in cors.allow_client_types:
+        raise AllGNFastCommands.CorsClientTypeNotAllowed()
+    
+    if cors.allow_origins is not None:
+        if request._origin is None:
+            raise AllGNFastCommands.CorsOriginNotAllowed('Route has cors but request has no origin url')
+
+        if not _resolve_cors(request._origin, cors.allow_origins):
+            raise AllGNFastCommands.CorsOriginNotAllowed()
+
+    if cors.allow_methods is not None:
+        if request.method not in cors.allow_methods:
+            raise AllGNFastCommands.CorsMethodNotAllowed()
+        
+    if cors.allow_transport_protocols is not None:
+        if request.transport in ('gn:quik:real', 'gn:quik:dev') and request.transport not in cors.allow_transport_protocols:
+            raise AllGNFastCommands.CorsTransportProtocolNotAllowed()

{gnserver-0.0.0.0.42 → gnserver-0.0.0.0.44}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.42 → gnserver-0.0.0.0.44}/PKG-INFO

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

{gnserver-0.0.0.0.42 → gnserver-0.0.0.0.44}/setup.py

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