GNServer 0.0.0.0.61__tar.gz → 0.0.0.0.63__tar.gz

{gnserver-0.0.0.0.61 → gnserver-0.0.0.0.63}/GNServer/GNServer/_app.py

@@ -18,14 +18,15 @@ from typing import Any, AsyncGenerator, Union
 from gnobjects.net.objects import GNRequest, GNResponse, FileObject, CORSObject, TemplateObject
 from gnobjects.net.fastcommands import AllGNFastCommands, GNFastCommand
 
+from KeyisBTools.cryptography.bytes import userFriendly
 
 from ._func_params_validation import register_schema_by_key, validate_params_by_key
 from ._cors_resolver import resolve_cors
-
 from ._routes import Route, _compile_path, _ensure_async, _convert_value
-
 from .models import KDCObject
+from ._client import AsyncClient
 
+from pathlib import Path
 
 try:
     if not sys.platform.startswith("win"):
@@ -122,6 +123,8 @@ class App:
 
         self._kdc: Optional[KDCObject] = None
 
+        self.client = AsyncClient()
+
     def setKDC(self, kdc: KDCObject):
         self._kdc = kdc
 
@@ -487,21 +490,50 @@ class App:
         port: int,
         cert_path: str,
         key_path: str,
+        server_key: Optional[Union[str, Path]] = None,
         *,
         host: str = '0.0.0.0',
         idle_timeout: float = 20.0,
         wait: bool = True,
-        run: Optional[Callable] = None
+        run: Optional[Callable] = None,
+        kdc_passive_key_sync_domains: List[str] = [],
+        kdc_active_key_synchronization: bool = True
     ):
         """
         # Запустить сервер
 
         Запускает сервер в главном процессе asyncio.run()
+
+        server_key:  `:kdc.core:<...>:<...>:`
         """
 
         self.domain = domain
 
 
+        if server_key is not None:
+            if isinstance(server_key, Path):
+                server_key = server_key.read_text('utf-8')
+
+            if server_key[0] == ':' and server_key[0] == ':':
+                kdc_domain, dns_key, kdc_key = server_key.split(':')
+            
+                dns_key = userFriendly.decode(dns_key)
+                kdc_key = userFriendly.decode(kdc_key)
+                    
+                kdc = KDCObject(self.domain, kdc_domain, kdc_key, kdc_passive_key_sync_domains, active_key_synchronization=kdc_active_key_synchronization)
+                self.setKDC(kdc)
+
+                if self.client._domain is None:
+                    self.client._domain = domain
+                if self.client._dns_key is None:
+                    self.client.setDNSkey(dns_key)
+
+
+
+
+
+
+
         self._init_sys_routes()
 
         cfg = QuicConfiguration(

{gnserver-0.0.0.0.61 → gnserver-0.0.0.0.63}/GNServer/GNServer/_client.py

@@ -161,20 +161,26 @@ class AsyncClient:
         self.__dns_client: Optional[AsyncClient] = None
         self._dns_cache: TTLDict = TTLDict()
 
-        self.__domain = domain
+        self._domain = domain
 
         self._kdc: Optional[KDCObject] = None
 
+        
         if server_key:
-            if isinstance(server_key, bytes):
-                self.__server_key = server_key
+            self.setDNSkey(server_key)
+
+
+    def setDNSkey(self, key: Union[bytes, str]):
+        if key:
+            if isinstance(key, bytes):
+                self._dns_key = key
             else:
-                if os.path.exists(server_key):
-                    self.__server_key = open(server_key, 'rb').read()
+                if os.path.exists(key):
+                    self._dns_key = open(key, 'rb').read()
                 else:
-                    self.__server_key = userFriendly.decode(server_key)
+                    self._dns_key = userFriendly.decode(key)
         else:
-            self.__server_key = None
+            self._dns_key = None
 
     def setKDC(self, kdc: KDCObject):
         self._kdc = kdc
@@ -348,10 +354,10 @@ class AsyncClient:
         if self.__dns_client is None:
             self.__dns_client = AsyncClient()
 
-        if self.__server_key is not None:
-            s = s2.sign(self.__server_key)
-            data = m1.encrypt(s, domain.encode(), serialize({'domain': domain}), hash(self.__server_key))
-            payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s, 'domain': self.__domain}, 'data': data}
+        if self._dns_key is not None:
+            s = s2.sign(self._dns_key)
+            data = m1.encrypt(s, domain.encode(), serialize({'domain': domain}), hash(self._dns_key))
+            payload = {'sign': {'alg': 'KeyisB-c-s-m1', 'data': s, 'domain': self._domain}, 'data': data}
         else:
             payload = None
         

{gnserver-0.0.0.0.61 → 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():
@@ -70,7 +74,7 @@ class KDCObject:
 
     async def encode(self, domain: str, request: bytes):
         if domain not in self._servers_keys:
-            if not self._active_key_synchronization:
+            if domain is None or not self._active_key_synchronization:
                 return request
             else:
                 await self.requestKDC(domain)
@@ -88,10 +92,9 @@ class KDCObject:
         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:
-            if not self._active_key_synchronization:
-                print(domain_h, 'not in', self._servers_keys_hash_domain)
+            if domain_h is None or not self._active_key_synchronization:
                 return r, None
-            else:
+            elif self._active_key_synchronization:
                 await self.requestKDC(domain_h)
                 
         d = self._servers_keys_hash_domain[domain_h]

{gnserver-0.0.0.0.61 → 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.61
+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.61 → gnserver-0.0.0.0.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GNServer
-Version: 0.0.0.0.61
+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.61 → gnserver-0.0.0.0.63}/setup.py

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