GNServer 0.0.0.0.43__py3-none-any.whl → 0.0.0.0.45__py3-none-any.whl

GNServer/_app.py

@@ -7,8 +7,7 @@ import asyncio
 import inspect
 import traceback
 import datetime
-from typing import Any, Callable, Dict, List, Optional, Pattern, Tuple, Union, AsyncGenerator
-from dataclasses import dataclass
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union, AsyncGenerator
 from aioquic.asyncio.server import serve
 from aioquic.asyncio.protocol import QuicConnectionProtocol
 from aioquic.quic.configuration import QuicConfiguration
@@ -113,9 +112,6 @@ def guess_type(filename: str) -> str:
 
 
 
-
-
-
 class App:
     def __init__(self):
         self._routes: List[Route] = []
@@ -192,9 +188,6 @@ class App:
                     else:
                         await func()
 
-        
-    
-    
 
 
     async def dispatchRequest(
@@ -214,13 +207,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 +248,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 +323,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/_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.43.dist-info → gnserver-0.0.0.0.45.dist-info}/METADATA

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

{gnserver-0.0.0.0.43.dist-info → gnserver-0.0.0.0.45.dist-info}/RECORD

@@ -1,13 +1,13 @@
 GNServer/__init__.py,sha256=6CMCZlkBO74PW8i8DAri5xz2fYM9EyPH8vdsLYBMmOo,1560
-GNServer/_app.py,sha256=nvK_9w1YtZfE-Xh0K-ebkvVINAx4Fir3NSw7Lbwyaz4,18874
+GNServer/_app.py,sha256=4JCz2-MDKPbzu45iB8tYarYnfr1lP02B0KOrC1sSBP8,17489
 GNServer/_client.py,sha256=jABXjnNJ9o6Mo3jRTW5Qyb-yhgjdH4VnIexwOplJcyg,31867
-GNServer/_cors_resolver.py,sha256=U9IFGN7vpVsEM2smhuf5QGj8vYgs7HeFQwDdzWVVy9c,4832
+GNServer/_cors_resolver.py,sha256=aDxk4ItaEK-6vlDbkno8FJZEjczGEe8vkOui6_kz5-Y,5950
 GNServer/_crt.py,sha256=SOmyX7zBiCY9EhVSekksQtBHgTIZVvdqNZ8Ni-E5Zow,1390
 GNServer/_func_params_validation.py,sha256=pDXRzPVTdPnDHFMMmKd014SConBjFOuaLeJTY0vldlM,11412
 GNServer/_routes.py,sha256=bJnmQ8uEhPVQgy2tTqE5TEIM8aFXV-lVI7c2nG0rQwk,3384
 GNServer/_template_resolver.py,sha256=vdJYb_7PjIeTWq-Clr7jyj7QIvPBxplU7EqeOuMJ64c,1409
-gnserver-0.0.0.0.43.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
-gnserver-0.0.0.0.43.dist-info/METADATA,sha256=24T_ROdMsk676KmLYK89nDqS5HxLMEs-lhn2xOcfRTs,830
-gnserver-0.0.0.0.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.43.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.43.dist-info/RECORD,,
+gnserver-0.0.0.0.45.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
+gnserver-0.0.0.0.45.dist-info/METADATA,sha256=_WEuY_pNTQNaJZ_fVQjgLw5zmcYO44bokVAGKxbj_Ps,830
+gnserver-0.0.0.0.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.45.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.45.dist-info/RECORD,,