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

atomicshop/mitm/connection_thread_worker.py

@@ -181,7 +181,7 @@ def thread_worker_main(
         network_logger.info("Thread Finished. Will continue listening on the Main thread")
 
     def create_requester_request(client_message: ClientMessage) -> list[bytes]:
-        requests: list = [requester.create_response(client_message)]
+        requests: list = [requester.create_request(client_message)]
 
         # Output first 100 characters of all the requests in the list.
         for request_raw_bytes_single in requests:
@@ -341,7 +341,7 @@ def thread_worker_main(
                     client_message = client_connection_message
 
                     bytes_to_send_list: list[bytes] = create_responder_response(client_message)
-                    print_api(f"Got responses from responder, count: [{len(bytes_to_send_list)}]", logger=network_logger,
+                    print_api(f"Got responses from connect responder, count: [{len(bytes_to_send_list)}]", logger=network_logger,
                               logger_method='info')
                 else:
                     client_message.reinitialize_dynamic_vars()

atomicshop/mitm/engines/__parent/recorder___parent.py

@@ -76,7 +76,7 @@ class RecorderParent:
             self.recorder_worker_thread = threading.Thread(
                 target=save_message_worker,
                 args=(self.record_file_path, self.message_queue, self.logger),
-                name=f"Thread-{self.class_client_message.thread_id}_Recorder",
+                name=f"Thread-{self.class_client_message.thread_id}-Recorder",
                 daemon=True
             )
             self.recorder_worker_thread.start()

atomicshop/mitm/engines/create_module_template.py

@@ -80,7 +80,7 @@ class CreateModuleTemplate:
 
         config_lines_list.append('[engine]')
         config_lines_list.append(f'domains = [{", ".join(domains_with_quotes)}]')
-        config_lines_list.append('localhost = 0\n')
+        config_lines_list.append('localhost = 1\n')
         # config_lines_list.append(f'\n')
         config_lines_list.append('[mtls]')
         config_lines_list.append('# "subdomain.domain.com" = "file_name_in_current_dir.pem"\n')

atomicshop/mitm/import_config.py

@@ -89,7 +89,10 @@ def import_engines_configs() -> int:
         # Initialize engine.
         current_module: initialize_engines.ModuleCategory = initialize_engines.ModuleCategory(config_static.MainConfig.SCRIPT_DIRECTORY)
         current_module.fill_engine_fields_from_config(engine_config_path.path)
-        current_module.initialize_engine()
+        result_code, error = current_module.initialize_engine()
+        if result_code != 0:
+            print_api(f"Error initializing engine from directory: {Path(engine_config_path.path).parent}\n{error}", color='red')
+            return result_code
 
         # Extending the full engine domain list with this list.
         domains_engine_list_full.extend(current_module.domain_list)
@@ -99,7 +102,10 @@ def import_engines_configs() -> int:
     # ==== Initialize Reference Module =============================================================================
     reference_module: initialize_engines.ModuleCategory = initialize_engines.ModuleCategory(config_static.MainConfig.SCRIPT_DIRECTORY)
     reference_module.fill_engine_fields_from_general_reference(config_static.MainConfig.ENGINES_DIRECTORY_PATH)
-    reference_module.initialize_engine(reference_general=True)
+    result_code, error = reference_module.initialize_engine(reference_general=True)
+    if result_code != 0:
+        print_api(f"Error initializing reference engine from file: {config_static.MainConfig.ENGINES_DIRECTORY_PATH}\n{error}", color='red')
+        return result_code
 
     # Assigning all the engines domains to all time domains, that will be responsible for adding new domains.
     config_static.Certificates.domains_all_times = list(domains_engine_list_full)

atomicshop/mitm/initialize_engines.py

@@ -3,8 +3,8 @@ from pathlib import Path
 
 from ..file_io import tomls
 from ..basics.classes import import_first_class_name_from_file_path
-from .engines.__reference_general import parser___reference_general, responder___reference_general, \
-    recorder___reference_general
+from .engines.__reference_general import parser___reference_general, requester___reference_general, \
+    responder___reference_general, recorder___reference_general
 
 
 class ModuleCategory:
@@ -18,10 +18,12 @@ class ModuleCategory:
         self.mtls: dict = dict()
 
         self.parser_file_path: str = str()
+        self.requester_file_path: str = str()
         self.responder_file_path: str = str()
         self.recorder_file_path: str = str()
 
         self.parser_class_object: str = str()
+        self.requester_class_object: str = str()
         self.responder_class_object: str = str()
         self.recorder_class_object: str = str()
 
@@ -31,6 +33,7 @@ class ModuleCategory:
         reference_folder_path: str = engines_fullpath + os.sep + self.engine_name
         # Full path to file.
         self.parser_file_path = reference_folder_path + os.sep + "parser___reference_general.py"
+        self.requester_file_path = reference_folder_path + os.sep + "requester___reference_general.py"
         self.responder_file_path = reference_folder_path + os.sep + "responder___reference_general.py"
         self.recorder_file_path = reference_folder_path + os.sep + "recorder___reference_general.py"
 
@@ -62,6 +65,7 @@ class ModuleCategory:
 
         # Full path to file
         self.parser_file_path = f"{engine_directory_path}{os.sep}parser{file_name_suffix}.py"
+        self.requester_file_path = f"{engine_directory_path}{os.sep}requester{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"
 
@@ -74,18 +78,26 @@ class ModuleCategory:
         for subdomain, file_name in self.mtls.items():
             self.mtls[subdomain] = f'{engine_directory_path}{os.sep}{file_name}'
 
-    def initialize_engine(self, reference_general: bool = False):
-        if not reference_general:
-            self.parser_class_object = import_first_class_name_from_file_path(
-                self.script_directory, self.parser_file_path)
-            self.responder_class_object = import_first_class_name_from_file_path(
-                self.script_directory, self.responder_file_path)
-            self.recorder_class_object = import_first_class_name_from_file_path(
-                self.script_directory, self.recorder_file_path)
-        else:
-            self.parser_class_object = parser___reference_general.ParserGeneral
-            self.responder_class_object = responder___reference_general.ResponderGeneral
-            self.recorder_class_object = recorder___reference_general.RecorderGeneral
+    def initialize_engine(self, reference_general: bool = False) -> tuple[int, str]:
+        try:
+            if not reference_general:
+                self.parser_class_object = import_first_class_name_from_file_path(
+                    self.script_directory, self.parser_file_path)
+                self.requester_class_object = import_first_class_name_from_file_path(
+                    self.script_directory, self.requester_file_path)
+                self.responder_class_object = import_first_class_name_from_file_path(
+                    self.script_directory, self.responder_file_path)
+                self.recorder_class_object = import_first_class_name_from_file_path(
+                    self.script_directory, self.recorder_file_path)
+            else:
+                self.parser_class_object = parser___reference_general.ParserGeneral
+                self.requester_class_object = requester___reference_general.RequesterGeneral
+                self.responder_class_object = responder___reference_general.ResponderGeneral
+                self.recorder_class_object = recorder___reference_general.RecorderGeneral
+        except ModuleNotFoundError as e:
+            return 1, str(e)
+
+        return 0, ''
 
 
 def assign_class_by_domain(

atomicshop/wrappers/mongodbw/mongodbw.py

@@ -867,7 +867,7 @@ def find(
             entries[entry_index]['_id'] = str(entry['_id'])
 
     if key_convert_to_dict and entries:
-        entries = _convert_key_values_to_objects(keys_convert_to_dict=key_convert_to_dict, returned_data=entries)
+        entries = convert_key_values_to_objects(keys_convert_to_dict=key_convert_to_dict, returned_data=entries)
 
     if close_client:
         mongo_client.close()
@@ -1398,7 +1398,7 @@ def get_stats_db_size(
     return stats['dataSize']
 
 
-def _convert_key_values_to_objects(
+def convert_key_values_to_objects(
         keys_convert_to_dict: list[str],
         returned_data: Union[dict, list]
 ) -> Union[dict, list]:
@@ -1424,9 +1424,9 @@ def _convert_key_values_to_objects(
                     # This is needed only to know the possible exception types.
                     raise
             else:
-                _convert_key_values_to_objects(keys_convert_to_dict, value)
+                convert_key_values_to_objects(keys_convert_to_dict, value)
     elif isinstance(returned_data, list):
         for i, item in enumerate(returned_data):
-            returned_data[i] = _convert_key_values_to_objects(keys_convert_to_dict, item)
+            returned_data[i] = convert_key_values_to_objects(keys_convert_to_dict, item)
 
     return returned_data

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -539,10 +539,15 @@ class SocketWrapper:
                     process_name = get_command_instance.get_process_name(print_kwargs={'logger': self.logger})
 
                 source_ip: str = client_address[0]
-                source_hostname: str = socket.gethostbyaddr(source_ip)[0]
                 engine_name: str = get_engine_name(domain_from_engine, self.engines_list)
                 dest_port: int = listening_socket_object.getsockname()[1]
 
+                # Not always there will be a hostname resolved by the IP address, so we will leave it empty if it fails.
+                try:
+                    source_hostname: str = socket.gethostbyaddr(source_ip)[0]
+                except socket.herror:
+                    source_hostname = ''
+
                 # If 'accept()' function worked well, SSL worked well, then 'client_socket' won't be empty.
                 if client_socket:
                     # Get the protocol type from the socket.

{atomicshop-3.1.0.dist-info → atomicshop-3.1.2.dist-info}/METADATA

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

{atomicshop-3.1.0.dist-info → atomicshop-3.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=91TkRXyPpHainjVtqMX8IhnOPsq4mLI4-W-pBKoiPbk,122
+atomicshop/__init__.py,sha256=9FkiqXkoIc84EfZfIhFK47xqfKhRhJsieqicu4tjeJE,122
 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
@@ -136,20 +136,20 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=N3D06C_wUytwm80PQCL90ZGHLMHeQlCcI2XQQU2FZ1I,8145
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=H3Ogwo9iMG4WgKZabJGl69_haIkEsMR4p6l4CGbwBYU,28500
-atomicshop/mitm/import_config.py,sha256=MbMgX5IpqC6fUZUTHLOtHyHbzab2tG4RgD2O18csKcI,16506
-atomicshop/mitm/initialize_engines.py,sha256=lucq9LwkWTnrYKsnt8bgs8t9R_y3gOPmzLyEmRuXD8s,6628
+atomicshop/mitm/connection_thread_worker.py,sha256=Iea2XszWwqcvIq1eyRDBkIuW1uUQHVaAxfdA9EZolac,28507
+atomicshop/mitm/import_config.py,sha256=gCH1hV-CxBAdwjeFJu1I5ntbm5hqzcB0y0vzRPkzra0,16936
+atomicshop/mitm/initialize_engines.py,sha256=Pj9k3iLdoE0KAl3QWG1Z10LHUHY8WQivSPFnQLhCWrc,7385
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
 atomicshop/mitm/mitm_main.py,sha256=cfQLaPaUZgluatlZDRiToi14ekZbPT2KM4-AiivTs3w,30055
 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=nZE99lwHc_Wm4zmEt7P3cEw3E32Ms65dVbhqZbqOV6U,5577
+atomicshop/mitm/engines/create_module_template.py,sha256=Qu7ca72BsbcPrtonJM1ok7pGlwu0u6gEDap1ht6vMw0,5577
 atomicshop/mitm/engines/create_module_template_main_example.py,sha256=LeQ44Rp2Gi_KbIDY_4OMS0odkSK3zFZWra_oAka5eJY,243
 atomicshop/mitm/engines/__parent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/__parent/parser___parent.py,sha256=HHaCXhScl3OlPjz6eUxsDpJaZyk6BNuDMc9xCkeo2Ws,661
-atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=JbbcpV6j4odvREmvcXQlzKr5_hwLiEHhF0O414PlTes,6010
+atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=I5RNNtqc2DRIm1E9grOkTvk9F79mfJvTl9vfVEUgcLE,6010
 atomicshop/mitm/engines/__parent/requester___parent.py,sha256=mKHR1xrfx0CCO74vv164Fr_dVDhptqvYsE3ORoM4_7k,5107
 atomicshop/mitm/engines/__parent/responder___parent.py,sha256=mtiS_6ej9nxT9UhAQR4ftMqnqL-j_kO3u8KEaoEaI9k,9495
 atomicshop/mitm/engines/__reference_general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -275,7 +275,7 @@ atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 atomicshop/wrappers/mongodbw/install_mongodb_ubuntu.py,sha256=2eEOb35T259lhn5koynfTIm1hanxD02zN97ExGSBM2o,4021
 atomicshop/wrappers/mongodbw/install_mongodb_win.py,sha256=64EUQYx7VuMC3ndO2x3nSErh5NZ_BsqMwGvPcybfC-Q,8499
 atomicshop/wrappers/mongodbw/mongo_infra.py,sha256=IjEF0jPzQz866MpTm7rnksnyyWQeUT_B2h2DA9ryAio,2034
-atomicshop/wrappers/mongodbw/mongodbw.py,sha256=_C-v0ZKM7SRThZOnpOtUKmy3fvcvdiGQNvLCo3Drgls,56053
+atomicshop/wrappers/mongodbw/mongodbw.py,sha256=CHbDfW9CXzXUs3V97DYQpt-dYlt_gB60JhwqG2tVFQY,56049
 atomicshop/wrappers/nodejsw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/nodejsw/install_nodejs_ubuntu.py,sha256=wjpJdfAaY92RYl_L9esDIWuBMGeYH35RHJ5BVgMof8Y,6260
 atomicshop/wrappers/nodejsw/install_nodejs_windows.py,sha256=WvXIcEVnKcQYD-KNwhVP094s__1tt0Ir2Y87MABl8Nc,6283
@@ -330,14 +330,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=AQKjm_GZLH2PO7gkFbwzIbXzUXxRFvBTc6onrgapFqs,22048
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=hOOEpA-QNtCGroBzFDpOeD8z2KJWMVTiWaoUvtB1qvU,40886
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=3sEz1VUar1JJU8KxocrOT09-vIh5hLpE29aTZH9TNC8,41117
 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=3Ts1sVqSUiCDsHRHwJCbiZ9EYvv2ELGxF0Y_pibGU4k,9596
-atomicshop-3.1.0.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.1.0.dist-info/METADATA,sha256=CvGoKMdS-InZlR0Mk23zWG7_g9YqXprrxx05qwPwHiY,10653
-atomicshop-3.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.1.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.1.0.dist-info/RECORD,,
+atomicshop-3.1.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.1.2.dist-info/METADATA,sha256=3K-v2aK-rRo1shq8oR83WC2o6im2elEruEBAgdXDjb4,10653
+atomicshop-3.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.1.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.1.2.dist-info/RECORD,,