atomicshop 3.2.0__py3-none-any.whl → 3.2.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.2.0'
+__version__ = '3.2.2'

atomicshop/mitm/config_static.py

@@ -173,6 +173,16 @@ 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
+
+
 # ============ Server Tester Specific ===============
 CONFIG_INI_TESTER_FILE_NAME: str = 'config_tester.ini'
 

atomicshop/mitm/import_config.py

@@ -159,6 +159,7 @@ def check_configurations() -> int:
 
     is_localhost: bool | None = None
     for engine in config_static.ENGINES_LIST:
+        port_list: list[str] = []
         for domain_port in engine.domain_list:
             # Check if the domains has port.
             if ':' not in domain_port:
@@ -170,6 +171,7 @@ def check_configurations() -> int:
             else:
                 # Split the domain and port.
                 domain, port = domain_port.split(':')
+                port_list.append(port)
                 # Check if the port is a number.
                 if not port.isdigit():
                     message = (
@@ -178,6 +180,24 @@ def check_configurations() -> int:
                     print_api(message, color="red")
                     return 1
 
+        # Check if the ports in on_port_connect are unique.
+        if engine.on_port_connect:
+            ports_on_connect: list[str] = list(engine.on_port_connect.keys())
+            # Check if any of the ports in the on_port_connect are not in the domain list.
+            ports_in_domain_list: list[str] = []
+            for port in ports_on_connect:
+                if port in port_list:
+                    ports_in_domain_list.append(port)
+
+            if ports_in_domain_list:
+                message = (
+                    f"[*] Ports in [on_port_connect] config in engine_config.toml: {ports_in_domain_list}\n"
+                    f"are also in the [domains] field.\n"
+                    f"This is not supported.")
+                print_api(message, color="red")
+                return 1
+
+
         # Check if 'localhost' is set in all the engines, or not.
         # There can't be mixed engines where local host is set and not set.
         # It can be all engines will be localhost or none of them.

atomicshop/wrappers/socketw/dns_server.py

@@ -902,7 +902,11 @@ def get_target_ip_from_engine(
     """
     # Iterate through the list of engines.
     for domain, target_ip_port in engine_domain_target_dict.items():
-        if domain in target_domain:
+        # If the domain is exactly the same as the target domain,
+        if domain == target_domain:
+            # Get the target IP address from the engine.
+            return target_ip_port['ip']
+        elif domain in target_domain:
             # Get the target IP address from the engine.
             return target_ip_port['ip']
 

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

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

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

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=ia_QL-nkKuszLHN2XwNJas4i3cauADZSyyLAKJGWcD0,122
+atomicshop/__init__.py,sha256=70BfoIO6JBzrKV38FM49ynfFG1PLqvsrdtKa2Pktmzg,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,10 +134,10 @@ 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=N3D06C_wUytwm80PQCL90ZGHLMHeQlCcI2XQQU2FZ1I,8145
+atomicshop/mitm/config_static.py,sha256=6vAuksHxZhwejwqL0S66mcI95Fe43I5dsjLYA-wDZ-I,8474
 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/import_config.py,sha256=gCH1hV-CxBAdwjeFJu1I5ntbm5hqzcB0y0vzRPkzra0,16936
+atomicshop/mitm/import_config.py,sha256=_RJPxoVEEsJQwQY-K_8qPw2PbzsDcV23_sEJEWSKqXY,17831
 atomicshop/mitm/initialize_engines.py,sha256=N4JVoC7PXN8GxUBXvNCXS-ZA5ag6rXqYXyZ3EyHOcLM,10318
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
 atomicshop/mitm/mitm_main.py,sha256=at9uxnXF_4b273HRXt9UGkERkHantRTOAvRtlYYI68E,30774
@@ -323,7 +323,7 @@ atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTl
 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=LGI4gcgJ47thx6f96rjwjPz3CsTAIv6VxWFY4EyUF2E,13667
-atomicshop/wrappers/socketw/dns_server.py,sha256=2Y0yE1jIwv--wgNG8SnleqHttPjnKRksndVE_e0CSGM,53806
+atomicshop/wrappers/socketw/dns_server.py,sha256=aWrO16-c9Zt5SnVnmTUEv_j7XENYVBz1udIW9qMeC18,54011
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=qW_1CKyPgGlsIt7_jusKkMV4A4hih4bX324u0PLnoO8,7382
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=9B3MvcDqr4C3x2fsnjG5SQognd1wRqsBgikxZa0wXG8,8243
@@ -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.0.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.2.0.dist-info/METADATA,sha256=VKefd8URMpY8zVcDX7iiRnpIcssdPlobeUlqhIyA7HQ,10670
-atomicshop-3.2.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.2.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.2.0.dist-info/RECORD,,
+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,,