GNServer 0.0.0.0.62__tar.gz → 0.0.0.0.63__tar.gz

{gnserver-0.0.0.0.62 → gnserver-0.0.0.0.63}/GNServer/GNServer/models.py

@@ -6,7 +6,7 @@ from KeyisBTools.cryptography import m1
 from ._app import GNRequest, GNResponse
 from gnobjects.net.objects import Url
 
-from KeyisBTools.cryptography.bytes import hash3
+from KeyisBTools.cryptography.bytes import hash3, userFriendly
 
 class KDCObject:
     def __init__(self, domain: str, kdc_domain: str, kdc_key: bytes, requested_domains: List[str], active_key_synchronization: bool = True):
@@ -19,6 +19,7 @@ class KDCObject:
 
         from ._client import AsyncClient
         self._client = AsyncClient(domain)
+        self._client.setKDC(self)
 
         self._servers_keys: Dict[str, bytes] = {}
         self._servers_keys_hash_domain: Dict[bytes, str] = {}
@@ -36,9 +37,12 @@ class KDCObject:
         else:
             servers_keys = {}
 
+        self._servers_keys.update(servers_keys)
+
         if len(self._requested_domains) > 0:
             await self.requestKDC(self._requested_domains) # type: ignore
-
+        else:
+            self._update()
     
     def _update(self):
         for domain in self._servers_keys.keys():
@@ -67,6 +71,7 @@ class KDCObject:
         self._servers_keys.update(r.payload)
         self._update()
 
+
     async def encode(self, domain: str, request: bytes):
         if domain not in self._servers_keys:
             if domain is None or not self._active_key_synchronization:
@@ -88,13 +93,12 @@ class KDCObject:
         sig, domain_h, data = response[:164], response[164:164+64], response[164+64:]
         if domain_h not in self._servers_keys_hash_domain:
             if domain_h is None or not self._active_key_synchronization:
-                print(domain_h, 'not in', self._servers_keys_hash_domain)
                 return r, None
-            else:
+            elif self._active_key_synchronization:
                 await self.requestKDC(domain_h)
                 
         d = self._servers_keys_hash_domain[domain_h]
         key = self._servers_keys[d]
         if not s2.verify(key, sig):
             return None, None
-        return h + 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.62 → gnserver-0.0.0.0.63}/GNServer/GNServer.egg-info/PKG-INFO

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

{gnserver-0.0.0.0.62 → gnserver-0.0.0.0.63}/PKG-INFO

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

{gnserver-0.0.0.0.62 → gnserver-0.0.0.0.63}/setup.py

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