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

atomicshop/mitm/config_static.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from . import import_config
 
 
-SCRIPT_VERSION: str = '1.7.6'
+SCRIPT_VERSION: str = '1.7.8'
 """
 added ca cert check and installation
 """

atomicshop/mitm/connection_thread_worker.py

@@ -72,6 +72,7 @@ def thread_worker_main(
             tls_version=tls_version,
             protocol=client_message.protocol,
             protocol2=client_message.protocol2,
+            protocol3=client_message.protocol3,
             path=http_path,
             status_code=http_status_code,
             command=http_command,
@@ -97,6 +98,8 @@ def thread_worker_main(
             raw_bytes: bytes,
             client_message: ClientMessage):
         nonlocal protocol
+        nonlocal protocol3
+
         # Parsing the raw bytes as HTTP.
         request_http_parsed, is_http_request, request_parsing_error = (
             HTTPRequestParse(raw_bytes).parse())
@@ -117,9 +120,14 @@ def thread_worker_main(
             auto_parsed = response_http_parsed
             network_logger.info(
                 f"HTTP Response Parsed: Status: {response_http_parsed.code}")
+            protocol3 = auto_parsed.headers.get('Sec-WebSocket-Protocol', None)
+            if protocol3:
+                client_message.protocol3 = protocol3
         elif protocol == 'Websocket':
             client_message.protocol2 = 'Frame'
             auto_parsed = parse_websocket(raw_bytes)
+            if protocol3:
+                client_message.protocol3 = protocol3
         else:
             auto_parsed = None
 
@@ -276,6 +284,41 @@ def thread_worker_main(
 
         return client_message
 
+    def responder_thread_worker():
+        nonlocal exception_or_close_in_receiving_thread
+
+        client_message: ClientMessage = client_message_first_start()
+        try:
+            while True:
+                client_message = responder_queue.get()
+
+                # If the message is not a ClientMessage object, then we'll break the loop, since it is the exit signal.
+                if not isinstance(client_message, ClientMessage):
+                    return
+
+                raw_responses: list[bytes] = create_responder_response(client_message)
+
+                is_socket_closed: bool = False
+                for response_raw_bytes in raw_responses:
+                    client_message.reinitialize_dynamic_vars()
+                    client_message.timestamp = datetime.now()
+                    client_message.response_raw_bytes = response_raw_bytes
+                    error_on_send: str = sender.Sender(
+                        ssl_socket=client_socket, class_message=client_message.response_raw_bytes,
+                        logger=network_logger).send()
+
+                    # If there was problem with sending data, we'll break the main while loop.
+                    if error_on_send:
+                        client_message.errors.append(error_on_send)
+                        record_and_statistics_write(client_message)
+                        is_socket_closed = True
+
+                if is_socket_closed:
+                    exception_or_close_in_receiving_thread = True
+                    return
+        except Exception as exc:
+            handle_exceptions_on_sub_connection_thread(client_message, client_exception_queue, exc)
+
     def receive_send_start(
             receiving_socket,
             sending_socket = None,
@@ -339,33 +382,14 @@ def thread_worker_main(
                 # the close on the opposite socket.
                 record_and_statistics_write(client_message)
 
-                if is_socket_closed:
-                    exception_or_close_in_receiving_thread = True
-                    finish_thread()
-                    return
+                # if is_socket_closed:
+                #     exception_or_close_in_receiving_thread = True
+                #     finish_thread()
+                #     return
 
                 # If we're in response mode, execute responder.
                 if config_static.TCPServer.server_response_mode:
-                    raw_responses: list[bytes] = create_responder_response(client_message)
-
-                    is_socket_closed: bool = False
-                    for response_raw_bytes in raw_responses:
-                        client_message.reinitialize_dynamic_vars()
-                        client_message.timestamp = datetime.now()
-                        client_message.response_raw_bytes = response_raw_bytes
-                        error_on_send: str = sender.Sender(
-                            ssl_socket=client_socket, class_message=client_message.response_raw_bytes,
-                            logger=network_logger).send()
-
-                        # If there was problem with sending data, we'll break the main while loop.
-                        if error_on_send:
-                            client_message.errors.append(error_on_send)
-                            record_and_statistics_write(client_message)
-                            is_socket_closed = True
-
-                    if is_socket_closed:
-                        # exception_or_close_in_receiving_thread = True
-                        return
+                    responder_queue.put(client_message)
                 else:
                     # if side == 'Client':
                     #     raise NotImplementedError
@@ -385,9 +409,10 @@ def thread_worker_main(
 
                         record_and_statistics_write(client_message)
 
-                    # If the socket was closed, then we'll break the loop.
+                    # If the socket was closed on message receive, then we'll break the loop only after send.
                     if is_socket_closed or error_on_send:
                         exception_or_close_in_receiving_thread = True
+                        responder_queue.put('exit')
                         finish_thread()
                         return
         except Exception as exc:
@@ -397,20 +422,31 @@ def thread_worker_main(
             if isinstance(exc, OSError) and exc.errno == 10038:
                 print_api("Both sockets are closed, breaking the loop", logger=network_logger, logger_method='info')
             else:
-                exception_or_close_in_receiving_thread = True
-                # handle_exceptions(exc, client_message, recorded)
-                exception_message = tracebacks.get_as_string(one_line=True)
-                error_message = f'Socket Thread [{str(thread_id)}] Exception: {exception_message}'
-                print_api("Exception in a thread, forwarding to parent thread.", logger_method='info', logger=network_logger)
-                client_message.errors.append(error_message)
+                handle_exceptions_on_sub_connection_thread(client_message, exception_queue, exc)
+
+    def handle_exceptions_on_sub_connection_thread(
+            client_message: ClientMessage,
+            exception_queue: queue.Queue,
+            exc: Exception
+    ):
+        nonlocal exception_or_close_in_receiving_thread
 
-                # if not recorded:
-                #     record_and_statistics_write(client_message)
+        exception_or_close_in_receiving_thread=True
+        # handle_exceptions(exc, client_message, recorded)
+        exception_message = tracebacks.get_as_string(one_line=True)
+
+        error_message = f'Socket Thread [{str(thread_id)}] Exception: {exception_message}'
+        print_api("Exception in a thread, forwarding to parent thread.", logger_method='info', logger=network_logger)
+        client_message.errors.append(error_message)
+
+        # if not recorded:
+        #     record_and_statistics_write(client_message)
 
-                finish_thread()
-                exception_queue.put(exc)
+        finish_thread()
+        responder_queue.put('exit')
+        exception_queue.put(exc)
 
-    def handle_exceptions(
+    def handle_exceptions_on_main_connection_thread(
             exc: Exception,
             client_message: ClientMessage
     ):
@@ -441,7 +477,10 @@ def thread_worker_main(
 
     thread_id = threads.current_thread_id()
 
+    # This is the main protocols.
     protocol: str = str()
+    # This is the secondary protocol in the websocket.
+    protocol3: str = str()
     # # This is Client Masked Frame Parser.
     # websocket_masked_frame_parser = websocket_parse.WebsocketFrameParser()
     # # This is Server UnMasked Frame Parser.
@@ -465,6 +504,8 @@ def thread_worker_main(
     client_message_connection: ClientMessage = ClientMessage()
     # This is needed to indicate if there was an exception or socket was closed in any of the receiving thread.
     exception_or_close_in_receiving_thread: bool = False
+    # Responder queue for ClientMessage objects.
+    responder_queue: queue.Queue = queue.Queue()
 
     try:
         client_ip, source_port = client_socket.getpeername()
@@ -473,6 +514,15 @@ def thread_worker_main(
         network_logger.info(f"Thread Created - Client [{client_ip}:{source_port}] | "
                             f"Destination service: [{server_name}:{destination_port}]")
 
+        # If we're in response mode, we'll start the responder thread.
+        if config_static.TCPServer.server_response_mode:
+            responder_thread: threading.Thread = threading.Thread(
+                target=responder_thread_worker, name=f"Thread-{thread_id}-Responder", daemon=True)
+            responder_thread.start()
+        else:
+            # noinspection PyTypeChecker
+            responder_thread = None
+
         service_client = None
         client_receive_count: int = 0
         server_receive_count: int = 0
@@ -488,6 +538,11 @@ def thread_worker_main(
             if not service_client:
                 service_client = create_client_socket(client_message_connection)
                 service_socket_instance, connection_error = service_client.service_connection()
+        else:
+            client_message_connection.timestamp = datetime.now()
+            client_message_connection.action = 'service_connect'
+            client_message_connection.info = 'Server Response Mode'
+            responder_queue.put(client_message_connection)
 
         if connection_error:
             client_message_connection.timestamp = datetime.now()
@@ -512,6 +567,8 @@ def thread_worker_main(
 
             client_thread.join()
             service_thread.join()
+            if config_static.TCPServer.server_response_mode:
+                responder_thread.join()
 
             # If there was an exception in any of the threads, then we'll raise it here.
             if not client_exception_queue.empty():
@@ -524,4 +581,4 @@ def thread_worker_main(
         if not client_message_connection.timestamp:
             client_message_connection.timestamp = datetime.now()
 
-        handle_exceptions(e, client_message_connection)
+        handle_exceptions_on_main_connection_thread(e, client_message_connection)

atomicshop/mitm/message.py

@@ -31,6 +31,7 @@ class ClientMessage:
         self.errors: list = list()
         self.protocol: str = str()
         self.protocol2: str = str()
+        self.protocol3: str = str()
         self.recorded_file_path: str = str()
         self.action: str = str()
 
@@ -52,6 +53,7 @@ class ClientMessage:
         self.errors = list()
         self.protocol = str()
         self.protocol2 = str()
+        self.protocol3 = str()
         self.recorded_file_path = str()
 
     def __iter__(self):

atomicshop/wrappers/socketw/statistics_csv.py

@@ -6,8 +6,8 @@ from ..loggingw import loggingw
 
 LOGGER_NAME: str = 'statistics'
 STATISTICS_HEADER: str = (
-    'request_time_sent,thread_id,tls,protocol,protocol2,host,path,command,status_code,request_size_bytes,response_size_bytes,file_path,'
-    'process_cmd,action,error')
+    'request_time_sent,thread_id,tls,protocol,protocol2,protocol3,host,path,command,status_code,request_size_bytes,'
+    'response_size_bytes,file_path,process_cmd,action,error')
 
 
 class StatisticsCSVWriter:
@@ -36,6 +36,7 @@ class StatisticsCSVWriter:
             tls_version: str,
             protocol: str,
             protocol2: str,
+            protocol3: str,
             path: str,
             status_code: str,
             command: str,
@@ -61,6 +62,7 @@ class StatisticsCSVWriter:
             tls_info,
             protocol,
             protocol2,
+            protocol3,
             host,
             path,
             command,
@@ -100,6 +102,7 @@ class StatisticsCSVWriter:
             tls_version='',
             protocol='',
             protocol2='',
+            protocol3='',
             path='',
             status_code='',
             command='',

{atomicshop-2.18.0.dist-info → atomicshop-2.18.2.dist-info}/METADATA

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

{atomicshop-2.18.0.dist-info → atomicshop-2.18.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=_rMDmeAEfTlnh9BqKgZC0sYcOXLQPbyCSOsQYH_2pl0,123
+atomicshop/__init__.py,sha256=EPl1ua1q9CfR8reaw61h0P-bol2bj9D-p6to1iUifSY,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
@@ -125,12 +125,12 @@ atomicshop/file_io/tomls.py,sha256=ol8EvQPf9sryTmZUf1v55BYSUQ6ml7HVVBHpNKbsIlA,9
 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=r6M4FJVBr9jGIXmjcOk2KBHvCPelWcbZCQrRh3-G26k,7871
+atomicshop/mitm/config_static.py,sha256=HIzxyMEj7DZksYvJsN5VuKpB-_HSVvuR6U59ztS9gi0,7871
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=78QurvuN4a-_Z9q8Fydny5CkMlfz1jIF_XAaB4BiiIA,24227
+atomicshop/mitm/connection_thread_worker.py,sha256=d7XMZoXbXm9IUywg-IIVApad-NKpSdErLWgHtK8A4F4,26623
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=NWz0yBErSrYBn0xWkJDBcHStBJ-kcsv9VtorcSP9x5M,8258
-atomicshop/mitm/message.py,sha256=lseej719nJeCKt2eGxyJCH8cYYEXBUm_RwkunBhloKE,2918
+atomicshop/mitm/message.py,sha256=mNo4Lphr_Jo6IlNX5mPJzABpogWGkjOhwI4meAivwHw,2987
 atomicshop/mitm/mitm_main.py,sha256=AxmqUiDHgfzqmIF8v2GZxlEKth6_AMaYcqAxziWMG0U,23430
 atomicshop/mitm/recs_files.py,sha256=ZAAD0twun-FtmbSniXe3XQhIlawvANNB_HxwbHj7kwI,3151
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
@@ -316,11 +316,11 @@ atomicshop/wrappers/socketw/socket_client.py,sha256=oa3GwS4OPgokrJE5_Oc4-5_wlXHx
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=WtylpezgIIBuz-A6PfM0hO1sm9Exd4j3qhDXcFc74-E,35567
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
-atomicshop/wrappers/socketw/statistics_csv.py,sha256=NvN4i7TxTe1kaOYGlIFkSMtrDXuqKlVngc5JIcNkDOg,3305
+atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh30KAV-jOpoFKT-m8,3395
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=zZQfps-CdODQaTUADbHAwKHr5RUg7BLafnKWBbKaLN4,8728
-atomicshop-2.18.0.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.18.0.dist-info/METADATA,sha256=HR1ivCy6rJMstJDq387Vn9-7DrnIHJ-i4CjK1qD_obs,10499
-atomicshop-2.18.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.18.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.18.0.dist-info/RECORD,,
+atomicshop-2.18.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.18.2.dist-info/METADATA,sha256=jeXe5N1uxADb9T7GA5B10ENn-cmKa6WN6RywG1h3WgY,10499
+atomicshop-2.18.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.18.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.18.2.dist-info/RECORD,,