GNServer 0.0.0.0.55__py3-none-any.whl → 0.0.0.0.57__py3-none-any.whl

GNServer/_app.py

@@ -35,15 +35,12 @@ except ImportError:
     print("uvloop не установлен")
 
 
-
-
-
 import logging
 
 logger = logging.getLogger("GNServer")
 logger.setLevel(logging.DEBUG)
 
-console = logging.StreamHandler()
+console = logging.StreamHandler(sys.stdout)
 console.setLevel(logging.DEBUG)
 console.setFormatter(logging.Formatter("[GNServer] %(name)s: %(levelname)s: %(message)s"))
 logger.addHandler(console)
@@ -335,6 +332,8 @@ class App:
                     logger.debug(f'Пакет отклонен: mode пакета {mode}. Разрешен 1, 2, 4')
                     return
                 
+                stream_id = event.stream_id
+
                 if not stream: # если не стрим, то ждем конец quic стрима и запускаем обработку ответа
                     if event.end_stream:
                             
@@ -344,13 +343,17 @@ class App:
                             domain = None
                         
                         if buf is not None:
-                            request = GNRequest.deserialize(buf, mode)
-                            if domain is not None:
-                                request.client._data['domain'] = domain
+                            try:
+                                request = GNRequest.deserialize(buf, mode)
+                                if domain is not None:
+                                    request.client._data['domain'] = domain
+                            except:
+                                asyncio.create_task(self.sendRawResponse(stream_id, AllGNFastCommands.KDCDecryptRequestFailed().serialize(mode=mode)))
+
                         else:
                             raise Exception('Не удалось расшифровать от KDC')
 
-                        request.stream_id = event.stream_id  # type: ignore
+                        request.stream_id = stream_id   # type: ignore
                         asyncio.create_task(self._handle_request(request, mode))
                         logger.debug(f'Отправлена задача разрешения пакета {request} route -> {request.route}')
 
@@ -456,7 +459,10 @@ class App:
             if self._api._kdc is not None:
                 blob = self._api._kdc.encode(request.client.domain, blob)
 
-            self._quic.send_stream_data(request.stream_id, blob, end_stream=end_stream) # type: ignore
+            await self.sendRawResponse(request.stream_id, blob=blob, end_stream=end_stream)
+
+        async def sendRawResponse(self, stream_id: int, blob: bytes, end_stream: bool = True):
+            self._quic.send_stream_data(stream_id, blob, end_stream=end_stream) # type: ignore
             self.transmit()
 
     def run(

GNServer/models.py

@@ -34,17 +34,24 @@ class KDCObject:
         self._servers_keys_hash_domain[h] = self._kdc_domain
         self._servers_keys_domain_hash[self._kdc_domain] = h
 
-        if servers_keys is None:
-                
+
+        if servers_keys is not None:
+            for i in self._requested_domains:
+                if i in servers_keys:
+                    self._requested_domains.remove(i)
+
+        if len(self._requested_domains) > 0:
             payload = self._requested_domains
             r = await self._client.request(GNRequest('GET', Url(f'gn://{self._kdc_domain}/api/sys/server/keys'), payload=payload))
 
             if not r.command.ok:
+                print(f'ERROR: {r.command} {r.payload}')
                 raise r
             
             servers_keys = r.payload
 
             if servers_keys is None:
+                print(f'ERROR: {r.command} {r.payload}')
                 raise r
 
         self._servers_keys.update(servers_keys)

{gnserver-0.0.0.0.55.dist-info → gnserver-0.0.0.0.57.dist-info}/METADATA

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

{gnserver-0.0.0.0.55.dist-info → gnserver-0.0.0.0.57.dist-info}/RECORD

@@ -1,14 +1,14 @@
 GNServer/__init__.py,sha256=6CMCZlkBO74PW8i8DAri5xz2fYM9EyPH8vdsLYBMmOo,1560
-GNServer/_app.py,sha256=idWLogkGlb6lijUYMjkhViU6ZKMTbQxg7iNmY4uBif0,18782
+GNServer/_app.py,sha256=fXPrxk-YiprBvjYQckAj3oSHLdWlAENPZ6WkqC8bFZ8,19242
 GNServer/_client.py,sha256=IEzben2zZfgpU9DhcnjB9uQLCInllZhdoLTZyM72ldA,32610
 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/models.py,sha256=VjTpxVdSMLG6I_0nabhZihuIyPiQTOiEV4h5m4DXXbw,2852
-gnserver-0.0.0.0.55.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
-gnserver-0.0.0.0.55.dist-info/METADATA,sha256=zlUNwlULV678D4XQaLTGJdTZxUz4inZoPJvPMUOLkZg,830
-gnserver-0.0.0.0.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.55.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.55.dist-info/RECORD,,
+GNServer/models.py,sha256=Te9Fyw-EsMnEZt0TPE9H0Zc_atjq2X94VsLSQH_k1Kk,3145
+gnserver-0.0.0.0.57.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
+gnserver-0.0.0.0.57.dist-info/METADATA,sha256=0-K5kQ60Cyj5nwSYGxHYCa5FvGDJZxU6-PQwaTaE4ks,830
+gnserver-0.0.0.0.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.57.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.57.dist-info/RECORD,,