atomicshop 2.18.1__py3-none-any.whl → 2.18.3__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.1'
+__version__ = '2.18.3'

atomicshop/mitm/connection_thread_worker.py

@@ -98,7 +98,6 @@ 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 = (
@@ -120,9 +119,6 @@ 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)
@@ -137,12 +133,16 @@ def thread_worker_main(
             auto_parsed,
             client_message: ClientMessage):
         nonlocal protocol
+        nonlocal protocol3
 
         if protocol == 'HTTP':
             if auto_parsed and hasattr(auto_parsed, 'headers') and 'Upgrade' in auto_parsed.headers:
                 if auto_parsed.headers['Upgrade'] == 'websocket':
                     protocol = 'Websocket'
                     client_message.protocol2 = 'Handshake'
+                    protocol3 = auto_parsed.headers.get('Sec-WebSocket-Protocol', None)
+                    if protocol3:
+                        client_message.protocol3 = protocol3
 
                     network_logger.info(f'Protocol upgraded to Websocket')
 
@@ -171,7 +171,7 @@ def thread_worker_main(
 
         # If it's the first cycle and the protocol is Websocket, then we'll create the HTTP Handshake
         # response automatically.
-        if protocol == 'Websocket' and client_receive_count == 0:
+        if protocol == 'Websocket' and client_receive_count == 1:
             responses: list = list()
             responses.append(
                 websocket_parse.create_byte_http_response(client_message.request_raw_bytes))
@@ -240,11 +240,12 @@ def thread_worker_main(
             return
 
         client_message.response_auto_parsed = parse_http(client_message.request_raw_bytes, client_message)
+        # This is needed for each cycle that is not HTTP, but its protocol maybe set by HTTP, like websocket.
         if protocol != '':
             client_message.protocol = protocol
 
         # Parse websocket frames only if it is not the first protocol upgrade request.
-        if protocol == 'Websocket' and client_receive_count != 0:
+        if protocol == 'Websocket' and client_receive_count != 1:
             client_message.request_auto_parsed = parse_websocket(client_message.request_raw_bytes)
 
         # Custom parser, should parse HTTP body or the whole message if not HTTP.
@@ -291,6 +292,11 @@ def thread_worker_main(
         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
@@ -377,10 +383,10 @@ 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:
@@ -404,9 +410,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:
@@ -437,6 +444,7 @@ def thread_worker_main(
         #     record_and_statistics_write(client_message)
 
         finish_thread()
+        responder_queue.put('exit')
         exception_queue.put(exc)
 
     def handle_exceptions_on_main_connection_thread(
@@ -512,6 +520,9 @@ def thread_worker_main(
             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
@@ -557,6 +568,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():

atomicshop/mitm/mitm_main.py

@@ -3,6 +3,8 @@ import multiprocessing
 import time
 import datetime
 
+from distro import minor_version
+
 import atomicshop   # Importing atomicshop package to get the version of the package.
 
 from .. import filesystem, queues, dns, on_exit, print_api
@@ -65,7 +67,8 @@ def 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.12')
+    if not check_python_version_compliance(minor_version='3.12'):
+        return 1
 
     # Import the configuration file.
     result = config_static.load_config(config_file_path)

atomicshop/python_functions.py

@@ -1,4 +1,5 @@
 import sys
+from typing import Union
 
 from .print_api import print_api
 
@@ -43,23 +44,46 @@ def check_if_version_object_is_tuple_or_string(version_object: any,
 
 
 # noinspection PyUnusedLocal
-def check_python_version_compliance(minimum_version: any,
-                                    maximum_version: any = None,
-                                    **kwargs) -> bool:
+def check_python_version_compliance(
+        minimum_version: Union[str, tuple] = None,
+        maximum_version: Union[str, tuple] = None,
+        minor_version: Union[str, tuple] = None,
+        **kwargs
+) -> bool:
     """
     Python version check. Should be executed before importing external libraries, since they depend on Python version.
 
     :param minimum_version: Can be string ('3.10') or tuple of integers ((3, 10)).
     :param maximum_version: Can be string ('3.10') or tuple of integers ((3, 10)).
         If maximum version is not specified, it will be considered as all versions above the minimum are compliant.
+    :param minor_version: Can be string ('3.10') or tuple of integers ((3, 10)).
+        If minor version is specified, it will be considered as all the versions with the same major, minor version
+        are compliant. Example: if minor_version is '3.10', then all the versions with '3.10.x' are compliant.
     :return:
     """
 
-    # Check 'minimum_version' object for string or tuple and get the tuple.
-    minimum_version_scheme: tuple = check_if_version_object_is_tuple_or_string(minimum_version, **kwargs)
+    if not minimum_version and not maximum_version and not minor_version:
+        raise ValueError("At least one of the version parameters should be passed.")
+
+    if minor_version and (minimum_version or maximum_version):
+        raise ValueError("Minor version should be passed alone.")
+
+    # Check objects for string or tuple and get the tuple.
+    if minimum_version:
+        minimum_version_scheme: tuple = check_if_version_object_is_tuple_or_string(minimum_version, **kwargs)
+    else:
+        minimum_version_scheme = tuple()
     # If 'maximum_version' object was passed, check it for string or tuple and get the tuple.
     if maximum_version:
         maximum_version_scheme: tuple = check_if_version_object_is_tuple_or_string(maximum_version, **kwargs)
+    else:
+        maximum_version_scheme = tuple()
+
+    # If 'minor_version' object was passed, check it for string or tuple and get the tuple.
+    if minor_version:
+        minor_version_scheme: tuple = check_if_version_object_is_tuple_or_string(minor_version, **kwargs)
+    else:
+        minor_version_scheme = tuple()
 
     # Get current python version.
     python_version_full: str = get_current_python_version_string()
@@ -67,24 +91,37 @@ def check_python_version_compliance(minimum_version: any,
     message = f"[*] Current Python Version: {python_version_full}"
     print_api(message, logger_method='info', **kwargs)
 
-    # if 'maximum_version' passed and current python version is later or equals to the minimum and earlier than
-    # maximum version required.
-    if maximum_version:
+    if minor_version_scheme:
+        # Check if current python version is later or equals to the minimum required version.
+        if sys.version_info[:2] != minor_version_scheme:
+            message = f"[!!!] YOU NEED TO INSTALL ANY PYTHON " \
+                      f"[{'.'.join(str(i) for i in minor_version_scheme)}] version, " \
+                      f"to work properly."
+            print_api(message, error_type=True, logger_method='critical', **kwargs)
+
+            return False
+    elif minimum_version_scheme and maximum_version_scheme:
         if not sys.version_info >= minimum_version_scheme or not sys.version_info < maximum_version_scheme:
             message = f"[!!!] YOU NEED TO INSTALL AT LEAST PYTHON " \
-                      f"{'.'.join(str(i) for i in minimum_version_scheme)}, " \
-                      f"AND EARLIER THAN {'.'.join(str(i) for i in maximum_version_scheme)}, " \
-                      f"to work properly. Unhandled exceptions are inevitable!"
+                      f"[{'.'.join(str(i) for i in minimum_version_scheme)}], " \
+                      f"AND EARLIER THAN [{'.'.join(str(i) for i in maximum_version_scheme)}], " \
+                      f"to work properly."
             print_api(message, error_type=True, logger_method='critical', **kwargs)
 
             return False
-    # If 'maximum_version' wasn't passed.
-    else:
-        # Check if current python version is later or equals to the minimum required version.
+    elif minimum_version_scheme and not maximum_version_scheme:
         if not sys.version_info >= minimum_version_scheme:
             message = f"[!!!] YOU NEED TO INSTALL AT LEAST PYTHON " \
-                      f"{'.'.join(str(i) for i in minimum_version_scheme)}, " \
-                      f"to work properly. Unhandled exceptions are inevitable!"
+                      f"[{'.'.join(str(i) for i in minimum_version_scheme)}], " \
+                      f"to work properly."
+            print_api(message, error_type=True, logger_method='critical', **kwargs)
+
+            return False
+    elif not minimum_version_scheme and maximum_version_scheme:
+        if not sys.version_info < maximum_version_scheme:
+            message = f"[!!!] YOU NEED TO INSTALL EARLIER THAN PYTHON " \
+                      f"[{'.'.join(str(i) for i in maximum_version_scheme)}], " \
+                      f"to work properly."
             print_api(message, error_type=True, logger_method='critical', **kwargs)
 
             return False

atomicshop/websocket_parse.py

@@ -133,11 +133,11 @@ class WebsocketFrameParser:
             elif current_frame.opcode == Opcode.BINARY:
                 return current_frame.data, 'BINARY'
             elif current_frame.opcode == Opcode.CLOSE:
-                return None, 'CLOSE'
+                return current_frame.data, 'CLOSE'
             elif current_frame.opcode == Opcode.PING:
-                return None, 'PING'
+                return current_frame.data, 'PING'
             elif current_frame.opcode == Opcode.PONG:
-                return None, 'PONG'
+                return current_frame.data, 'PONG'
             else:
                 raise WebsocketParseWrongOpcode("Received unknown frame with opcode:", current_frame.opcode)
 
@@ -239,7 +239,7 @@ def create_websocket_frame(
     return frame_bytes
 
 
-def is_frame_masked(frame_bytes):
+def is_frame_masked(frame_bytes: bytes):
     """
     Determine whether a WebSocket frame is masked.
 

{atomicshop-2.18.1.dist-info → atomicshop-2.18.3.dist-info}/METADATA

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

{atomicshop-2.18.1.dist-info → atomicshop-2.18.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=sd-5MCzdxJLvLvlvBmT3hqetHRPabTPPEglAUqrWUSo,123
+atomicshop/__init__.py,sha256=aciLHL-9AkNeS_Ahx9NP3lvs533n84eEd96p1hCCdRU,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
@@ -28,7 +28,7 @@ atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erX
 atomicshop/print_api.py,sha256=q9dAQCASk3pHp_PtYIpr6iZmRcW_lvrV_gPPNwTMRsw,11152
 atomicshop/process.py,sha256=PeLvyixXaCfftdUF3oMbohI1L4MdLtvQVDx2V1Tz_Rk,16662
 atomicshop/python_file_patcher.py,sha256=-uhbUX-um5k-If_XXuOfCr8wMzZ3QE6h9N8xGWw6W_o,5486
-atomicshop/python_functions.py,sha256=zJg4ogUwECxrDD7xdDN5JikIUctITM5lsyabr_ZNsRw,4435
+atomicshop/python_functions.py,sha256=BPZ3sv5DgQs6Xrl3nIMdPABRpgrau3XSrsnDIz-LEwY,6175
 atomicshop/question_answer_engine.py,sha256=7nM6kGDSFjQNi87b87-kP9lYM0vTjBHn1rEQGNAfdGA,825
 atomicshop/queues.py,sha256=Al0fdC3ZJmdKfv-PyBeIck9lnfLr82BYchvzr189gsI,640
 atomicshop/scheduling.py,sha256=MvF20M6uU0Kh_CQn2ERxMTLvvF-ToBrdMhXNrKxYFj8,4682
@@ -46,7 +46,7 @@ atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/venvs.py,sha256=D9lwOoObkYoRx-weuoAmbvN-RdSHhVm4DE9TVl-utAs,903
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
 atomicshop/web.py,sha256=GLdTXgMxg1_0UQaXC4bOvARVyuFg7SPIeJdsCHV8rNE,11662
-atomicshop/websocket_parse.py,sha256=bkOwiXCNw5bQg1J4KOG7es5kUGysyX2NdfFFVBceSzg,16662
+atomicshop/websocket_parse.py,sha256=aLHWyKqaYqEn_MRBWm2L6rIl6QPmqbVrjEXE_rBzwCw,16711
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
 atomicshop/a_installs/ubuntu/elastic_search_and_kibana.py,sha256=yRB-l1zBxdiN6av-FwNkhcBlaeu4zrDPjQ0uPGgpK2I,244
@@ -127,11 +127,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=HIzxyMEj7DZksYvJsN5VuKpB-_HSVvuR6U59ztS9gi0,7871
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=NHRa_f7k12JH9eDuGmr_-eCPRQVjO77RgCmLe9K2lWA,26073
+atomicshop/mitm/connection_thread_worker.py,sha256=Of-QmuIbUO8Qd1N_BXdGQk2TnPpZd2z-Pxrj0wyq9S8,26758
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=NWz0yBErSrYBn0xWkJDBcHStBJ-kcsv9VtorcSP9x5M,8258
 atomicshop/mitm/message.py,sha256=mNo4Lphr_Jo6IlNX5mPJzABpogWGkjOhwI4meAivwHw,2987
-atomicshop/mitm/mitm_main.py,sha256=AxmqUiDHgfzqmIF8v2GZxlEKth6_AMaYcqAxziWMG0U,23430
+atomicshop/mitm/mitm_main.py,sha256=3F227Vh-F2ZGxOPE7eP4bgIZ72e3BzdUAHhWIMBbhFo,23490
 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
@@ -319,8 +319,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 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.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.18.1.dist-info/METADATA,sha256=udb7ZbArHpKHBqBMXmBZbJw4FBWF0EVZeWc3yVZHeak,10499
-atomicshop-2.18.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.18.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.18.1.dist-info/RECORD,,
+atomicshop-2.18.3.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.18.3.dist-info/METADATA,sha256=9sxUGrK_-bQdIzS6k4nNclLdMORnzGbWBI4vqP7c378,10499
+atomicshop-2.18.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.18.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.18.3.dist-info/RECORD,,