atomicshop 2.18.24__py3-none-any.whl → 2.18.26__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.24'
+__version__ = '2.18.26'

atomicshop/mitm/connection_thread_worker.py

@@ -36,7 +36,12 @@ def thread_worker_main(
 
         # Same goes for the '.path' attribute, if it is not HTTP message then there will be no path.
         try:
-            http_path: str = client_message.request_auto_parsed.path
+            if client_message.request_auto_parsed and client_message.request_auto_parsed.path:
+                http_path: str = client_message.request_auto_parsed.path
+            elif client_message.response_auto_parsed.path:
+                http_path: str = client_message.response_auto_parsed.path
+            else:
+                http_path: str = str()
         except AttributeError:
             http_path: str = str()
 
@@ -114,12 +119,17 @@ def thread_worker_main(
             auto_parsed = request_http_parsed
             network_logger.info(
                 f"HTTP Request Parsed: Method: {request_http_parsed.command} | Path: {request_http_parsed.path}")
+            http_path_queue.put(request_http_parsed.path)
+            network_logger.info(f"HTTP Request Parsed: Putting PATH to queue.")
 
             is_http_request_a_websocket(auto_parsed, client_message)
         elif is_http_response:
             auto_parsed = response_http_parsed
             network_logger.info(
                 f"HTTP Response Parsed: Status: {response_http_parsed.code}")
+
+            auto_parsed.path = http_path_queue.get()
+            network_logger.info(f"HTTP Response Parsed: Got PATH from queue: [{auto_parsed.path}]")
         elif protocol == 'Websocket':
             client_message.protocol2 = 'Frame'
             auto_parsed = parse_websocket(raw_bytes)
@@ -516,6 +526,8 @@ def thread_worker_main(
     exception_or_close_in_receiving_thread: bool = False
     # Responder queue for ClientMessage objects.
     responder_queue: queue.Queue = queue.Queue()
+    # Queue for http request URI paths.
+    http_path_queue: queue.Queue = queue.Queue()
 
     try:
         client_ip, source_port = client_socket.getpeername()

atomicshop/wrappers/dockerw/dockerw.py

@@ -1,5 +1,6 @@
 import docker
 from docker.models.containers import Container
+from docker import DockerClient
 
 from ...print_api import print_api
 
@@ -187,14 +188,20 @@ def stop_remove_containers_by_image_name(image_name: str):
     client.close()
 
 
-def start_container_without_stop(image_name: str, **kwargs) -> Container:
+def start_container_without_stop(
+        image_name: str,
+        client: DockerClient = None,
+    **kwargs) -> tuple[DockerClient, Container]:
     """
     Start a container in detached mode, this container will not run the entry point, but will run the infinite sleep.
     This way the container will continue running, you can execute commands in it and stop it manually when needed.
     :param image_name: str, the name of the image.
-    :return:
+    :param client: docker.DockerClient, the docker client. If not provided, it will use the default client.
+    :return: Container, the docker container object.
     """
-    client = docker.from_env()
+
+    if client is None:
+        client = docker.from_env()
 
     kwargs.setdefault('detach', True)
     kwargs.setdefault('mem_limit', '512m')
@@ -221,4 +228,34 @@ def start_container_without_stop(image_name: str, **kwargs) -> Container:
 
     print_api(f"Started container: [{container.name}]. Short ID: [{container.short_id}]")
 
-    return container
+    return client, container
+
+
+def run_command_in_running_container(container: Container, command: list) -> tuple[int, bytes, str]:
+    """
+    Run a command in a running container.
+    :param container: Container, the docker container object.
+    :param command: list, the command to run.
+    :return: tuple of (exit_code, output, string_output).
+    """
+
+    # Run the command inside the already running container
+    exec_result = container.exec_run(cmd=command, stdout=True, stderr=True)
+    # Capture logs
+    output_text = exec_result.output.decode("utf-8", errors="replace")
+    execution_result_message: str = str()
+    if output_text:
+        execution_result_message = f"Container execution result:\n{output_text}"
+
+    if exec_result.exit_code != 0:
+        # logging.warning(f"Extraction command returned code {exec_result.exit_code} for '{filename}'")
+        code_message = f"Extraction command returned code {exec_result.exit_code}"
+    else:
+        code_message = "Extraction succeeded"
+
+    if execution_result_message:
+        execution_result_message += f"\n{code_message}"
+    else:
+        execution_result_message = code_message
+
+    return exec_result.exit_code, exec_result.output, execution_result_message

{atomicshop-2.18.24.dist-info → atomicshop-2.18.26.dist-info}/METADATA

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

{atomicshop-2.18.24.dist-info → atomicshop-2.18.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=40D415x6iBWWnyUHnyzzhp2ZQ0Khnt9ol-hd9e49cEk,124
+atomicshop/__init__.py,sha256=bhazsvVh5VR5g-yOQejRoBGt1q11o68HYHVYAVxKpXc,124
 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
@@ -127,7 +127,7 @@ 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=JZL87yV_7giOEJW64hm1fxAUQ5lz525o8HEj1s7VLvI,27505
+atomicshop/mitm/connection_thread_worker.py,sha256=2180oQgD3qRS53zloeALs_vYt66RJWJtnaCqjl2jVs4,28187
 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
@@ -211,7 +211,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/cabs.py,sha256=htzwb2ROYI8yyc8
 atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=AEkjnqEhfCbCUcYaulv3uba5hZjTB03xm-puAINsZGM,5488
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=tHsu0YfBgzuIk9L-PyqLgU_IzyVbCfy8L1EqelNnvWk,17674
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/dockerw/dockerw.py,sha256=7EAlhl0ZEnkGoIp-NlOL6ezx4OUQumhMqLzmjoezv7o,8338
+atomicshop/wrappers/dockerw/dockerw.py,sha256=mwQT8d1aUrn8FbMCwcmUjoP35UWexl8DztNSuJAHJQo,9865
 atomicshop/wrappers/dockerw/install_docker.py,sha256=7NTMxCPBesr0QcqB0RZ5YU0I8FDPtNux_mYAX28wI0I,9982
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
@@ -321,8 +321,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh
 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=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.18.24.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.18.24.dist-info/METADATA,sha256=fesLwc3X1CCKBWf5ddn1SFSFJtVWTaPOyJrxaJbnWVU,10631
-atomicshop-2.18.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.18.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.18.24.dist-info/RECORD,,
+atomicshop-2.18.26.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.18.26.dist-info/METADATA,sha256=PCGI4liQF8srGPeqAAiOEuUZE0z0r4Fv7oYEdd8FnGk,10631
+atomicshop-2.18.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.18.26.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.18.26.dist-info/RECORD,,