GNServer 0.0.0.0.51__py3-none-any.whl → 0.0.0.0.53__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(request.url.hostname, blob)
+                blob = self._api._kdc.encode(request.client.domain, blob)
 
             self._quic.send_stream_data(request.stream_id, blob, end_stream=end_stream) # type: ignore
             self.transmit()

GNServer/_client.py

@@ -162,6 +162,7 @@ class AsyncClient:
 
     def setKDC(self, kdc: KDCObject):
         self._kdc = kdc
+        self._kdc._client = self
 
     def addRequestCallback(self, callback: Callable, name: str):
         self.__request_callbacks[name] = callback
@@ -620,10 +621,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(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

@@ -11,6 +11,7 @@ from KeyisBTools.cryptography.bytes import hash3
 class KDCObject:
     def __init__(self, domain: str, kdc_domain: str, kdc_key: bytes, requested_domains: List[str]):
         self._domain = domain
+        self._domain_hash = hash3(domain.encode())
         self._kdc_domain = kdc_domain
         self._kdc_key = kdc_key
         self._requested_domains = requested_domains
@@ -18,7 +19,7 @@ class KDCObject:
         from ._client import AsyncClient
         self._client = AsyncClient(domain)
 
-        self._servers_keys: Optional[Dict[str, bytes]] = None
+        self._servers_keys: Dict[str, bytes] = {}
         self._servers_keys_hash_domain: Dict[bytes, str] = {}
         self._servers_keys_domain_hash: Dict[str, bytes] = {}
 
@@ -26,6 +27,13 @@ class KDCObject:
 
 
     async def init(self, servers_keys: Optional[Dict[str, bytes]] = None): # type: ignore
+
+
+        self._servers_keys[self._kdc_domain] = self._kdc_key
+        h = hash3(self._kdc_domain.encode())
+        self._servers_keys_hash_domain[h] = self._kdc_domain
+        self._servers_keys_domain_hash[self._kdc_domain] = h
+
         if servers_keys is None:
                 
             payload = self._requested_domains
@@ -34,9 +42,12 @@ class KDCObject:
             if not r.command.ok:
                 raise r
             
-            servers_keys: Dict[str, bytes] = r.payload
-            
-        self._servers_keys = servers_keys
+            servers_keys = r.payload
+
+            if servers_keys is None:
+                raise r
+
+        self._servers_keys.update(servers_keys)
 
         for domain in self._servers_keys.keys():
             h = hash3(domain.encode())
@@ -44,30 +55,27 @@ class KDCObject:
             self._servers_keys_domain_hash[domain] = h
 
 
-        self._servers_keys[self._kdc_domain] = self._kdc_key
-        h = hash3(self._kdc_domain.encode())
-        self._servers_keys_hash_domain[h] = self._kdc_domain
-        self._servers_keys_domain_hash[self._kdc_domain] = h
 
 
     def encode(self, domain: str, request: bytes):
         if domain not in self._servers_keys:
             return request
+        key = self._servers_keys[domain]
+        sig = s2.sign(key)
+        data = m1.encrypt(domain.encode(), sig, request[8:], key)
+        return request[:8] + sig + self._domain_hash + data
 
-        sig = s2.sign(self._kdc_key)
-        data = m1.encrypt(self._domain.encode(), sig, request, self._kdc_key)
-        return sig + self._servers_keys_domain_hash[domain] + data
-    
     def decode(self, response: bytes):
-        if len(response) < 164+64:
-            return response
-        
+        if len(response) < 8+164+64:
+            return response, None
+        h = response[:8]
+        response = response[8:]
         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]]
+            print(domain_h, 'not in', self._servers_keys_hash_domain)
+            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 h + m1.decrypt(self._domain.encode(), sig, data, key), d

{gnserver-0.0.0.0.51.dist-info → gnserver-0.0.0.0.53.dist-info}/METADATA

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

{gnserver-0.0.0.0.51.dist-info → gnserver-0.0.0.0.53.dist-info}/RECORD

@@ -1,14 +1,14 @@
 GNServer/__init__.py,sha256=6CMCZlkBO74PW8i8DAri5xz2fYM9EyPH8vdsLYBMmOo,1560
-GNServer/_app.py,sha256=f_FWW9nNF0BAqyW2jhLDzJhtWLIc_5SaxL3LgKhrCKI,18391
-GNServer/_client.py,sha256=UISxnk6lhU90knh0okWA7aAlvTNiEvxZf7D472Y7eEM,32567
+GNServer/_app.py,sha256=5wcVwq8bnctqwASs0-YaYMYHWympwtC24lq5PEcISTE,18758
+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=tq7TgZs1QKV3ifj49RdsvXFbAY92_9tDQIukeixXTq8,2600
-gnserver-0.0.0.0.51.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
-gnserver-0.0.0.0.51.dist-info/METADATA,sha256=f9bb7VcFCaseOvnPR5Oc1b4fPZHRA529aah8N2JRePg,830
-gnserver-0.0.0.0.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.51.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.51.dist-info/RECORD,,
+GNServer/models.py,sha256=VjTpxVdSMLG6I_0nabhZihuIyPiQTOiEV4h5m4DXXbw,2852
+gnserver-0.0.0.0.53.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
+gnserver-0.0.0.0.53.dist-info/METADATA,sha256=i5Nn1OYmDIxFCb6mjZt8nB9hGtVvHdf9nozPTw9Sux0,830
+gnserver-0.0.0.0.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.53.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.53.dist-info/RECORD,,