GNServer 0.0.0.0.50__py3-none-any.whl → 0.0.0.0.52__py3-none-any.whl

GNServer/_app.py

@@ -339,10 +339,14 @@ class App:
                     if event.end_stream:
                             
                         if self._api._kdc is not None:
-                            buf = self._api._kdc.decode(buf)
+                            buf, domain = self._api._kdc.decode(buf)
+                        else:
+                            domain = None
                         
                         if buf is not None:
                             request = GNRequest.deserialize(buf, mode)
+                            if domain is not None:
+                                request.client._data['domain'] = domain
                         else:
                             raise Exception('Не удалось расшифровать от KDC')
 
@@ -368,8 +372,12 @@ class App:
                 # формируем запрос
                 
                 if self._api._kdc is not None:
-                    data = self._api._kdc.decode(data)
+                    data, domain = self._api._kdc.decode(data)
+                else:
+                    domain = None
                 request = GNRequest.deserialize(data, mode)
+                if domain is not None:
+                    request.client._data['domain'] = domain
 
                 logger.debug(request, f'event.stream_id -> {event.stream_id}')
 
@@ -446,7 +454,7 @@ class App:
 
 
             if self._api._kdc is not None:
-                blob = self._api._kdc.encode(blob)
+                blob = self._api._kdc.encode(request.url.hostname, blob)
 
             self._quic.send_stream_data(request.stream_id, blob, end_stream=end_stream) # type: ignore
             self.transmit()

GNServer/_client.py

@@ -620,10 +620,11 @@ class RawQuicClient(QuicConnectionProtocol):
             data = await fut
             
             if self.quicClient._client._kdc is not None:
-                data = self.quicClient._client._kdc.decode(request.url.hostname, data)
+                data, domain = self.quicClient._client._kdc.decode(request.url.hostname, data)
 
             if data is not None:
-                return GNResponse.deserialize(data, 2)
+                r = GNResponse.deserialize(data, 2)
+                return r
             else:
                 return GNResponse('gn:client:0')
         

GNServer/models.py

@@ -3,7 +3,6 @@ from typing import List, Optional, Dict
 from KeyisBTools.cryptography.sign import s2
 from KeyisBTools.cryptography import m1
 
-from ._client import AsyncClient
 from ._app import GNRequest, GNResponse
 from gnobjects.net.objects import Url
 
@@ -16,6 +15,7 @@ class KDCObject:
         self._kdc_key = kdc_key
         self._requested_domains = requested_domains
 
+        from ._client import AsyncClient
         self._client = AsyncClient(domain)
 
         self._servers_keys: Optional[Dict[str, bytes]] = None
@@ -60,14 +60,15 @@ class KDCObject:
     
     def decode(self, response: bytes):
         if len(response) < 164+64:
-            return response
+            return response, None
         
         sig, domain_h, data = response[:164], response[164:164+64], response[164+64:]
 
         if domain_h not in self._servers_keys_hash_domain:
-            return response
-
-        key = self._servers_keys[self._servers_keys_hash_domain[domain_h]]
+            return response, None
+        d = self._servers_keys_hash_domain[domain_h]
+        key = self._servers_keys[d]
+        
         if not s2.verify(key, sig):
-            return None
-        return m1.decrypt(self._domain.encode(), sig, data, key)
+            return None, None
+        return m1.decrypt(self._domain.encode(), sig, data, key), d

{gnserver-0.0.0.0.50.dist-info → gnserver-0.0.0.0.52.dist-info}/METADATA

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

{gnserver-0.0.0.0.50.dist-info → gnserver-0.0.0.0.52.dist-info}/RECORD

@@ -1,14 +1,14 @@
 GNServer/__init__.py,sha256=6CMCZlkBO74PW8i8DAri5xz2fYM9EyPH8vdsLYBMmOo,1560
-GNServer/_app.py,sha256=tXaeAZPfibuNSNCgebJnA9MGlk4nYTkPWcdxMcuXrlI,18369
-GNServer/_client.py,sha256=UISxnk6lhU90knh0okWA7aAlvTNiEvxZf7D472Y7eEM,32567
+GNServer/_app.py,sha256=Tmdfzx-H0UqoIdX1RiWC1BV-NSu2dk-cve4eu2i6rE8,18757
+GNServer/_client.py,sha256=JzWFdiZn5sdI-fzn3ljh_1V-B9p_a7hYJ5Xx5gnrvRg,32598
 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=kVDInFDTHUiQIaYPSWFqRp2o0G6S7AC6Jb5eWhSZ6Fc,2592
-gnserver-0.0.0.0.50.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
-gnserver-0.0.0.0.50.dist-info/METADATA,sha256=E0dXGPd2uj9FmCLddp0bELPLIuFK3by44dHA_PSAUAI,830
-gnserver-0.0.0.0.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.50.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.50.dist-info/RECORD,,
+GNServer/models.py,sha256=F50tgBbjDvarS1DEOIxHrpWK3o3BsKABHgF569eig84,2644
+gnserver-0.0.0.0.52.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
+gnserver-0.0.0.0.52.dist-info/METADATA,sha256=MqrmkZw13bbRmV6UAULXD0u4NM2vs3VExHKqSr6zheA,830
+gnserver-0.0.0.0.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.52.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.52.dist-info/RECORD,,