GNServer 0.0.0.0.52__tar.gz → 0.0.0.0.54__tar.gz

{gnserver-0.0.0.0.52 → gnserver-0.0.0.0.54}/GNServer/GNServer/_app.py

@@ -339,7 +339,7 @@ class App:
                     if event.end_stream:
                             
                         if self._api._kdc is not None:
-                            buf, domain = self._api._kdc.decode(buf)
+                            buf, domain = self._api._kdc.decode(bytes(buf))
                         else:
                             domain = None
                         
@@ -454,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-0.0.0.0.52 → gnserver-0.0.0.0.54}/GNServer/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,7 +621,7 @@ class RawQuicClient(QuicConnectionProtocol):
             data = await fut
             
             if self.quicClient._client._kdc is not None:
-                data, domain = self.quicClient._client._kdc.decode(request.url.hostname, data)
+                data, domain = self.quicClient._client._kdc.decode(data)
 
             if data is not None:
                 r = GNResponse.deserialize(data, 2)

{gnserver-0.0.0.0.52 → gnserver-0.0.0.0.54}/GNServer/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,31 +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:
+        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:
+            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, None
-        return m1.decrypt(self._domain.encode(), sig, data, key), d
+        return h + m1.decrypt(self._domain.encode(), sig, data, key), d

{gnserver-0.0.0.0.52 → gnserver-0.0.0.0.54}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.52 → gnserver-0.0.0.0.54}/PKG-INFO

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

{gnserver-0.0.0.0.52 → gnserver-0.0.0.0.54}/setup.py

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