atomicshop 3.1.1__py3-none-any.whl → 3.1.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__ = '3.1.1'
+__version__ = '3.1.3'

atomicshop/mitm/connection_thread_worker.py

@@ -341,7 +341,7 @@ def thread_worker_main(
                     client_message = client_connection_message
 
                     bytes_to_send_list: list[bytes] = create_responder_response(client_message)
-                    print_api(f"Got responses from responder, count: [{len(bytes_to_send_list)}]", logger=network_logger,
+                    print_api(f"Got responses from connect responder, count: [{len(bytes_to_send_list)}]", logger=network_logger,
                               logger_method='info')
                 else:
                     client_message.reinitialize_dynamic_vars()

atomicshop/wrappers/dockerw/dockerw.py

@@ -172,16 +172,6 @@ def add_execution_permissions_for_file(image_id_or_name: str, file_path: str, pr
 
 
 def stop_remove_containers_by_image_name(image_name: str):
-    def stop_remove_container(container: Container):
-        """
-        Stop and remove a container.
-        :param container: Container, the docker container object.
-        :return:
-        """
-        if container.status == "running":
-            print_api(f"Stopping container: [{container.name}]. Short ID: [{container.short_id}]")
-            container.stop()
-        container.remove()
     """
     Remove all containers by image name.
     :param image_name: str, the name of the image.
@@ -189,8 +179,8 @@ def stop_remove_containers_by_image_name(image_name: str):
     """
     client = docker.from_env()
     all_containers = client.containers.list(all=True)
-    for current_container in all_containers:
-        if any(image_name in tag for tag in current_container.image.tags):
+    for container in all_containers:
+        if any(image_name in tag for tag in container.image.tags):
             if container.status == "running":
                 print_api(f"Stopping container: [{container.name}]. Short ID: [{container.short_id}]")
                 container.stop()
@@ -241,7 +231,7 @@ def start_container_without_stop(
     return client, container
 
 
-def run_command_in_running_container(container: Container, command: list) -> tuple[int, str]:
+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.
@@ -250,8 +240,22 @@ def run_command_in_running_container(container: Container, command: list) -> tup
     """
 
     # Run the command inside the already running container
-    status_code, output_bytes = container.exec_run(cmd=command, stdout=True, stderr=True)
+    exec_result = container.exec_run(cmd=command, stdout=True, stderr=True)
     # Capture logs
-    output_text = output_bytes.decode("utf-8", errors="replace")
-
-    return status_code, output_text
+    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/wrappers/mongodbw/mongodbw.py

@@ -867,7 +867,7 @@ def find(
             entries[entry_index]['_id'] = str(entry['_id'])
 
     if key_convert_to_dict and entries:
-        entries = _convert_key_values_to_objects(keys_convert_to_dict=key_convert_to_dict, returned_data=entries)
+        entries = convert_key_values_to_objects(keys_convert_to_dict=key_convert_to_dict, returned_data=entries)
 
     if close_client:
         mongo_client.close()
@@ -1398,7 +1398,7 @@ def get_stats_db_size(
     return stats['dataSize']
 
 
-def _convert_key_values_to_objects(
+def convert_key_values_to_objects(
         keys_convert_to_dict: list[str],
         returned_data: Union[dict, list]
 ) -> Union[dict, list]:
@@ -1424,9 +1424,9 @@ def _convert_key_values_to_objects(
                     # This is needed only to know the possible exception types.
                     raise
             else:
-                _convert_key_values_to_objects(keys_convert_to_dict, value)
+                convert_key_values_to_objects(keys_convert_to_dict, value)
     elif isinstance(returned_data, list):
         for i, item in enumerate(returned_data):
-            returned_data[i] = _convert_key_values_to_objects(keys_convert_to_dict, item)
+            returned_data[i] = convert_key_values_to_objects(keys_convert_to_dict, item)
 
     return returned_data

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -539,10 +539,15 @@ class SocketWrapper:
                     process_name = get_command_instance.get_process_name(print_kwargs={'logger': self.logger})
 
                 source_ip: str = client_address[0]
-                source_hostname: str = socket.gethostbyaddr(source_ip)[0]
                 engine_name: str = get_engine_name(domain_from_engine, self.engines_list)
                 dest_port: int = listening_socket_object.getsockname()[1]
 
+                # Not always there will be a hostname resolved by the IP address, so we will leave it empty if it fails.
+                try:
+                    source_hostname: str = socket.gethostbyaddr(source_ip)[0]
+                except socket.herror:
+                    source_hostname = ''
+
                 # If 'accept()' function worked well, SSL worked well, then 'client_socket' won't be empty.
                 if client_socket:
                     # Get the protocol type from the socket.

{atomicshop-3.1.1.dist-info → atomicshop-3.1.3.dist-info}/METADATA

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

{atomicshop-3.1.1.dist-info → atomicshop-3.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=xTnJCkq3gj1NeN0vpvfRoCBltskMb4tZN_7g3G8Sg28,122
+atomicshop/__init__.py,sha256=iecTS2GszzrWWXhhrFgck5TiMcZTtx_WUNY90_aJA6k,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
@@ -136,7 +136,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=N3D06C_wUytwm80PQCL90ZGHLMHeQlCcI2XQQU2FZ1I,8145
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=ulE5x3hxWyd6gSyahSE-wpnF6VYl_wsJNBbNC0DzKU4,28499
+atomicshop/mitm/connection_thread_worker.py,sha256=Iea2XszWwqcvIq1eyRDBkIuW1uUQHVaAxfdA9EZolac,28507
 atomicshop/mitm/import_config.py,sha256=gCH1hV-CxBAdwjeFJu1I5ntbm5hqzcB0y0vzRPkzra0,16936
 atomicshop/mitm/initialize_engines.py,sha256=Pj9k3iLdoE0KAl3QWG1Z10LHUHY8WQivSPFnQLhCWrc,7385
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
@@ -223,7 +223,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=cVLUiMetBDlvFVNnX9wzVsUO1ylJxQfEwEw8FOEg37w,9659
+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
@@ -275,7 +275,7 @@ atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 atomicshop/wrappers/mongodbw/install_mongodb_ubuntu.py,sha256=2eEOb35T259lhn5koynfTIm1hanxD02zN97ExGSBM2o,4021
 atomicshop/wrappers/mongodbw/install_mongodb_win.py,sha256=64EUQYx7VuMC3ndO2x3nSErh5NZ_BsqMwGvPcybfC-Q,8499
 atomicshop/wrappers/mongodbw/mongo_infra.py,sha256=IjEF0jPzQz866MpTm7rnksnyyWQeUT_B2h2DA9ryAio,2034
-atomicshop/wrappers/mongodbw/mongodbw.py,sha256=_C-v0ZKM7SRThZOnpOtUKmy3fvcvdiGQNvLCo3Drgls,56053
+atomicshop/wrappers/mongodbw/mongodbw.py,sha256=CHbDfW9CXzXUs3V97DYQpt-dYlt_gB60JhwqG2tVFQY,56049
 atomicshop/wrappers/nodejsw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/nodejsw/install_nodejs_ubuntu.py,sha256=wjpJdfAaY92RYl_L9esDIWuBMGeYH35RHJ5BVgMof8Y,6260
 atomicshop/wrappers/nodejsw/install_nodejs_windows.py,sha256=WvXIcEVnKcQYD-KNwhVP094s__1tt0Ir2Y87MABl8Nc,6283
@@ -330,14 +330,14 @@ atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6Dn
 atomicshop/wrappers/socketw/sni.py,sha256=q-F-R1KtE94g8WGrR3QHgi-otXZJUPBprEwQqnY80_A,17639
 atomicshop/wrappers/socketw/socket_client.py,sha256=AQKjm_GZLH2PO7gkFbwzIbXzUXxRFvBTc6onrgapFqs,22048
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=hOOEpA-QNtCGroBzFDpOeD8z2KJWMVTiWaoUvtB1qvU,40886
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=3sEz1VUar1JJU8KxocrOT09-vIh5hLpE29aTZH9TNC8,41117
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2Nd2P_zg8HqCc7vW4s,4120
 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=3Ts1sVqSUiCDsHRHwJCbiZ9EYvv2ELGxF0Y_pibGU4k,9596
-atomicshop-3.1.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.1.1.dist-info/METADATA,sha256=NGjnb2e0ON4vpeuBk4ELqQCNXm9SwV1o9L1js94ufRY,10653
-atomicshop-3.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.1.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.1.1.dist-info/RECORD,,
+atomicshop-3.1.3.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.1.3.dist-info/METADATA,sha256=j8iedLkgbjssGczhijWtmc-mcil_AE8Z-LLIuJm_U4I,10653
+atomicshop-3.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.1.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.1.3.dist-info/RECORD,,