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

atomicshop/mitm/config_static.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from typing import Literal
 
 from . import import_config
-
+from .message import ClientMessage
 
 # CONFIG = None
 LIST_OF_BOOLEANS: list = [
@@ -173,14 +173,19 @@ def load_config(config_toml_file_path: str):
     return result
 
 
-# def get_listening_addresses() -> list[str]:
-#     """
-#     Get the list of listening addresses from the TCPServer configuration.
-#     If no_engines_usage_to_listen_addresses_enable is True, return the no_engines_listening_address_list.
-#     Otherwise, return an empty list.
-#     """
-#
-#     return ENGINES_LIST
+def get_listening_addresses(client_message: ClientMessage) -> dict:
+    """
+    Get the list of listening addresses from the TCPServer configuration.
+    If no_engines_usage_to_listen_addresses_enable is True, return the no_engines_listening_address_list.
+    Otherwise, return an empty list.
+    """
+
+    for engine in ENGINES_LIST:
+        if engine.engine_name == client_message.engine_name:
+            return {
+                'domain_target_dict': engine.domain_target_dict,
+                'port_target_dict': engine.port_target_dict
+            }
 
 
 # ============ Server Tester Specific ===============

atomicshop/mitm/connection_thread_worker.py

@@ -179,8 +179,11 @@ 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_request(client_message)]
+    def create_requester_request(
+            client_message: ClientMessage,
+            sending_socket: socket.socket
+    ) -> list[bytes]:
+        requests: list = [requester.create_request(client_message, sending_socket=sending_socket)]
 
         # Output first 100 characters of all the requests in the list.
         for request_raw_bytes_single in requests:
@@ -414,7 +417,8 @@ def thread_worker_main(
                     # Now send it to requester/responder.
                     if side == 'Client':
                         # Send to requester.
-                        bytes_to_send_list: list[bytes] = create_requester_request(client_message)
+                        bytes_to_send_list: list[bytes] = create_requester_request(
+                            client_message, sending_socket=sending_socket)
 
                         # If we're in offline mode, then we'll put the request to the responder right away.
                         if config_static.MainConfig.offline:

atomicshop/mitm/engines/__parent/requester___parent.py

@@ -109,7 +109,7 @@ class RequesterParent:
 
         return request_raw_bytes
 
-    def create_request(self, class_client_message: ClientMessage):
+    def create_request(self, class_client_message: ClientMessage, **kwargs) -> bytes:
         """ This function should be overridden in the child class. """
 
         request_bytes: bytes = class_client_message.request_raw_bytes

atomicshop/mitm/engines/__reference_general/requester___reference_general.py

@@ -2,6 +2,7 @@
 from atomicshop.mitm.engines.__parent.requester___parent import RequesterParent
 from atomicshop.mitm.shared_functions import create_custom_logger
 from atomicshop.mitm.message import ClientMessage
+from atomicshop.mitm import config_static
 
 """
 import time
@@ -23,7 +24,7 @@ class RequesterGeneral(RequesterParent):
 
         self.logger = create_custom_logger()
 
-    # def create_request(self, class_client_message: ClientMessage):
+    # def create_request(self, class_client_message: ClientMessage, **kwargs) -> bytes:
     #     # noinspection GrazieInspection
     #     """
     #     For more examples check the responder.

atomicshop/mitm/engines/__reference_general/responder___reference_general.py

@@ -2,6 +2,7 @@
 from atomicshop.mitm.engines.__parent.responder___parent import ResponderParent
 from atomicshop.mitm.shared_functions import create_custom_logger
 from atomicshop.mitm.message import ClientMessage
+from atomicshop.mitm import config_static
 
 """
 import time

atomicshop/mitm/engines/create_module_template.py

@@ -82,8 +82,8 @@ class CreateModuleTemplate:
         config_lines_list.append(f'domains = [{", ".join(domains_with_quotes)}]')
         config_lines_list.append('localhost = 1\n')
         config_lines_list.append('[on_port_connect]')
-        config_lines_list.append('#5000 = "31.31.31.31"')
-        config_lines_list.append('#5000 = "C:\\test\\address.txt"\n')
+        config_lines_list.append('#5000 = "31.31.31.31:443"')
+        config_lines_list.append('#5000 = "ip_port_address.txt"\n')
         config_lines_list.append('[mtls]')
         config_lines_list.append('# "subdomain.domain.com" = "file_name_in_current_dir.pem"\n')
         # config_lines_list.append(f'\n')

atomicshop/mitm/initialize_engines.py

@@ -85,6 +85,10 @@ class ModuleCategory:
         for port, value in self.on_port_connect.items():
             self.port_target_dict[port] = {'ip': None, 'port': int(port)}
 
+            # If it is not an IP address (e.g. <IP:PORT>) it will be treated as file path.
+            if ':' not in value:
+                self.on_port_connect[port] = f'{engine_directory_path}{os.sep}{value}'
+
         for subdomain, file_name in self.mtls.items():
             self.mtls[subdomain] = f'{engine_directory_path}{os.sep}{file_name}'
 

atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py

@@ -143,7 +143,7 @@ def call_method(
     """
 
     # Assign the single value to a tuple if it is not already a tuple or dict and not an EmptyValue.
-    if not isinstance(value, EmptyValue) and not (isinstance(value, tuple) and isinstance(value, dict)):
+    if not isinstance(value, (EmptyValue, tuple, dict)):
         value = (value,)
 
     # Get the method instance out of the WMI object.

{atomicshop-3.2.2.dist-info → atomicshop-3.2.4.dist-info}/METADATA

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

{atomicshop-3.2.2.dist-info → atomicshop-3.2.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=70BfoIO6JBzrKV38FM49ynfFG1PLqvsrdtKa2Pktmzg,122
+atomicshop/__init__.py,sha256=tQatAAnQOtX4NdF28ZY2ktnZhdEOfGQyz-1n7OSRnCI,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
@@ -134,29 +134,29 @@ atomicshop/file_io/tomls.py,sha256=vZ_Wng5alLf8z6HSEZj7PS0XKDA-Iies9ihVWOkTcKo,1
 atomicshop/file_io/xlsxs.py,sha256=v_dyg9GD4LqgWi6wA1QuWRZ8zG4ZwB6Dz52ytdcmmmI,2184
 atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,2104
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/mitm/config_static.py,sha256=6vAuksHxZhwejwqL0S66mcI95Fe43I5dsjLYA-wDZ-I,8474
+atomicshop/mitm/config_static.py,sha256=9lnSmGuNKUnN0-IskhObA0XJeLvm63vXD2QiNAUTIb8,8751
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=E_DNvP4lbbcoeFziiG10Aa7bg7Ka09wdwV_uqaRm5rU,32554
+atomicshop/mitm/connection_thread_worker.py,sha256=52mnpc0ajOc47y-oNU0VEXtJL9payB_i1KEPcyBiRhc,32710
 atomicshop/mitm/import_config.py,sha256=_RJPxoVEEsJQwQY-K_8qPw2PbzsDcV23_sEJEWSKqXY,17831
-atomicshop/mitm/initialize_engines.py,sha256=N4JVoC7PXN8GxUBXvNCXS-ZA5ag6rXqYXyZ3EyHOcLM,10318
+atomicshop/mitm/initialize_engines.py,sha256=EYGW6gEYVETmmh9uNdsFT89YAdzeducFTIkdF-as33s,10534
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
 atomicshop/mitm/mitm_main.py,sha256=at9uxnXF_4b273HRXt9UGkERkHantRTOAvRtlYYI68E,30774
 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=_1aoB-ety98szV__2jnn6cohxmrClU5mOnf6u-nq_Zc,5762
+atomicshop/mitm/engines/create_module_template.py,sha256=2ceRWPzofpRf-R8VAMgXrx2D7vumkhfsrr120YFGgH0,5764
 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=I5RNNtqc2DRIm1E9grOkTvk9F79mfJvTl9vfVEUgcLE,6010
-atomicshop/mitm/engines/__parent/requester___parent.py,sha256=mKHR1xrfx0CCO74vv164Fr_dVDhptqvYsE3ORoM4_7k,5107
+atomicshop/mitm/engines/__parent/requester___parent.py,sha256=j3QYOfQFEPSzIEWihkssNcfaLWC8cpdpi-ciPgjKNBc,5126
 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
 atomicshop/mitm/engines/__reference_general/parser___reference_general.py,sha256=57MEPZMAjTO6xBDZ-yt6lgGJyqRrP0Do5Gk_cgCiPns,2998
 atomicshop/mitm/engines/__reference_general/recorder___reference_general.py,sha256=El2_YHLoHUCiKfkAmGlXxtFpmSjsUFdsb8I1MvSAFaM,653
-atomicshop/mitm/engines/__reference_general/requester___reference_general.py,sha256=yXw8cJ5_0XlupnEtEhqyOR4rvQEAg68Ok39vKa8vKZY,1949
-atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=zVMmON1sy6HH-A35uZZuAURBMfKS5X9ivkPVjPl-sCw,9654
+atomicshop/mitm/engines/__reference_general/requester___reference_general.py,sha256=Qz0VCYK38qqzWP38guuAunZtz1YHQQ6S_XfRZTFS_ZQ,2011
+atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=Q0XKe_dP4Xm3BrUgCn-rUr_n7cjZCkol4moz_Ice0HM,9697
 atomicshop/mitm/statistic_analyzer_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/statistic_analyzer_helper/analyzer_helper.py,sha256=pk6L1t1ea1kvlBoR9QEJptOmaX-mumhwLsP2GCKukbk,5920
 atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=UnnY_FSTiXEfZ8SkDKU2s2qpgPYu1oOT99ghmY-zzas,19992
@@ -317,7 +317,7 @@ atomicshop/wrappers/pywin32w/wmis/msft_netipaddress.py,sha256=Kn2gQsyEquM5QQkdF2
 atomicshop/wrappers/pywin32w/wmis/win32_networkadapterconfiguration.py,sha256=CnHFac1FT6cnH1VwHUyD6vZr6FKPxY8fpbj-1s2_Mzg,11327
 atomicshop/wrappers/pywin32w/wmis/win32networkadapter.py,sha256=iao4OK6u097uRacw6vQuya1kOtJzLA1IM4cgo6UCWLM,3941
 atomicshop/wrappers/pywin32w/wmis/win32process.py,sha256=qMzXtJ5hBZ5ydAyqpDbSx0nO2RJQL95HdmV5SzNKMhk,6826
-atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=3SA6hNgw-iBWYl3l1t3RBxRYB4BH-FbTs9gzmcg_Q8w,8710
+atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=Ng5pbWeQBNcPqfFuxHEIdkIUeSDAi8w-NjclXlQHfo8,8662
 atomicshop/wrappers/socketw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTlCdsYHwH_ZE,2377
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
@@ -337,8 +337,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=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.2.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.2.2.dist-info/METADATA,sha256=GI9Mys6D0riUhhQh2NHEjMo3RL7shkzDK932yeGCuDM,10670
-atomicshop-3.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.2.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.2.2.dist-info/RECORD,,
+atomicshop-3.2.4.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.2.4.dist-info/METADATA,sha256=RbrrGTEzttTM8d-VagjhDT9b1h--ystZjXkmc4GtT2c,10670
+atomicshop-3.2.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.2.4.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.2.4.dist-info/RECORD,,