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

atomicshop/mitm/mitm_main.py

@@ -435,6 +435,16 @@ def mitm_server(config_file_path: str, script_version: str):
     # === EOF Initialize DNS module ================================================================================
     # === Initialize TCP Server ====================================================================================
     if config_static.TCPServer.enable:
+        # Get the default network adapter configuration and set the one from config.
+        # We set the virtual IPs in the network adapter here, so the server multiprocessing processes can listen on them.
+        setting_result: int = _add_virtual_ips_set_default_dns_gateway(system_logger)
+        if setting_result != 0:
+            print_api.print_api("Failed to set the default DNS gateway.", error_type=True, color="red",
+                                logger=system_logger)
+            # Wait for the message to be printed and saved to file.
+            time.sleep(1)
+            return setting_result
+
         # Start statistics CSV Queue listener and the logger.
         _ = statistics_csv.StatisticsCSVWriter(
             directory_path=config_static.LogRec.logs_path,
@@ -549,15 +559,6 @@ def mitm_server(config_file_path: str, script_version: str):
                 time.sleep(1)
                 return 1
 
-        # Get the default network adapter configuration and set the one from config.
-        dns_setting_result: int = _set_default_dns_gateway(system_logger)
-        if dns_setting_result != 0:
-            print_api.print_api("Failed to set the default DNS gateway.", error_type=True, color="red",
-                                logger=system_logger)
-            # Wait for the message to be printed and saved to file.
-            time.sleep(1)
-            return dns_setting_result
-
     if config_static.DNSServer.enable or config_static.TCPServer.enable:
         print_api.print_api("The Server is Ready for Operation!", color="green", logger=system_logger)
         # Get al the queue listener processes (basically this is not necessary, since they're 'daemons', but this is a good practice).
@@ -628,7 +629,7 @@ def _create_tcp_server_process(
         sys.exit(0)
 
 
-def _set_default_dns_gateway(system_logger: logging.Logger) -> int:
+def _add_virtual_ips_set_default_dns_gateway(system_logger: logging.Logger) -> int:
     """
     The function reads the current DNS gateway setting and sets the new one.
 

atomicshop/wrappers/socketw/dns_server.py

@@ -393,29 +393,37 @@ class DnsServer:
                 is_ready_multiprocessing.set()
 
             while True:
+                forward_to_tcp_server = False  # reset every request
+
                 # Needed this logging line when DNS was separate process.
                 # self.logger.info("Waiting to receive new requests...")
 
-                # noinspection PyBroadException
                 try:
                     client_data, client_address = main_socket_object.recvfrom(self.buffer_size_receive)
                     client_data: bytes
                     client_address: tuple
                 except ConnectionResetError:
+                    client_address = (str(), int())
                     traceback_string = tracebacks.get_as_string(one_line=True)
                     # This error happens when the client closes the connection before the server.
                     # This is not an error for a DNS Server, but we'll log it anyway only with the full DNS logger.
                     message = (f"Error: to receive DNS request, An existing connection was forcibly closed | "
                                f"{traceback_string}")
+                    # print_api(message, logger=self.logger, logger_method='critical', traceback_string=True)
                     self.dns_statistics_csv_writer.write_error(
                         dns_type='request', client_address=client_address, error_message=message)
-                    pass
                     continue
-                except Exception:
-                    message = "Unknown Exception: to receive DNS request"
-                    print_api(
-                        message, logger=self.logger, logger_method='critical', traceback_string=True)
-                    pass
+                except KeyboardInterrupt:
+                    # message = "KeyboardInterrupt: Stopping DNS Server..."
+                    # print_api(message, logger=self.logger, logger_method='info')
+                    # self.logger.info(message)
+                    # Stop the server
+                    break
+                except Exception as e:
+                    message = f"Unknown Exception to receive DNS request: {str(e)}"
+                    print_api(message, logger=self.logger, logger_method='critical', traceback_string=True)
+                    self.dns_statistics_csv_writer.write_error(
+                        dns_type='request', client_address=client_address, error_message=message)
                     continue
 
                 # noinspection PyBroadException

{atomicshop-3.3.0.dist-info → atomicshop-3.3.1.dist-info}/METADATA

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

{atomicshop-3.3.0.dist-info → atomicshop-3.3.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=s0WHDabOH-FxPC97KYDUGsgwzxunVIi9wt09wSWNIfY,122
+atomicshop/__init__.py,sha256=RhY_EDRbhKW9IqS5dFeb0i0NFF3rHaUDEuvTN0g-Eh4,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
@@ -140,7 +140,7 @@ atomicshop/mitm/connection_thread_worker.py,sha256=50RP7De2t0WlUk4Ywmv6B63Gwvtvo
 atomicshop/mitm/import_config.py,sha256=gnm_eVkBg3pmLf_iZL_JiMWute2WVLH_AbAb-TCZiHY,18159
 atomicshop/mitm/initialize_engines.py,sha256=dO8u2pffixLDN_evZy0yJpnjmTx_J23cLnoHVLj5qbY,10800
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
-atomicshop/mitm/mitm_main.py,sha256=9NvPM6gUbNjHAj2hY3800kM3nHxSEMgn8MprjV6LoVw,37101
+atomicshop/mitm/mitm_main.py,sha256=8xoyKn-Us1fmddDwt1_8_fkvaSwsd_mmM1Y-hT_KvWA,37244
 atomicshop/mitm/recs_files.py,sha256=tv8XFhYZMkBv4DauvpiAdPgvSo0Bcm1CghnmwO7dx8M,5018
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=5_sAYGX2Xunzo_pS2W5WijNCwr_BlGJbbOO462y_wN4,27533
@@ -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=oGlCZh_z2GwiPH2ZxLGsnlTV64y4IA-Gk6C50wfcqsc,54540
+atomicshop/wrappers/socketw/dns_server.py,sha256=iQym3LmrfUfBwrFmuSHdp_DgeUOueNpEKa_TPYQv0r4,55147
 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,9 +337,9 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqif
 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.3.0.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.0.dist-info/METADATA,sha256=rKYvbtY-GzA-SEwXN_mTpfVAQTqtHvbOC3OwCFSrL0c,10602
-atomicshop-3.3.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.3.0.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
-atomicshop-3.3.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.0.dist-info/RECORD,,
+atomicshop-3.3.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.1.dist-info/METADATA,sha256=RW937Udw4KjGiOk4f_Am7NJ_NHvaEWfu9rYXjjKoinc,10602
+atomicshop-3.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.3.1.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
+atomicshop-3.3.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.1.dist-info/RECORD,,