GNServer 0.0.0.0.62__py3-none-any.whl → 0.0.0.0.63__py3-none-any.whl

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.dist-info → gnserver-0.0.0.0.63.dist-info}/METADATA

@@ -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.dist-info → gnserver-0.0.0.0.63.dist-info}/RECORD

@@ -6,9 +6,9 @@ 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=GkbHzsTquRqcsRoy06hCGknHoT53Zc_ZiMVWzYWELQU,3815
-gnserver-0.0.0.0.62.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
-gnserver-0.0.0.0.62.dist-info/METADATA,sha256=oozl02YxaCoRB7hIHwwE4MDZ1Jtt6u138Nv5tcEzSLc,830
-gnserver-0.0.0.0.62.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gnserver-0.0.0.0.62.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
-gnserver-0.0.0.0.62.dist-info/RECORD,,
+GNServer/models.py,sha256=ZqdvO5k_UR9qy8g29EIn3ec23ADYmW8CHWJjwWH-444,3918
+gnserver-0.0.0.0.63.dist-info/licenses/LICENSE,sha256=_rN-sb3LemR3cKsEqjJRdXkdt7mME1mkW1BwWEn-zAw,1309
+gnserver-0.0.0.0.63.dist-info/METADATA,sha256=8LzYaOO6dt6QQ3cBL6O7NvvgDUlswBVxwOKzttJQrVk,830
+gnserver-0.0.0.0.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gnserver-0.0.0.0.63.dist-info/top_level.txt,sha256=-UOUBuD4u7Qkb1o5PdcwyA3kx8xCH2lwy0tJHi26Wb4,9
+gnserver-0.0.0.0.63.dist-info/RECORD,,