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

atomicshop/mitm/connection_thread_worker.py

@@ -31,6 +31,7 @@ def thread_worker_main(
             host=client_message.server_name,
             tls_type=tls_type,
             tls_version=tls_version,
+            protocol=client_message.protocol,
             path=client_message.request_raw_decoded.path,
             status_code=status_code,
             command=client_message.request_raw_decoded.command,
@@ -145,6 +146,7 @@ def thread_worker_main(
 
                 # If the request is HTTP protocol.
                 if request_is_http:
+                    client_message.protocol = 'HTTP'
                     network_logger.info(f"Method: {request_decoded.command}")
                     network_logger.info(f"Path: {request_decoded.path}")
                     # statistics.dict['path'] = request_decoded.path

atomicshop/mitm/initialize_mitm_server.py

@@ -33,7 +33,7 @@ def initialize_mitm_server(config_file_path: str):
     # Main function should return integer with error code, 0 is successful.
     # Since listening server is infinite, this will not be reached.
     # After modules import - we check for python version.
-    check_python_version_compliance(minimum_version='3.11')
+    check_python_version_compliance(minimum_version='3.12')
 
     # Import the configuration file.
     result = config_static.load_config(config_file_path)
@@ -267,7 +267,8 @@ def initialize_mitm_server(config_file_path: str):
                 statistics_logs_directory=config_static.Log.logs_path,
                 forwarding_dns_service_ipv4_list___only_for_localhost=(
                     config_static.TCPServer.forwarding_dns_service_ipv4_list___only_for_localhost),
-                skip_extension_id_list=config_static.SkipExtensions.SKIP_EXTENSION_ID_LIST
+                skip_extension_id_list=config_static.SkipExtensions.SKIP_EXTENSION_ID_LIST,
+                request_domain_from_dns_server_queue=domain_queue
             )
         except socket_wrapper.SocketWrapperPortInUseError as e:
             print_api(e, error_type=True, color="red", logger=system_logger)
@@ -279,8 +280,6 @@ def initialize_mitm_server(config_file_path: str):
 
         socket_wrapper_instance.create_tcp_listening_socket_list()
 
-        socket_wrapper_instance.requested_domain_from_dns_server = domain_queue
-
         # Before we start the loop. we can set the default gateway if specified.
         set_dns_gateway = False
         dns_gateway_server_list = list()

atomicshop/mitm/message.py

@@ -20,6 +20,7 @@ class ClientMessage:
         self.thread_id = None
         self.info: str = str()
         self.error: str = str()
+        self.protocol: str = str()
 
     def reinitialize(self) -> None:
         """

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -58,7 +58,7 @@ class SocketWrapper:
             ] = None,
             logger=None,
             statistics_logs_directory: str = None,
-            request_domain_queue: queues.NonBlockQueue = None
+            request_domain_from_dns_server_queue: queues.NonBlockQueue = None
     ):
         """
         Socket Wrapper class that will be used to create sockets, listen on them, accept connections and send them to
@@ -140,8 +140,8 @@ class SocketWrapper:
 
             statistics_writer: statistics_csv.StatisticsCSVWriter object, there is a logger object that
                 will be used to write the statistics file.
-        :param request_domain_queue: queues.NonBlockQueue object, non-blocking queue that will be used to get
-            the domain name that was requested from the DNS server (atomicshop.wrappers.socketw.dns_server).
+        :param request_domain_from_dns_server_queue: queues.NonBlockQueue object, non-blocking queue that will be used
+            to get the domain name that was requested from the DNS server (atomicshop.wrappers.socketw.dns_server).
             This is used to get the domain name that got to the DNS server and set it to the socket in case SNI
             was empty (in the SNIHandler class to set the 'server_hostname' for the socket).
         """
@@ -175,6 +175,7 @@ class SocketWrapper:
         self.statistics_logs_directory: str = statistics_logs_directory
         self.forwarding_dns_service_ipv4_list___only_for_localhost = (
             forwarding_dns_service_ipv4_list___only_for_localhost)
+        self.request_domain_from_dns_server_queue = request_domain_from_dns_server_queue
 
         self.socket_object = None
 
@@ -184,7 +185,6 @@ class SocketWrapper:
 
         self.sni_received_dict: dict = dict()
         self.sni_execute_extended: bool = False
-        self.requested_domain_from_dns_server = None
         self.certauth_wrapper = None
 
         # Defining list of threads, so we can "join()" them in the end all at once.
@@ -343,9 +343,10 @@ class SocketWrapper:
                 # Get the domain queue. Tried using "Queue.Queue" object, but it stomped the SSL Sockets
                 # from accepting connections.
                 domain_from_dns_server = None
-                if self.requested_domain_from_dns_server.queue:
-                    domain_from_dns_server = self.requested_domain_from_dns_server.queue
-                    self.logger.info(f"Requested domain from DNS Server: {self.requested_domain_from_dns_server.queue}")
+                if self.request_domain_from_dns_server_queue.queue:
+                    domain_from_dns_server = self.request_domain_from_dns_server_queue.queue
+                    self.logger.info(
+                        f"Requested domain from DNS Server: {self.request_domain_from_dns_server_queue.queue}")
 
                 # Wait from any connection on "accept()".
                 # 'client_socket' is socket or ssl socket, 'client_address' is a tuple (ip_address, port).

atomicshop/wrappers/socketw/statistics_csv.py

@@ -7,8 +7,8 @@ from ..loggingw import loggingw
 
 LOGGER_NAME: str = 'statistics'
 STATISTICS_HEADER: str = \
-    ('request_time_sent,tls,host,path,command,status_code,request_size_bytes,response_size_bytes,file_path,process_cmd,'
-     'error')
+    ('request_time_sent,tls,protocol,host,path,command,status_code,request_size_bytes,response_size_bytes,file_path,'
+     'process_cmd,error')
 
 
 class StatisticsCSVWriter:
@@ -36,6 +36,7 @@ class StatisticsCSVWriter:
             host: str,
             tls_type: str,
             tls_version: str,
+            protocol: str,
             path: str,
             status_code: str,
             command: str,
@@ -57,6 +58,7 @@ class StatisticsCSVWriter:
         escaped_line_string: str = csvs.escape_csv_line_to_string([
             request_time_sent,
             tls_info,
+            protocol,
             host,
             path,
             command,
@@ -90,6 +92,7 @@ class StatisticsCSVWriter:
             host=host,
             tls_type='',
             tls_version='',
+            protocol='',
             path='',
             status_code='',
             command='',

{atomicshop-2.16.3.dist-info → atomicshop-2.16.4.dist-info}/METADATA

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

{atomicshop-2.16.3.dist-info → atomicshop-2.16.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=AKEuH8PqWV4-EZXo12aT4GrKcoEcFGoUZbDx7SgXtAY,123
+atomicshop/__init__.py,sha256=qvqC-jKfoVnKLC0gKh74skVKFkhCyeZoJmqVnB7ZHVs,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
@@ -123,11 +123,11 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=PZp9AAW2ihSUZCen1fhuwFW7Rucd9jA1Pw6pK6Q3DVM,6994
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=BHSUwSKJfdGigPH1zsFXvjDH1RQV-UkRA7pyx2yn8-Q,18992
+atomicshop/mitm/connection_thread_worker.py,sha256=I5Oq6tSUIXAS6FYlflZzYDtC1rbIYdIKax_R1WsFjso,19093
 atomicshop/mitm/import_config.py,sha256=fvUESPMkpRvkL7HtMaUqQRPwPF0eHV5V6pwueg4DQkU,7881
 atomicshop/mitm/initialize_engines.py,sha256=YoSNksMdu4vHjr5xy77t9t5W74zyDZIdjIXrzd3eRXc,8204
-atomicshop/mitm/initialize_mitm_server.py,sha256=PMYjt06IysdDpq5utKof4X578EAgCp4TDjiLC7uxDPQ,18382
-atomicshop/mitm/message.py,sha256=u2U2f2SOHdBNU-6r1Ik2W14ai2EOwxUV4wVfGZA098k,1732
+atomicshop/mitm/initialize_mitm_server.py,sha256=qP41_hgSa5Wd9WIwIugTqSmWxaL3S3Hh9OCQfcxUwqk,18367
+atomicshop/mitm/message.py,sha256=fHvYEyEx-FAXbIMrKMJ_ybBinezF6IFbPlwCqpRrF44,1768
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
 atomicshop/mitm/statistic_analyzer.py,sha256=E0ba1PjsUEcmQUPPw2YH911lyWkbQb9OSAdgB3pihsY,24658
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -301,11 +301,11 @@ atomicshop/wrappers/socketw/sender.py,sha256=hHpBLc0LCfOIUErq2mc0ATfp0tDDQ5XhcYT
 atomicshop/wrappers/socketw/sni.py,sha256=JUlPmM5e_Wzv2QcYxOrW_mwYZlft2JMPin6nSXFW9ug,17169
 atomicshop/wrappers/socketw/socket_client.py,sha256=FNmTt94YvjZP0X4RPb7icO3xD_nBHQ_XynnObdWFiAU,19682
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=SdchUf9qrPk1Rrat0RzvMeN_2NioD7b7a97MkToCYgM,6332
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=655nGQp0HFy-7KNx8zHsA-miXi9ufC7DNeGsvvGALak,28415
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=g7f_8RkW80EZeQWNTqGYnfrQkgAI56T3SwWybq7ZsXg,28521
 atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
-atomicshop/wrappers/socketw/statistics_csv.py,sha256=q5vRA7jL5ERFhIGctn5HjBlOppwSY9qMoEVgo898AIo,2979
-atomicshop-2.16.3.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.3.dist-info/METADATA,sha256=ysLTKs85RLuQJr6JD-u3QVGH4EkdVE4ETVdwMjdCm-M,10502
-atomicshop-2.16.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.3.dist-info/RECORD,,
+atomicshop/wrappers/socketw/statistics_csv.py,sha256=Jc0D12crkKRaqoCRQ-2Mz1zm6n4UUx9dXakf-N2TYWA,3065
+atomicshop-2.16.4.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.4.dist-info/METADATA,sha256=QTPJ7H6koTAVNzjcFBpcUg5HDA2YC1DdC_Ejg47aG0Y,10502
+atomicshop-2.16.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.4.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.4.dist-info/RECORD,,