atomicshop 2.20.7__py3-none-any.whl → 2.20.8__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.20.7'
+__version__ = '2.20.8'

atomicshop/mitm/initialize_engines.py

@@ -26,6 +26,7 @@ class ModuleCategory:
         self.responder_instance = None
 
         self.mtls: dict = dict()
+        self.no_sni: dict = dict()
 
     def fill_engine_fields_from_general_reference(self, engines_fullpath: str):
         # Reference module variables.
@@ -46,6 +47,7 @@ class ModuleCategory:
         # Getting the parameters from engine config file
         self.domain_list = configuration_data['domains']
         self.mtls = configuration_data['mtls']
+        self.no_sni = configuration_data['no_sni']
 
         # If there's module configuration file, but no domains in it, there's no point to continue.
         # Since, each engine is based on domains.

atomicshop/mitm/mitm_main.py

@@ -328,8 +328,11 @@ def mitm_server(config_file_path: str, script_version: str):
     # === Initialize TCP Server ====================================================================================
     if config_static.TCPServer.enable:
         engines_domains: dict = dict()
+        no_sni_domain: str = str()
         for engine in engines_list:
             engines_domains[engine.engine_name] = engine.domain_list
+            if no_sni_domain == '':
+                no_sni_domain = engine.no_sni['domain']
 
         try:
             socket_wrapper_instance = socket_wrapper.SocketWrapper(
@@ -370,7 +373,8 @@ def mitm_server(config_file_path: str, script_version: str):
                     config_static.TCPServer.forwarding_dns_service_ipv4_list___only_for_localhost),
                 skip_extension_id_list=config_static.SkipExtensions.SKIP_EXTENSION_ID_LIST,
                 request_domain_from_dns_server_queue=DOMAIN_QUEUE,
-                engines_domains=engines_domains
+                engines_domains=engines_domains,
+                engine_no_sni_domain=no_sni_domain
             )
         except socket_wrapper.SocketWrapperPortInUseError as e:
             print_api.print_api(e, error_type=True, color="red", logger=system_logger)

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -69,7 +69,8 @@ class SocketWrapper:
             exceptions_logger: loggingw.ExceptionCsvLogger = None,
             statistics_logs_directory: str = None,
             request_domain_from_dns_server_queue: multiprocessing.Queue = None,
-            engines_domains: dict = None
+            engines_domains: dict = None,
+            engine_no_sni_domain: str = None
     ):
         """
         Socket Wrapper class that will be used to create sockets, listen on them, accept connections and send them to
@@ -173,6 +174,8 @@ class SocketWrapper:
 
             the 'engine_name' for statistics.csv file will be taken from the key of the dictionary, while correlated
             by the domain name from the list in the dictionary.
+        :param engine_no_sni_domain: string, domain name that will be used if there is no SNI in the request,
+            and no domain hit the dns server. This is used to set the 'server_hostname' for the socket.
         """
 
         self.listening_address_list: list[str] = listening_address_list
@@ -209,6 +212,7 @@ class SocketWrapper:
             forwarding_dns_service_ipv4_list___only_for_localhost)
         self.request_domain_from_dns_server_queue: multiprocessing.Queue = request_domain_from_dns_server_queue
         self.engines_domains: dict = engines_domains
+        self.engine_no_sni_domain: str = engine_no_sni_domain
 
         self.socket_object = None
 
@@ -460,7 +464,13 @@ class SocketWrapper:
                 # from accepting connections.
                 domain_from_dns_server = None
                 if self.request_domain_from_dns_server_queue is not None:
-                    domain_from_dns_server = self.request_domain_from_dns_server_queue.get()
+                    # domain_from_dns_server = self.request_domain_from_dns_server_queue.get()
+                    import queue
+                    try:
+                        domain_from_dns_server = self.request_domain_from_dns_server_queue.get_nowait()
+                    except queue.Empty:
+                        domain_from_dns_server = self.engine_no_sni_domain
+
                     self.logger.info(f"Requested domain from DNS Server: {domain_from_dns_server}")
 
                 # Wait from any connection on "accept()".

{atomicshop-2.20.7.dist-info → atomicshop-2.20.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.20.7
+Version: 2.20.8
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.20.7.dist-info → atomicshop-2.20.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=k2q_v7SGvsY5uOPeIOHoLiqdu-l0poyg0uOWPbdyzmo,123
+atomicshop/__init__.py,sha256=J0-CAI8_iH7nq_5Joaip1uk6K4IRagpY7cGLYnqvZgM,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -137,9 +137,9 @@ atomicshop/mitm/config_static.py,sha256=6naOZiB5dlZ4YlsgXuWhpmst17Bh3WaZbnrtYmjt
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
 atomicshop/mitm/connection_thread_worker.py,sha256=tn71RotrQOTo6dyAakuLlY4HrM5ia_0FbNKLCY6Xahg,29304
 atomicshop/mitm/import_config.py,sha256=9oErVekNdtjf3ppN2c8mUPEvKfeLUkxdAEt7Dbha-SM,9274
-atomicshop/mitm/initialize_engines.py,sha256=e2f7i7d0F6duZQRO2lOOzFBbmfnyIf_E5bqj0rL2IF8,8677
+atomicshop/mitm/initialize_engines.py,sha256=OjhURJsczMuSJ1UXGymgnwPTqFSOkqWhdL9-o0BmDQU,8765
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
-atomicshop/mitm/mitm_main.py,sha256=hEiJ0N-bA4LMHe3GYZvYGRy2ea46SY7aUxaCidGsDoY,25837
+atomicshop/mitm/mitm_main.py,sha256=8fyc6-bimvHFYUsWxTMU4MDndu7izshLtydl-XIqZZ4,26020
 atomicshop/mitm/recs_files.py,sha256=ZAAD0twun-FtmbSniXe3XQhIlawvANNB_HxwbHj7kwI,3151
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=5_sAYGX2Xunzo_pS2W5WijNCwr_BlGJbbOO462y_wN4,27533
@@ -324,14 +324,14 @@ atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6Dn
 atomicshop/wrappers/socketw/sni.py,sha256=q-F-R1KtE94g8WGrR3QHgi-otXZJUPBprEwQqnY80_A,17639
 atomicshop/wrappers/socketw/socket_client.py,sha256=oa3GwS4OPgokrJE5_Oc4-5_wlXHxSH9J5f2DKebms8k,22035
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=4apajkc4fR3V01_VvYtMH60Z7-mt19OeF_fyPj2ZKhs,38517
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=UDm9vX1xerSic4mJ__18dNvllYe5hwBhQuxubFJUcUA,39129
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2Nd2P_zg8HqCc7vW4s,4120
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.20.7.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.20.7.dist-info/METADATA,sha256=wHZ6J88gGZ_N6L3i19ZY3mwxqeJhyuA4gf0MbrOitvE,10630
-atomicshop-2.20.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.20.7.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.20.7.dist-info/RECORD,,
+atomicshop-2.20.8.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.20.8.dist-info/METADATA,sha256=XoEckd0Io7BxOPEk2_A5n8v8oU27Wx5Hsdl3MOxiOKU,10630
+atomicshop-2.20.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.20.8.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.20.8.dist-info/RECORD,,