atomicshop 2.20.5__py3-none-any.whl → 2.20.6__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.5'
+__version__ = '2.20.6'

atomicshop/mitm/engines/create_module_template.py

@@ -45,9 +45,9 @@ class CreateModuleTemplate:
         self.responder_general_path: str = reference_folder_path + os.sep + REFERENCE_RESPONDER_FILE_NAME
         self.recorder_general_path: str = reference_folder_path + os.sep + REFERENCE_RECORDER_FILE_NAME
 
-        self.parser_file_name: str = f"parser_{self.engine_name}.py"
-        self.responder_file_name: str = f"responder_{self.engine_name}.py"
-        self.recorder_file_name: str = f"recorder_{self.engine_name}.py"
+        self.parser_file_name: str = f"parser.py"
+        self.responder_file_name: str = f"responder.py"
+        self.recorder_file_name: str = f"recorder.py"
 
         self.create_template()
 
@@ -58,7 +58,7 @@ class CreateModuleTemplate:
         # Create the 'engines' directory if it doesn't exist.
         filesystem.create_directory(ENGINES_DIRECTORY_PATH)
 
-        # Create new engines folder.
+        # Create new engines' folder.
         filesystem.create_directory(self.new_engine_directory)
 
         self._create_engine_module_from_reference(file_path=self.parser_general_path, module_type='parser')
@@ -75,10 +75,6 @@ class CreateModuleTemplate:
         domains_with_quotes: list = [f'"{domain}"' for domain in self.domains]
         config_lines_list.append(f'"domains" = [{", ".join(domains_with_quotes)}]\n')
         # config_lines_list.append(f'\n')
-        config_lines_list.append(f'"parser_file" = "{self.parser_file_name}"')
-        config_lines_list.append(f'"responder_file" = "{self.responder_file_name}"')
-        config_lines_list.append(f'"recorder_file" = "{self.recorder_file_name}"\n')
-        # config_lines_list.append(f'\n')
         config_lines_list.append(f'[mtls]')
         config_lines_list.append(f'# "subdomain.domain.com" = "file_name_in_current_dir.pem"')
 

atomicshop/mitm/initialize_engines.py

@@ -52,10 +52,17 @@ class ModuleCategory:
         if not self.domain_list or self.domain_list[0] == '':
             raise ValueError(f"Engine Configuration file doesn't contain any domains: {engine_config_file_path}")
 
+        # This is needed for backwards compatibility before glass 1.8.2, atomicshop 2.20.6
+        # When the name of each file was following the pattern: parser_<EngineName>.py, responder_<EngineName>.py, recorder_<EngineName>.py
+        if os.path.isfile(f"{engine_directory_path}{os.sep}parser.py"):
+            file_name_suffix: str = ''
+        else:
+            file_name_suffix: str = f"_{self.engine_name}"
+
         # Full path to file
-        self.parser_file_path = f"{engine_directory_path}{os.sep}{configuration_data['parser_file']}"
-        self.responder_file_path = f"{engine_directory_path}{os.sep}{configuration_data['responder_file']}"
-        self.recorder_file_path = f"{engine_directory_path}{os.sep}{configuration_data['recorder_file']}"
+        self.parser_file_path = f"{engine_directory_path}{os.sep}parser{file_name_suffix}.py"
+        self.responder_file_path = f"{engine_directory_path}{os.sep}responder{file_name_suffix}.py"
+        self.recorder_file_path = f"{engine_directory_path}{os.sep}recorder{file_name_suffix}.py"
 
         for subdomain, file_name in self.mtls.items():
             self.mtls[subdomain] = f'{engine_directory_path}{os.sep}{file_name}'

atomicshop/mitm/mitm_main.py

@@ -268,8 +268,8 @@ def mitm_server(config_file_path: str, script_version: str):
 
     # === Initialize DNS module ====================================================================================
     if config_static.DNSServer.enable:
-        # dns_process = multiprocessing.Process(
-        dns_process = threading.Thread(
+        dns_process = multiprocessing.Process(
+        # dns_process = threading.Thread(
             target=dns_server.start_dns_server_multiprocessing_worker,
             kwargs={
                 'listening_interface': config_static.DNSServer.listening_interface,
@@ -295,6 +295,7 @@ def mitm_server(config_file_path: str, script_version: str):
         dns_process.daemon = True
         dns_process.start()
 
+        # Wait for the DNS server to start and do the port test.
         is_alive: bool = False
         max_wait_time: int = 5
         while not is_alive:
@@ -308,6 +309,21 @@ def mitm_server(config_file_path: str, script_version: str):
                 time.sleep(1)
                 return 1
 
+        # Now we can check if the process wasn't terminated after the check.
+        max_wait_time: int = 5
+        while max_wait_time > 0:
+            is_alive = dns_process.is_alive()
+
+            if not is_alive:
+                message = "DNS Server process terminated."
+                print_api.print_api(message, error_type=True, color="red", logger=system_logger)
+                # Wait for the message to be printed and saved to file.
+                time.sleep(1)
+                return 1
+
+            time.sleep(1)
+            max_wait_time -= 1
+
     # === EOF Initialize DNS module ================================================================================
     # === Initialize TCP Server ====================================================================================
     if config_static.TCPServer.enable:

atomicshop/wrappers/socketw/dns_server.py

@@ -309,7 +309,7 @@ class DnsServer:
                 error_messages.append(f"Port [{port}] is already in use by process: {process_info}")
 
             message = "\n".join(error_messages)
-            print_api(f'DnsPortInUseError: {str(e)}', error_type=True, color="red", logger=self.logger)
+            print_api(f'DnsPortInUseError: {str(message)}', error_type=True, color="red", logger=self.logger)
             # Wait for the message to be printed and saved to file.
             time.sleep(1)
             raise DnsPortInUseError(message)
@@ -905,8 +905,6 @@ def start_dns_server_multiprocessing_worker(
     current_process_name = multiprocessing.current_process().name
     threading.current_thread().name = current_process_name
 
-
-
     try:
         dns_server_instance = DnsServer(
             listening_interface=listening_interface,
@@ -928,7 +926,6 @@ def start_dns_server_multiprocessing_worker(
             logger_name=logger_name
         )
     except (DnsPortInUseError, DnsConfigurationValuesError) as e:
-        print_api(e, error_type=True, color="red", logger=dns_server_instance.logger)
         # Wait for the message to be printed and saved to file.
         time.sleep(1)
         return 1

{atomicshop-2.20.5.dist-info → atomicshop-2.20.6.dist-info}/METADATA

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

{atomicshop-2.20.5.dist-info → atomicshop-2.20.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=Z75FDLaS8vnUFWiQFrirKh_qZ8-SdtlTuquf4ca5CFU,123
+atomicshop/__init__.py,sha256=Ze7AVg_bmEuygfC1cWbcsq1Z8ibD2N91Q7kgO8C7_h4,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,14 +137,14 @@ 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=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
-atomicshop/mitm/initialize_engines.py,sha256=rijND1jxt3Zs8P0jhcQZc0tgcWD4-nq8ARODiWzhurU,8278
+atomicshop/mitm/initialize_engines.py,sha256=e2f7i7d0F6duZQRO2lOOzFBbmfnyIf_E5bqj0rL2IF8,8677
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
-atomicshop/mitm/mitm_main.py,sha256=YR_pgNQ45kX9sB3gjPWh2_5OrfAj1fIC0TafneZLARI,25197
+atomicshop/mitm/mitm_main.py,sha256=hEiJ0N-bA4LMHe3GYZvYGRy2ea46SY7aUxaCidGsDoY,25837
 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
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/mitm/engines/create_module_template.py,sha256=TAzsA4eLD2wYr7auuL4Nf_71iXqn-BOBXlSkNVrnYD4,5336
+atomicshop/mitm/engines/create_module_template.py,sha256=E518bIwztHshciTSGtJxdVhwjKgZ7fGRpAg23bSEmeE,4985
 atomicshop/mitm/engines/create_module_template_example.py,sha256=X5xhvbV6-g9jU_bQVhf_crZmaH50LRWz3bS-faQ18ds,489
 atomicshop/mitm/engines/__parent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/__parent/parser___parent.py,sha256=HHaCXhScl3OlPjz6eUxsDpJaZyk6BNuDMc9xCkeo2Ws,661
@@ -316,7 +316,7 @@ atomicshop/wrappers/socketw/accepter.py,sha256=hZZKVYlF3LOHQJsSIEKXZUf6QXXWm-Atq
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
 atomicshop/wrappers/socketw/certificator.py,sha256=mtWPJ_ew3OSwt0-1W4jaoco1VIY4NRCrMv3mDUxb_Cc,12418
 atomicshop/wrappers/socketw/creator.py,sha256=ePGjde04Jgq1gscTfiIam9u7nx3GfszUz1Oi1_5j5b0,13243
-atomicshop/wrappers/socketw/dns_server.py,sha256=QEHIQ1onGIOpwZ_nLXvGOgFCM5m-jSwh2HZ2eZC30cE,53337
+atomicshop/wrappers/socketw/dns_server.py,sha256=FjdcZV34usfGWsHPpPc6LnO5q6sB0ugyDbfPrK58wiU,53252
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=9B3MvcDqr4C3x2fsnjG5SQognd1wRqsBgikxZa0wXG8,8243
@@ -330,8 +330,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2N
 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.5.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.20.5.dist-info/METADATA,sha256=LQKANBfTO98nz4OnyWuo6nP4cOx18fSAt3J5PryHQTg,10630
-atomicshop-2.20.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.20.5.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.20.5.dist-info/RECORD,,
+atomicshop-2.20.6.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.20.6.dist-info/METADATA,sha256=68p1ayX03Wp47tjakHcnGkYLe2OUgnbVh6jwtFe-M2s,10630
+atomicshop-2.20.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.20.6.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.20.6.dist-info/RECORD,,