atomicshop 3.3.1__py3-none-any.whl → 3.3.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.3.1'
+__version__ = '3.3.3'

atomicshop/basics/argparse_template.py

@@ -36,6 +36,8 @@ class ArgparseWrapper:
         # formatter_class=RawTextHelpFormatter: shows raw text and not the default argparse text parsing.
         self.parser = argparse.ArgumentParser(description=self.description_full,
                                               usage=self.usage_variable,
+                                              # usage=argparse.SUPPRESS         # Remove usage line from the beginning.
+                                              # add_help=False,                 # Remove help line from the end.
                                               formatter_class=RawTextHelpFormatter)
 
     def add_arguments(self) -> None:

atomicshop/certificates.py

@@ -68,7 +68,8 @@ def is_certificate_in_store(
         by_cert_issuer: bool = True,
         by_cert_thumbprint: bool = True,
         issuer_name: str = None,
-        store_location: str = "ROOT"
+        store_location: str = "ROOT",
+        print_kwargs: dict = None
 ) -> tuple[bool, list]:
     """
     The function will check if the CA certificate is installed in the Windows certificate Trusted Root store.
@@ -89,6 +90,7 @@ def is_certificate_in_store(
         certificates with the same issuer name.
     :param issuer_name: string, issuer name to search for. You can search by certificate or by issuer name.
     :param store_location: string, store location to search in. Default is "ROOT".
+    :param print_kwargs: dict, print_api kwargs.
     :return: tuple(bool - True if certificate is installed and False if not, list of certificates found)
     """
 
@@ -102,7 +104,7 @@ def is_certificate_in_store(
 
     if certificate:
         # Make sure the certificate is x509.Certificate object.
-        certificate_x509 = cryptographyw.convert_object_to_x509(certificate)
+        certificate_x509 = cryptographyw.convert_object_to_x509(certificate, print_kwargs=print_kwargs)
         # Get the certificate thumbprint.
         provided_thumbprint = cryptographyw.get_sha1_thumbprint_from_x509(certificate_x509)
         provided_issuer_common_name: str = cryptographyw.get_issuer_common_name_from_x509(certificate_x509)
@@ -117,7 +119,12 @@ def is_certificate_in_store(
     result_found_list: list = []
     found: bool = False
     for cert, encoding, trust in ssl.enum_certificates(store_location):
+        # Some certificates in the store can have zero or negative serial number.
+        # We will skip them, since they're deprecated by the cryptography library.
         store_certificate = cryptographyw.convert_object_to_x509(cert)
+        if not store_certificate:
+            continue
+
         store_issuer_common_name: str = cryptographyw.get_issuer_common_name_from_x509(store_certificate)
         store_thumbprint = cryptographyw.get_sha1_thumbprint_from_x509(store_certificate)
 

atomicshop/filesystem.py

@@ -288,7 +288,11 @@ def remove_file(file_path: str, **kwargs) -> bool:
         return False
 
 
-def remove_directory(directory_path: str, force_readonly: bool = False, print_kwargs: dict = None) -> bool:
+def remove_directory(
+        directory_path: str,
+        force_readonly: bool = False,
+        print_kwargs: dict = None
+) -> bool:
     """
     Remove directory if it exists.
 

atomicshop/mitm/import_config.py

@@ -93,7 +93,10 @@ def import_engines_configs(print_kwargs: dict) -> int:
     for engine_config_path in engine_config_path_list:
         # Initialize engine.
         current_module: initialize_engines.ModuleCategory = initialize_engines.ModuleCategory(config_static.MainConfig.SCRIPT_DIRECTORY)
-        current_module.fill_engine_fields_from_config(engine_config_path.path, print_kwargs=print_kwargs or {})
+        result_code, error = current_module.fill_engine_fields_from_config(engine_config_path.path, print_kwargs=print_kwargs or {})
+        if result_code != 0:
+            print_api(f"Error reading engine config file: {engine_config_path.path}\n{error}", color='red')
+            return result_code
         result_code, error = current_module.initialize_engine(print_kwargs=print_kwargs or {})
         if result_code != 0:
             print_api(f"Error initializing engine from directory: {Path(engine_config_path.path).parent}\n{error}", color='red')

atomicshop/mitm/initialize_engines.py

@@ -45,7 +45,7 @@ class ModuleCategory:
             self,
             engine_config_file_path: str,
             print_kwargs: dict = None
-    ):
+    ) -> tuple[int, str]:
         # Read the configuration file of the engine.
         configuration_data = tomls.read_toml_file(engine_config_file_path, **(print_kwargs or {}))
 
@@ -82,7 +82,11 @@ class ModuleCategory:
 
         for domain_index, domain_port_string in enumerate(self.domain_list):
             # Splitting the domain and port
-            domain, port = domain_port_string.split(':')
+            if ':' in domain_port_string:
+                domain, port = domain_port_string.split(':')
+            else:
+                error_string: str = f"No [domain:port] pair found in: {domain_port_string}"
+                return 1, error_string
 
             self.domain_target_dict[domain] = {'ip': None, 'port': port}
 
@@ -96,6 +100,8 @@ class ModuleCategory:
         for subdomain, file_name in self.mtls.items():
             self.mtls[subdomain] = f'{engine_directory_path}{os.sep}{file_name}'
 
+        return 0, ''
+
     def initialize_engine(
             self,
             reference_general: bool = False,

atomicshop/mitm/mitm_main.py

@@ -320,7 +320,7 @@ def mitm_server(config_file_path: str, script_version: str):
         return 1
 
     # Import the configuration file.
-    result = config_static.load_config(config_file_path)
+    result = config_static.load_config(config_file_path, print_kwargs=dict(stdout=False))
     if result != 0:
         return result
 
@@ -392,54 +392,17 @@ def mitm_server(config_file_path: str, script_version: str):
     # Logging Startup information.
     startup_output(system_logger, script_version)
 
-    print_api.print_api("Press [Ctrl]+[C] to stop.", color='blue')
-
     multiprocess_list: list[multiprocessing.Process] = list()
     # noinspection PyTypeHints
     is_ready_multiprocessing_event_list: list[multiprocessing.Event] = list()
 
-    # === Initialize DNS module ====================================================================================
-    if config_static.DNSServer.enable:
-        is_dns_process_ready: multiprocessing.Event = multiprocessing.Event()
-        is_ready_multiprocessing_event_list.append(is_dns_process_ready)
-
-        dns_server_kwargs: dict = dict(
-            listening_address=config_static.DNSServer.listening_address,
-            log_directory_path=config_static.LogRec.logs_path,
-            backupCount_log_files_x_days=config_static.LogRec.store_logs_for_x_days,
-            forwarding_dns_service_ipv4=config_static.DNSServer.forwarding_dns_service_ipv4,
-            forwarding_dns_service_port=config_static.DNSServer.forwarding_dns_service_port,
-            resolve_by_engine=(
-                config_static.DNSServer.resolve_by_engine, config_static.ENGINES_LIST),
-            resolve_regular_pass_thru=config_static.DNSServer.resolve_regular_pass_thru,
-            resolve_all_domains_to_ipv4=(
-                config_static.DNSServer.resolve_all_domains_to_ipv4_enable, config_static.DNSServer.target_ipv4),
-            offline_mode=config_static.MainConfig.offline,
-            cache_timeout_minutes=config_static.DNSServer.cache_timeout_minutes,
-            logging_queue=NETWORK_LOGGER_QUEUE,
-            logger_name=network_logger_name,
-            is_ready_multiprocessing=is_dns_process_ready
-        )
-
-        dns_process = multiprocessing.Process(
-            target=dns_server.start_dns_server_multiprocessing_worker,
-            kwargs=dns_server_kwargs,
-            name="dns_server",
-            daemon=True
-        )
-        dns_process.start()
-
-        multiprocess_list.append(dns_process)
-
-
-    # === EOF Initialize DNS module ================================================================================
     # === Initialize TCP Server ====================================================================================
     if config_static.TCPServer.enable:
         # Get the default network adapter configuration and set the one from config.
         # We set the virtual IPs in the network adapter here, so the server multiprocessing processes can listen on them.
         setting_result: int = _add_virtual_ips_set_default_dns_gateway(system_logger)
         if setting_result != 0:
-            print_api.print_api("Failed to set the default DNS gateway.", error_type=True, color="red",
+            print_api.print_api("Failed to set the default DNS gateway OR Virtual IPs.", error_type=True, color="red",
                                 logger=system_logger)
             # Wait for the message to be printed and saved to file.
             time.sleep(1)
@@ -525,9 +488,11 @@ def mitm_server(config_file_path: str, script_version: str):
                 exceptions_logger_name=EXCEPTIONS_CSV_LOGGER_NAME,
                 exceptions_logger_queue=EXCEPTIONS_CSV_LOGGER_QUEUE,
                 forwarding_dns_service_ipv4_list___only_for_localhost=[config_static.DNSServer.forwarding_dns_service_ipv4],
-                skip_extension_id_list=config_static.SkipExtensions.SKIP_EXTENSION_ID_LIST
+                skip_extension_id_list=config_static.SkipExtensions.SKIP_EXTENSION_ID_LIST,
+                print_kwargs=dict(stdout=False)
             )
 
+            # noinspection PyTypeHints
             is_tcp_process_ready: multiprocessing.Event = multiprocessing.Event()
             is_ready_multiprocessing_event_list.append(is_tcp_process_ready)
 
@@ -551,16 +516,52 @@ def mitm_server(config_file_path: str, script_version: str):
         recs_archiver_thread.start()
 
         # Check that all the multiprocesses are ready.
-        for event in is_ready_multiprocessing_event_list:
-            if not event.wait(timeout=30):
-                print_api.print_api("One of the processes didn't start in time.", error_type=True, color="red",
-                                    logger=system_logger)
-                # Wait for the message to be printed and saved to file.
-                time.sleep(1)
-                return 1
+        if not _wait_for_events(is_ready_multiprocessing_event_list, timeout=30, system_logger=system_logger):
+            return 1
+    # === EOF Initialize TCP Server ====================================================================================
+
+    # === Initialize DNS module ========================================================================================
+    if config_static.DNSServer.enable:
+        # noinspection PyTypeHints
+        is_dns_process_ready: multiprocessing.Event = multiprocessing.Event()
+
+        dns_server_kwargs: dict = dict(
+            listening_address=config_static.DNSServer.listening_address,
+            log_directory_path=config_static.LogRec.logs_path,
+            backupCount_log_files_x_days=config_static.LogRec.store_logs_for_x_days,
+            forwarding_dns_service_ipv4=config_static.DNSServer.forwarding_dns_service_ipv4,
+            forwarding_dns_service_port=config_static.DNSServer.forwarding_dns_service_port,
+            resolve_by_engine=(
+                config_static.DNSServer.resolve_by_engine, config_static.ENGINES_LIST),
+            resolve_regular_pass_thru=config_static.DNSServer.resolve_regular_pass_thru,
+            resolve_all_domains_to_ipv4=(
+                config_static.DNSServer.resolve_all_domains_to_ipv4_enable, config_static.DNSServer.target_ipv4),
+            offline_mode=config_static.MainConfig.offline,
+            cache_timeout_minutes=config_static.DNSServer.cache_timeout_minutes,
+            logging_queue=NETWORK_LOGGER_QUEUE,
+            logger_name=network_logger_name,
+            is_ready_multiprocessing=is_dns_process_ready
+        )
+
+        dns_process = multiprocessing.Process(
+            target=dns_server.start_dns_server_multiprocessing_worker,
+            kwargs=dns_server_kwargs,
+            name="dns_server",
+            daemon=True
+        )
+        dns_process.start()
+
+        multiprocess_list.append(dns_process)
+
+        # Check that the multiprocess is ready.
+        if not _wait_for_events([is_dns_process_ready], timeout=30, system_logger=system_logger):
+            return 1
+    # === EOF Initialize DNS module ====================================================================================
 
     if config_static.DNSServer.enable or config_static.TCPServer.enable:
         print_api.print_api("The Server is Ready for Operation!", color="green", logger=system_logger)
+        print_api.print_api("Press [Ctrl]+[C] to stop.", color='blue', logger=system_logger)
+
         # Get al the queue listener processes (basically this is not necessary, since they're 'daemons', but this is a good practice).
         multiprocess_list.extend(loggingw.get_listener_processes())
 
@@ -578,6 +579,7 @@ def mitm_server(config_file_path: str, script_version: str):
             time.sleep(1)
 
 
+# noinspection PyTypeHints
 def _create_tcp_server_process(
         socket_wrapper_kwargs: dict,
         config_file_path: str,
@@ -616,8 +618,21 @@ def _create_tcp_server_process(
         # network_logger_queue_listener.stop()
         sys.exit(1)
 
-    socket_wrapper_instance.start_listening_socket(
-        callable_function=thread_worker_main, callable_args=(config_static,))
+    try:
+        socket_wrapper_instance.start_listening_socket(
+            callable_function=thread_worker_main, callable_args=(config_static,))
+    except OSError as e:
+        if e.winerror == 10022:  # Invalid argument error on Windows.
+            message = (
+                str(f"{e}\n"
+                    f"Check that the IP address and port are correct: {socket_wrapper_kwargs['ip_address']}:{socket_wrapper_kwargs['port']}\n"))
+            print_api.print_api(message, error_type=True, color="red", logger=system_logger, logger_method='critical')
+            # Wait for the message to be printed and saved to file.
+            time.sleep(1)
+            # network_logger_queue_listener.stop()
+            sys.exit(1)
+        else:
+            raise e
 
     # Notify that the TCP server is ready.
     is_tcp_process_ready.set()
@@ -629,6 +644,32 @@ def _create_tcp_server_process(
         sys.exit(0)
 
 
+# noinspection PyTypeHints
+def _wait_for_events(
+        events: list[multiprocessing.Event],
+        timeout: int = 30,
+        system_logger: logging.Logger = None
+) -> bool:
+    """
+    Wait for all events in the list to be set.
+
+    :param events: List of multiprocessing.Event objects.
+    :param timeout: Maximum time to wait for all events to be set.
+    :return: True if all events are set, False if timeout occurs.
+    """
+
+    # Check that all the multiprocesses are ready.
+    for event in events:
+        if not event.wait(timeout=timeout):
+            print_api.print_api("One of the processes didn't start in time.", error_type=True, color="red",
+                                logger=system_logger)
+            # Wait for the message to be printed and saved to file.
+            time.sleep(1)
+            return False
+
+    return True
+
+
 def _add_virtual_ips_set_default_dns_gateway(system_logger: logging.Logger) -> int:
     """
     The function reads the current DNS gateway setting and sets the new one.
@@ -682,7 +723,7 @@ def _add_virtual_ips_set_default_dns_gateway(system_logger: logging.Logger) -> i
             networks.add_virtual_ips_to_default_adapter_by_current_setting(
                 virtual_ipv4s_to_add=IPS_TO_ASSIGN, virtual_ipv4_masks_to_add=MASKS_TO_ASSIGN,
                 dns_gateways=dns_gateway_server_list)
-        except PermissionError as e:
+        except (PermissionError, TimeoutError) as e:
             print_api.print_api(e, error_type=True, color="red", logger=system_logger)
             # Wait for the message to be printed and saved to file.
             time.sleep(1)

atomicshop/networks.py

@@ -2,6 +2,7 @@ import socket
 import time
 from typing import Union
 import os
+import psutil
 
 from icmplib import ping
 from icmplib.models import Host
@@ -10,6 +11,7 @@ from win32com.client import CDispatch
 from .wrappers.pywin32w.wmis import win32networkadapter, win32_networkadapterconfiguration, wmi_helpers, msft_netipaddress
 from .wrappers.ctyping import setup_device
 from .wrappers.winregw import winreg_network
+from .wrappers.psutilw import psutil_networks
 
 
 MICROSOFT_LOOPBACK_DEVICE_NAME: str = 'Microsoft KM-TEST Loopback Adapter'
@@ -42,7 +44,7 @@ def get_default_internet_ipv4_by_connect(target: str = "8.8.8.8") -> str:
         return s.getsockname()[0]  # local address of that route
 
 
-def get_default_internet_interface_name() -> str:
+def get_hostname() -> str:
     """
     Get the default network interface name that is being used for internet.
     :return: string, default network interface name.
@@ -51,6 +53,61 @@ def get_default_internet_interface_name() -> str:
     return socket.gethostname()
 
 
+def get_default_internet_interface_name() -> str | None:
+    """
+    Get the default network interface name that is being used for internet.
+    :return: string, default network interface name.
+    """
+
+    interface_dict: dict = psutil_networks.get_default_connection_name()
+    if not interface_dict:
+        result = None
+    else:
+        # Get the first interface name from the dictionary.
+        result = next(iter(interface_dict.keys()), None)
+
+    return result
+
+
+def get_interface_ips(
+        interface_name: str = None,
+        ipv4: bool = True,
+        ipv6: bool = True,
+        localhost: bool = True,
+        default_interface: bool = False
+):
+    if not ipv4 and not ipv6:
+        raise ValueError("At least one of ipv4 or ipv6 must be True.")
+    if default_interface and interface_name:
+        raise ValueError("You can't specify both default_interface and interface_name.")
+
+    if default_interface:
+        # Get the default interface name.
+        interface_name = get_default_internet_interface_name()
+
+    physical_ip_types: list[str] = []
+    if ipv4:
+        physical_ip_types.append("AF_INET")  # IPv4
+    if ipv6:
+        physical_ip_types.append("AF_INET6")  # IPv6
+
+    interfaces: dict = psutil.net_if_addrs()
+
+    ips = []
+    for name, addresses in interfaces.items():
+        if interface_name and interface_name != name:
+                continue
+
+        for address in addresses:
+            if address.family.name in physical_ip_types:
+                if not localhost and (address.address.startswith("127.") or address.address.startswith("::1")):
+                    # Skip localhost addresses if localhost is True.
+                    continue
+
+                ips.append(address.address)
+    return ips
+
+
 def get_microsoft_loopback_device_network_configuration(
         wmi_instance: CDispatch = None,
         timeout: int = 1,
@@ -351,6 +408,8 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
         availability_wait_seconds: int = 15,
         simulate_only: bool = False,
         locator: CDispatch = None,
+        wait_until_applied: bool = True,
+        wait_until_applied_seconds: int = 15
 ) -> tuple[list[str], list[str], list[str], list[str]]:
     """
     Add virtual IP addresses to the default network adapter.
@@ -381,6 +440,14 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
     :param simulate_only: bool, if True, the function will only prepare the ip addresses and return them without changing anything.
     :param locator: CDispatch, WMI locator object. If not specified, it will be created.
 
+    :param wait_until_applied: bool, if True, the function will wait until the IP addresses are applied.
+        By default, while WMI command is executed, there is no indication if the addresses were finished applying or not.
+        If you have 15+ addresses, it can take a while to apply them.
+    :param wait_until_applied_seconds: int, seconds to wait for the IP addresses to be applied.
+        This is different from availability_wait_seconds, which is the time to wait for the adapter to be available
+        after setting the IP addresses. This is the time to wait for the IP addresses to be
+        applied after setting them. If the IP addresses are not applied in this time, a TimeoutError will be raised.
+
     :return: tuple of lists, (current_ipv4s, current_ipv4_masks, ips_to_assign, masks_to_assign)
     """
 
@@ -462,4 +529,14 @@ def add_virtual_ips_to_default_adapter_by_current_setting(
             # print("[!] No new IPs to assign.")
             pass
 
+        if wait_until_applied:
+            # Wait until the IP addresses are applied.
+            for _ in range(wait_until_applied_seconds):
+                current_ips = get_interface_ips(ipv4=True, ipv6=False, localhost=False, default_interface=True)
+                if set(current_ips) == set(ips):
+                    break
+                time.sleep(1)
+            else:
+                raise TimeoutError("Timeout while waiting for the IP addresses to be applied.")
+
     return current_ipv4s, current_ipv4_masks, ips_to_assign, masks_to_assign

atomicshop/wrappers/certauthw/certauth.py

@@ -198,6 +198,7 @@ class CertificateAuthority(object):
 
         cert.set_issuer(cert.get_subject())
         cert.set_pubkey(key)
+
         cert.add_extensions([
             crypto.X509Extension(b"basicConstraints",
                                  True,

atomicshop/wrappers/cryptographyw.py

@@ -1,5 +1,6 @@
 from typing import Union
 import os
+import warnings
 
 from ..print_api import print_api
 from ..file_io import file_io
@@ -9,6 +10,7 @@ from cryptography.x509 import Certificate
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives import hashes
+from cryptography.utils import CryptographyDeprecationWarning
 
 
 """
@@ -22,7 +24,10 @@ OID_TO_BUILDER_CLASS_EXTENSION_NAME: dict = {
 }
 
 
-def convert_object_to_x509(certificate):
+def convert_object_to_x509(
+        certificate: Union[str, bytes, Certificate],
+        print_kwargs: dict = None
+) -> x509.Certificate | None:
     """Convert certificate to x509 object.
 
     :param certificate: any object that can be converted to x509 object.
@@ -32,7 +37,8 @@ def convert_object_to_x509(certificate):
             string that is PEM certificate will be converted to bytes, then x509.Certificate
             bytes of PEM or DER will be converted to x509.Certificate.
             x509.Certificate will be returned as is.
-    :return: certificate in x509 object of 'cryptography' module.
+    :param print_kwargs: dict, additional arguments to pass to the print function.
+    :return: certificate in x509 object of 'cryptography' module. Or None if the certificate is not valid.
     """
 
     # Check if 'certificate' is a string and a path.
@@ -40,7 +46,7 @@ def convert_object_to_x509(certificate):
         if not os.path.isfile(certificate):
             raise FileNotFoundError(f'File not found: {certificate}')
         # Import the certificate from the path.
-        certificate = file_io.read_file(certificate, file_mode='rb')
+        certificate = file_io.read_file(certificate, file_mode='rb', **(print_kwargs or {}))
 
     # Check if 'certificate' is a bytes object and PEM format.
     # We're checking if it starts with '-----BEGIN ' since the pem certificate can include PRIVATE KEY and will be
@@ -82,14 +88,27 @@ def convert_pem_to_x509_object(certificate: Union[str, bytes]) -> x509.Certifica
     return x509.load_pem_x509_certificate(certificate)
 
 
-def convert_der_to_x509_object(certificate: bytes) -> x509.Certificate:
+def convert_der_to_x509_object(certificate: bytes) -> x509.Certificate | None:
     """Convert DER certificate from socket to x509 object.
 
     :param certificate: bytes, certificate to convert.
     :return: certificate in x509 object of 'cryptography' module.
     """
 
-    return x509.load_der_x509_certificate(certificate)
+    # Some certificates in the store can have zero or negative serial number.
+    # We will skip them, since they're deprecated by the cryptography library.
+
+    try:
+        with warnings.catch_warnings():
+            # Turn the deprecation warning into an exception we can trap.
+            warnings.filterwarnings("error", category=CryptographyDeprecationWarning)
+            converted_certificate = x509.load_der_x509_certificate(certificate)
+    except (CryptographyDeprecationWarning, ValueError):
+        return None  # serial was 0/negative → skip
+    if converted_certificate.serial_number <= 0:  # belt-and-braces
+        return None
+
+    return converted_certificate
 
 
 def convert_x509_object_to_pem_bytes(certificate) -> bytes:

atomicshop/wrappers/dockerw/install_docker.py

@@ -1,6 +1,10 @@
 import sys
+import os
 import subprocess
 import getpass
+import tempfile
+import textwrap
+from pathlib import Path
 
 from ... import process, filesystem
 from ...permissions import permissions, ubuntu_permissions
@@ -8,6 +12,11 @@ from ...print_api import print_api
 from .. import ubuntu_terminal
 
 
+PREPARATION_OUTPUT_DIR: str = str(Path(__file__).parent / "offline-bundle")
+PREPARATION_OUTPUT_ZIP: str = f"{PREPARATION_OUTPUT_DIR}.zip"
+GET_DOCKER_URL: str = "https://get.docker.com"
+
+
 def is_docker_installed():
     """
     The function will check if docker is installed.
@@ -109,6 +118,7 @@ def install_docker_ubuntu(
         # The script will also install docker-compose and docker-buildx.
         # process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh', shell=True)
         process.execute_script('curl -fsSL https://get.docker.com | sh', shell=True)
+        # subprocess.run("curl -fsSL https://get.docker.com | sh", shell=True, check=True)
         # process.execute_script('curl -fsSL https://get.docker.com -o get-docker.sh', shell=True)
         # process.execute_script('sh get-docker.sh', shell=True)
         # filesystem.remove_file('get-docker.sh')
@@ -210,3 +220,230 @@ def install_docker_ubuntu(
         print_api('Docker installation failed.', color='red')
         print_api('Please check the logs above for more information.', color='red')
         return 1
+
+
+def prepare_offline_installation_bundle():
+    # The Bash script in a single triple-quoted string - this is to easier copy-paste it if needed to run directly.
+    bash_script = textwrap.dedent(r"""#!/usr/bin/env bash
+#
+# Build an offline-install bundle for Docker Engine on Ubuntu 24.04 LTS.
+# The package list is auto-discovered from `get.docker.com --dry-run`.
+#
+#   sudo ./prepare_docker_offline.sh  [/path/to/output_dir]
+#
+set -Eeuo pipefail
+
+################################################################################
+# CLI PARAMETERS
+#   $1  → OUTDIR           (already supported: where to build the bundle)
+#   $2  → GET_DOCKER_URL   (defaults to https://get.docker.com)
+#   $3  → OUTPUT_ZIP       (defaults to "$OUTDIR.zip")
+################################################################################
+OUTDIR="${1:-"$PWD/offline-bundle"}"
+GET_DOCKER_URL="${2:-https://get.docker.com}"
+OUTPUT_ZIP="${3:-$OUTDIR.zip}"
+
+die()       { echo "ERROR: $*" >&2; exit 1; }
+need_root() { [[ $EUID -eq 0 ]] || die "Run as root (use sudo)"; }
+need_cmd() {
+  local cmd=$1
+  local pkg=${2:-$1}               # default package == command
+  if ! command -v "$cmd" &>/dev/null; then
+    echo "[*] $cmd not found – installing $pkg ..."
+    apt-get update -qq
+    DEBIAN_FRONTEND=noninteractive \
+      apt-get install -y --no-install-recommends "$pkg" || \
+      die "Unable to install required package: $pkg"
+  fi
+}
+
+need_root
+need_cmd curl
+
+echo "[*] Discovering package list via get.docker.com --dry-run ..."
+DRY_LOG=$(curl -fsSL "$GET_DOCKER_URL" | bash -s -- --dry-run)
+
+echo "[*] Determining package list via --dry-run ..."
+PKGS=$(printf '%s\n' "$DRY_LOG" | sed -n 's/.* install \(.*\) >\/dev\/null.*/\1/p')
+
+if ! grep -q '\S' <<< "$PKGS"; then
+  echo "No packages detected in dry-run output – aborting." >&2
+  exit 1
+fi
+
+echo "[*] Install Docker before preparing the offline bundle."
+curl -fsSL "$GET_DOCKER_URL" | sh
+
+mkdir -p "$OUTDIR"/packages
+echo "[*] Output directory: $OUTDIR"
+
+echo "Packages to install:"
+echo "$PKGS"
+
+echo "[*] Downloading packages and all dependencies …"
+apt-get update -qq
+apt-get clean
+mkdir -p /var/cache/apt/archives/partial
+apt-get -y --download-only --reinstall install $PKGS
+cp -v /var/cache/apt/archives/*.deb "$OUTDIR/packages/"
+echo "[*] $(ls "$OUTDIR/packages" | wc -l) .deb files written to packages/"
+
+echo "[*] Building local Packages.gz index …"
+pushd "$OUTDIR/packages" >/dev/null
+for deb in *.deb; do
+  dpkg-deb -f "$deb" Package
+done | awk '{printf "%s\tmisc\toptional\n",$1}' > override
+apt-ftparchive packages . override | tee Packages | gzip -9c > Packages.gz
+popd >/dev/null
+
+
+echo ">> Checking for Docker ..."
+command -v docker >/dev/null 2>&1 || { echo "Docker not found."; exit 1; }
+
+# Pack final bundle
+echo "[*] Creating a zip archive ..."
+parent_dir=$(dirname  "$OUTDIR")
+base_name=$(basename "$OUTDIR")
+
+# Create new shell, cd into the directory, and zip the contents. So that the zip file will not contain the full path.
+(
+  cd "$parent_dir"
+  zip -rq "$OUTPUT_ZIP" "$base_name"
+)
+
+rm -rf "$OUTDIR"
+echo "Docker offline bundle created at $OUTPUT_ZIP"
+echo
+echo "Copy the zip file and the offline installation python script to the target machine and execute."
+    """)
+
+    # Write it to a secure temporary file.
+    with tempfile.NamedTemporaryFile('w', delete=False, suffix='.sh') as f:
+        f.write(bash_script)
+        temp_path = f.name
+    os.chmod(temp_path, 0o755)  # make it executable
+
+    cmd = [
+        "sudo", "bash", temp_path,
+        PREPARATION_OUTPUT_DIR,
+        GET_DOCKER_URL,
+        PREPARATION_OUTPUT_ZIP,
+    ]
+
+    # Run it and stream output live.
+    try:
+        subprocess.run(cmd, check=True)
+    finally:
+        # 5. Clean up the temp file unless you want to inspect it.
+        os.remove(temp_path)
+
+
+def install_offline_installation_bundle():
+    bash_script = textwrap.dedent(r"""#!/usr/bin/env bash
+# Offline installer for the Docker bundle produced by prepare_docker_offline.sh
+set -euo pipefail
+
+die()       { echo "ERROR: $*" >&2; exit 1; }
+need_root() { [[ $EUID -eq 0 ]] || die "Run as root (use sudo)"; }
+
+need_root
+
+# ------------------------------------------------------------------------------
+# Paths
+# ------------------------------------------------------------------------------
+BUNDLE_ZIP="${1:-"$PWD/offline-bundle.zip"}"
+
+BUNDLE_DIR="${BUNDLE_ZIP%.zip}"  # remove .zip suffix
+REPO_DIR="$BUNDLE_DIR/packages"                        # contains *.deb + Packages
+OFFLINE_LIST="/etc/apt/sources.list.d/docker-offline.list"
+
+# Extract zip archive if it exists
+if [[ -f "$BUNDLE_ZIP" ]]; then
+  echo "[*] Extracting offline bundle from $BUNDLE_ZIP ..."
+  mkdir -p "$BUNDLE_DIR"
+  unzip -q "$BUNDLE_ZIP" -d "."
+else
+  die "Bundle zip file '$BUNDLE_ZIP' not found. Provide a valid path."
+fi
+
+TEMP_PARTS="$(mktemp -d)"                              # empty dir ⇒ no extra lists
+
+# ------------------------------------------------------------------------------
+# Helper to clean up even if the script aborts
+# ------------------------------------------------------------------------------
+cleanup() {
+  sudo rm -f "$OFFLINE_LIST"
+  sudo rm -rf "$TEMP_PARTS"
+}
+trap cleanup EXIT
+
+# ------------------------------------------------------------------------------
+# 1. Add the local repository (trusted) as the *only* source we will use
+# ------------------------------------------------------------------------------
+echo "[*] Adding temporary APT source for the offline bundle …"
+echo "deb [trusted=yes] file:$REPO_DIR ./" | sudo tee "$OFFLINE_LIST" >/dev/null
+
+# Ensure plain index exists (APT always understands the un-compressed form)
+if [[ ! -f "$REPO_DIR/Packages" && -f "$REPO_DIR/Packages.gz" ]]; then
+    gunzip -c "$REPO_DIR/Packages.gz" > "$REPO_DIR/Packages"
+fi
+
+# ------------------------------------------------------------------------------
+# 2. Update metadata – but ONLY from our offline list
+# ------------------------------------------------------------------------------
+echo "[*] Updating APT metadata – offline only …"
+sudo apt-get -o Dir::Etc::sourcelist="$OFFLINE_LIST" \
+             -o Dir::Etc::sourceparts="$TEMP_PARTS" \
+             -o APT::Get::List-Cleanup="0" \
+             update -qq
+
+# ------------------------------------------------------------------------------
+# 3. Figure out which packages are inside the bundle
+# ------------------------------------------------------------------------------
+PKGS=$(awk '/^Package: /{print $2}' "$REPO_DIR/Packages")
+
+echo "[*] Installing:"
+printf '    • %s\n' $PKGS
+
+# ------------------------------------------------------------------------------
+# 4. Install them, again restricting APT to the offline repo only
+# ------------------------------------------------------------------------------
+sudo apt-get -y \
+     -o Dir::Etc::sourcelist="$OFFLINE_LIST" \
+     -o Dir::Etc::sourceparts="$TEMP_PARTS" \
+     install $PKGS
+
+echo "[✓] Docker installed completely offline!"
+
+usage() {
+  echo "Usage: $0 <image-archive.tar.gz>"
+  exit 1
+}
+
+echo ">> Checking for Docker ..."
+command -v docker >/dev/null 2>&1 || {
+  echo "Docker is not installed; install Docker and try again."
+  exit 1
+}
+
+echo "Removing extracted files..."
+rm -rf "$BUNDLE_DIR"
+    """)
+
+    # Write it to a secure temporary file.
+    with tempfile.NamedTemporaryFile('w', delete=False, suffix='.sh') as f:
+        f.write(bash_script)
+        temp_path = f.name
+    os.chmod(temp_path, 0o755)  # make it executable
+
+    cmd = [
+        "sudo", "bash", temp_path,
+        PREPARATION_OUTPUT_ZIP,  # $1  BUNDLE_ZIP
+    ]
+
+    # 4. Run it and stream output live.
+    try:
+        subprocess.run(cmd, check=True)
+    finally:
+        # 5. Clean up the temp file unless you want to inspect it.
+        os.remove(temp_path)

atomicshop/wrappers/playwrightw/engine.py

@@ -8,7 +8,7 @@ from tempfile import gettempdir
 # noinspection PyPackageRequirements
 from playwright.sync_api import sync_playwright, Error
 # Stealth options for playwright. External.
-from playwright_stealth import stealth_sync
+# from playwright_stealth import stealth_sync
 
 from ...keyboard_press import send_alt_tab
 from ... import filesystem, print_api
@@ -150,7 +150,7 @@ class PlaywrightEngine:
             self.page = self.browser.new_page()
 
         # Making playwright stealthier with less footprint of automation.
-        stealth_sync(self.page)
+        # stealth_sync(self.page)
 
     def close_browser(self) -> None:
         self.page.close()

atomicshop/wrappers/pycharmw/ubuntu.py

@@ -11,11 +11,9 @@ def parse_args():
     :return: Parsed arguments.
     """
     parser = argparse.ArgumentParser(description='Install PyCharm Community Edition.')
-    parser.add_argument('-ic', '--install_community', action='store_true', required=True,
-                        help='Install PyCharm Community Edition with snapd.')
-    parser.add_argument('--enable_sudo_execution', action='store_true',
-                        help='There is a problem when trying to run snapd installed Pycharm as sudo, need to enable '
-                             'this.')
+    parser.add_argument(
+        '--enable_sudo_execution', action='store_true',
+        help='There is a problem when trying to run snapd installed Pycharm as sudo, need to enable this.')
 
     return parser.parse_args()
 
@@ -30,10 +28,9 @@ def install_main():
 
     args = parse_args()
 
-    if args.install_community:
-        process.execute_script('sudo snap install pycharm-community --classic', shell=True)
+    process.execute_script('sudo snap install pycharm-professional --classic', shell=True)
 
     if args.enable_sudo_execution:
         process.execute_script('xhost +SI:localuser:root', shell=True)
-        print_api('Run the following command to start PyCharm as root: [sudo snap run pycharm-community]', color='blue')
+        print_api('Run the following command to start PyCharm as root: [sudo snap run pycharm-professional]', color='blue')
     return 0

atomicshop/wrappers/pyopensslw.py

@@ -1,4 +1,4 @@
-import random
+from secrets import randbits
 from OpenSSL import crypto
 
 from .. import certificates
@@ -121,7 +121,14 @@ def generate_server_certificate_empty(
     """
 
     cert = crypto.X509()
-    cert.set_serial_number(random.randint(0, 2 ** 64 - 1))
+
+    # RFC 5280: serial must be positive and non-zero
+    # 1 … 2⁶⁴-1
+    cert.set_serial_number(randbits(64))
+    current_serial = cert.get_serial_number()
+    if current_serial <= 0:
+        raise RuntimeError(f"Refusing to create a certificate with non-positive serial: {str(current_serial)}")
+
     cert.get_subject().CN = certname
 
     cert.set_version(2)

atomicshop/wrappers/socketw/sni.py

@@ -1,5 +1,6 @@
 import ssl
 from dataclasses import dataclass
+from typing import Callable, Any
 
 from ..loggingw import loggingw
 from ...domains import get_domain_without_first_subdomain_if_no_subdomain_return_as_is
@@ -31,7 +32,7 @@ class SNISetup:
             default_server_certificate_name: str,
             default_server_certificate_directory: str,
             default_certificate_domain_list: list,
-            sni_custom_callback_function: callable,
+            sni_custom_callback_function: Callable[..., Any],
             sni_use_default_callback_function: bool,
             sni_use_default_callback_function_extended: bool,
             sni_add_new_domains_to_default_server_certificate: bool,
@@ -54,7 +55,7 @@ class SNISetup:
         self.default_server_certificate_name = default_server_certificate_name
         self.default_server_certificate_directory = default_server_certificate_directory
         self.default_certificate_domain_list = default_certificate_domain_list
-        self.sni_custom_callback_function: callable = sni_custom_callback_function
+        self.sni_custom_callback_function: Callable[..., Any] = sni_custom_callback_function
         self.sni_use_default_callback_function: bool = sni_use_default_callback_function
         self.sni_use_default_callback_function_extended: bool = sni_use_default_callback_function_extended
         self.sni_add_new_domains_to_default_server_certificate = sni_add_new_domains_to_default_server_certificate
@@ -259,20 +260,24 @@ class SNIHandler:
                 # If DNS server is enabled we'll get the domain from dns server.
                 if self.domain_from_dns_server:
                     self.sni_received_parameters.destination_name = self.domain_from_dns_server
-                    message = \
-                        f"SNI Handler: No SNI was passed, using domain from DNS Server: {self.domain_from_dns_server}"
+                    print_api("SNI Passed: False", color="yellow", **(print_kwargs or {}))
+
+                    message = f"SNI Handler: No SNI was passed, using domain from DNS Server: {self.domain_from_dns_server}"
                     print_api(message, color="yellow", **(print_kwargs or {}))
                 # If DNS server is disabled, the domain from dns server will be empty.
                 else:
-                    message = f"SNI Handler: No SNI was passed, No domain passed from DNS Server. " \
-                              f"Service name will be 'None'."
+                    print_api("SNI Passed: False", color="yellow", **(print_kwargs or {}))
+
+                    message = (
+                        f"SNI Handler: No SNI was passed, No domain passed from DNS Server. Service name will be 'None'.")
                     print_api(message, color="yellow", **(print_kwargs or {}))
 
             # Setting "server_hostname" as a domain.
             self.sni_received_parameters.ssl_socket.server_hostname = self.sni_received_parameters.destination_name
-            message = \
-                f"SNI Handler: port {self.sni_received_parameters.ssl_socket.getsockname()[1]}: " \
-                f"Incoming connection for [{self.sni_received_parameters.ssl_socket.server_hostname}]"
+            print_api("SNI Passed: True", color="yellow", **(print_kwargs or {}))
+            message = (
+                f"SNI Handler: port {self.sni_received_parameters.ssl_socket.getsockname()[1]}: "
+                f"Incoming connection for [{self.sni_received_parameters.ssl_socket.server_hostname}]")
             print_api(message, **(print_kwargs or {}))
         except Exception as exception_object:
             message = f"SNI Handler: Undocumented exception general settings section: {exception_object}"

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -1,9 +1,11 @@
 import multiprocessing
 import threading
 import select
-from typing import Literal, Union
+from typing import Literal, Union, Callable, Any
 from pathlib import Path
 import socket
+import shutil
+import os
 
 from ...mitm import initialize_engines
 from ..psutilw import psutil_networks
@@ -47,7 +49,7 @@ class SocketWrapper:
             default_server_certificate_name: str = None,
             default_certificate_domain_list: list = None,
             default_server_certificate_directory: str = None,
-            sni_custom_callback_function: callable = None,
+            sni_custom_callback_function: Callable[..., Any] = None,
             sni_use_default_callback_function: bool = False,
             sni_use_default_callback_function_extended: bool = False,
             sni_add_new_domains_to_default_server_certificate: bool = False,
@@ -76,9 +78,7 @@ class SocketWrapper:
             statistics_logger_queue: multiprocessing.Queue = None,
             exceptions_logger_name: str = 'SocketWrapperExceptions',
             exceptions_logger_queue: multiprocessing.Queue = None,
-            no_engine_usage_enable: bool = False,
-            no_engines_listening_address_list: list[str] = None,
-            engines_list: list[initialize_engines.ModuleCategory] = None
+            print_kwargs: dict = None,
     ):
         """
         Socket Wrapper class that will be used to create sockets, listen on them, accept connections and send them to
@@ -171,22 +171,7 @@ class SocketWrapper:
         :param exceptions_logger_name: string, name of the logger that will be used to log exceptions.
         :param exceptions_logger_queue: multiprocessing.Queue, queue that will be used to log exceptions in
             multiprocessing. You need to start the logger listener in the main process to handle the queue.
-        :param no_engine_usage_enable: boolean, if True, 'engines_list' will be used to listen on the addresses,
-            but the "no_engines_listening_address_list" parameter will be used instead.
-        :param no_engines_listening_address_list: list, of ips+ports that will be listened on.
-            Example: ['0.0.0.0:443', '0.0.0.0:80']
-        :param engines_list: list, of engines that will be used to process the requests. Structure of engine_config.toml:
-            [engine]
-            "domains" = ["example.com"]
-
-            [mtls]
-            # "subdomain.domain.com" = "file_name_in_current_dir.pem"
-
-            [no_sni]
-            #get_from_dns = 1         # Blocking, the accept function will wait until the domain is received from DNS.
-            #get_from_engine = 0
-            #try_to_get_from_dns_on_empty_get_from_engine = 0    # Non-blocking, on empty DNS server queue, accept() will connect to the domain from below.
-            #"domain" = "example.com"
+        :param print_kwargs: dict, additional arguments to pass to the print function.
         """
 
         self.ip_address: str = ip_address
@@ -202,7 +187,7 @@ class SocketWrapper:
         self.default_server_certificate_name: str = default_server_certificate_name
         self.default_certificate_domain_list: list = default_certificate_domain_list
         self.default_server_certificate_directory: str = default_server_certificate_directory
-        self.sni_custom_callback_function: callable = sni_custom_callback_function
+        self.sni_custom_callback_function: Callable[..., Any] = sni_custom_callback_function
         self.sni_use_default_callback_function: bool = sni_use_default_callback_function
         self.sni_use_default_callback_function_extended: bool = sni_use_default_callback_function_extended
         self.sni_add_new_domains_to_default_server_certificate: bool = sni_add_new_domains_to_default_server_certificate
@@ -221,9 +206,7 @@ class SocketWrapper:
         self.ssh_script_to_execute = ssh_script_to_execute
         self.forwarding_dns_service_ipv4_list___only_for_localhost = (
             forwarding_dns_service_ipv4_list___only_for_localhost)
-        # self.no_engine_usage_enable: bool = no_engine_usage_enable
-        # self.no_engines_listening_address_list: list[str] = no_engines_listening_address_list
-        # self.engines_list: list[initialize_engines.ModuleCategory] = engines_list
+        self.print_kwargs: dict = print_kwargs
 
         self.socket_object = None
 
@@ -313,13 +296,6 @@ class SocketWrapper:
                 "You can't set both [sni_use_default_callback_function = True] and [sni_custom_callback_function]."
             raise SocketWrapperConfigurationValuesError(message)
 
-        # if self.no_engine_usage_enable and not self.no_engines_listening_address_list:
-        #     message = "You set [no_engine_usage_enable = True], but you didn't set [no_engines_listening_address_list]."
-        #     raise SocketWrapperConfigurationValuesError(message)
-        # elif not self.no_engine_usage_enable and not self.engines_list:
-        #     message = "You set [no_engine_usage_enable = False], but you didn't set [engines_list]."
-        #     raise SocketWrapperConfigurationValuesError(message)
-
         try:
             booleans.is_only_1_true_in_list(
                 booleans_list_of_tuples=[
@@ -392,6 +368,13 @@ class SocketWrapper:
                 pem_file_path=self.ca_certificate_filepath,
                 crt_file_path=self.ca_certificate_crt_filepath)
 
+            # If someone removed the CA certificate file manually, and now it was created, we also need to
+            # clear the cached certificates.
+            shutil.rmtree(self.sni_server_certificates_cache_directory)
+            os.makedirs(self.sni_server_certificates_cache_directory, exist_ok=True)
+            print_api("Removed cached server certificates.", logger=self.logger)
+
+
         if self.install_ca_certificate_to_root_store:
             if not self.ca_certificate_filepath:
                 message = "You set [install_ca_certificate_to_root_store = True],\n" \
@@ -411,7 +394,8 @@ class SocketWrapper:
                 # If there is only one certificate with the same name, check if it is the same certificate.
                 elif is_installed_by_name and len(certificate_list_by_name) == 1:
                     is_installed_by_file, certificate_list_by_file = certificates.is_certificate_in_store(
-                        certificate=self.ca_certificate_filepath, by_cert_thumbprint=True, by_cert_issuer=True)
+                        certificate=self.ca_certificate_filepath, by_cert_thumbprint=True, by_cert_issuer=True,
+                        print_kwargs=self.print_kwargs)
                     # If the certificate is not the same, delete it.
                     if not is_installed_by_file:
                         if not permissions.is_admin():
@@ -427,7 +411,9 @@ class SocketWrapper:
             if self.install_ca_certificate_to_root_store:
                 # Install CA certificate to the root store if it is not installed.
                 is_installed_by_file, certificate_list_by_file = certificates.is_certificate_in_store(
-                    certificate=self.ca_certificate_filepath, by_cert_thumbprint=True, by_cert_issuer=True)
+                    certificate=self.ca_certificate_filepath, by_cert_thumbprint=True, by_cert_issuer=True,
+                    print_kwargs=self.print_kwargs
+                )
                 if not is_installed_by_file:
                     if not permissions.is_admin():
                         raise SocketWrapperConfigurationValuesError(
@@ -448,7 +434,7 @@ class SocketWrapper:
 
     def start_listening_socket(
             self,
-            callable_function: callable,
+            callable_function: Callable[..., Any],
             callable_args: tuple = ()
     ):
         """
@@ -478,7 +464,7 @@ class SocketWrapper:
     def listening_socket_loop(
             self,
             listening_socket_object: socket.socket,
-            callable_function: callable,
+            callable_function: Callable[..., Any],
             callable_args=()
     ):
         """
@@ -688,7 +674,7 @@ class SocketWrapper:
 
 
 def before_socket_thread_worker(
-        callable_function: callable,
+        callable_function: Callable[..., Any],
         callable_args: tuple,
         exceptions_logger: loggingw.ExceptionCsvLogger = None
 ):

{atomicshop-3.3.1.dist-info → atomicshop-3.3.3.dist-info}/METADATA

@@ -1,32 +1,11 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.3.1
+Version: 3.3.3
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
-License: MIT License
-        
-        Copyright (c) 2023 Bugsec, Denis Kras
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/BugSec-Official/atomicshop
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
@@ -38,7 +17,7 @@ Requires-Dist: cryptography
 Requires-Dist: dnslib
 Requires-Dist: dnspython
 Requires-Dist: docker
-Requires-Dist: flask-socketio
+Requires-Dist: flask_socketio
 Requires-Dist: google-api-python-client
 Requires-Dist: google-generativeai
 Requires-Dist: icmplib
@@ -49,16 +28,16 @@ Requires-Dist: pandas
 Requires-Dist: paramiko
 Requires-Dist: pefile
 Requires-Dist: playwright
-Requires-Dist: playwright-stealth ==1.0.6
 Requires-Dist: protobuf
 Requires-Dist: psutil
-Requires-Dist: py7zr ==0.22.0
+Requires-Dist: py7zr==0.22.0
 Requires-Dist: pyautogui
 Requires-Dist: pymongo
 Requires-Dist: pyopenssl
 Requires-Dist: python-bidi
 Requires-Dist: python-docx
 Requires-Dist: python-magic
+Requires-Dist: pywin32; platform_system == "Windows"
 Requires-Dist: reportlab
 Requires-Dist: setuptools
 Requires-Dist: SoundCard
@@ -66,7 +45,7 @@ Requires-Dist: soundfile
 Requires-Dist: SpeechRecognition
 Requires-Dist: tldextract
 Requires-Dist: websockets
-Requires-Dist: pywin32 ; platform_system == "Windows"
+Dynamic: license-file
 
 <h1 align="center">Atomic Workshop</h1>
 

{atomicshop-3.3.1.dist-info → atomicshop-3.3.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-atomicshop/__init__.py,sha256=RhY_EDRbhKW9IqS5dFeb0i0NFF3rHaUDEuvTN0g-Eh4,122
+atomicshop/__init__.py,sha256=A47BWVHvVET6LMVlCSW87U79q8X9M4kwmxOtynSkYqA,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
 atomicshop/appointment_management.py,sha256=BsYH_PClTGLVazcuNjt30--hpXKYjSmHp1R1iQbM4Hc,7330
-atomicshop/certificates.py,sha256=MEGj7t3Nt2CHE7yzXrvFTLCOKZG9tJ6Ok5JC2BsFRis,7603
+atomicshop/certificates.py,sha256=c9Z3VQvf7T5OD4sPHRzzfZO1M2gRzyRwpMLiMR06B0w,7942
 atomicshop/command_line_processing.py,sha256=u5yT9Ger_cu7ni5ID0VFlRbVD46ARHeNC9tRM-_YXrQ,1038
 atomicshop/config_init.py,sha256=G6_f25zPxyPlht5jJC4ZDrrQiuJfjHiuPd22VBjd9Cg,2683
 atomicshop/console_output.py,sha256=AOSJjrRryE97PAGtgDL03IBtWSi02aNol8noDnW3k6M,4667
@@ -14,7 +14,7 @@ atomicshop/dns.py,sha256=XB0tijVi1bxWLWKV9hPzpt75jK4SrGbZCV5VJbiiQ74,7185
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
 atomicshop/file_types.py,sha256=-0jzQMRlmU1AP9DARjk-HJm1tVE22E6ngP2mRblyEjY,763
-atomicshop/filesystem.py,sha256=owVG49AtC0-6KCYd3bORwTS44xj4NlfktD70QpIQMrM,68030
+atomicshop/filesystem.py,sha256=tCPRA6SQiJJkFL3BnPCoVhPCkvrkI2C4RyuSKzuxo1w,68060
 atomicshop/functions.py,sha256=pK8hoCE9z61PtWCxQJsda7YAphrLH1wxU5x-1QJP-sY,499
 atomicshop/get_process_list.py,sha256=8cxb7gKe9sl4R6H2yMi8J6oe-RkonTvCdKjRFqi-Fs4,6075
 atomicshop/get_process_name_cmd_dll.py,sha256=CtaSp3mgxxJKCCVW8BLx6BJNx4giCklU_T7USiCEwfc,5162
@@ -23,7 +23,7 @@ atomicshop/http_parse.py,sha256=1Tna9YbOM0rE3t6i_M-klBlwd1KNSA9skA_BqKGXDFc,1186
 atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw,11429
 atomicshop/ip_addresses.py,sha256=penRFeJ1-LDVTko4Q0EwK4JiN5cU-KzCBR2VXg9qbUY,1238
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
-atomicshop/networks.py,sha256=xOU_lDf6Rct178W7EB80-AFMgu9Nnh6l7GgjA9z9Jtg,19010
+atomicshop/networks.py,sha256=dTh6T9vAnjYOEPdfpL6W6wN091HwRbVLeNscXWZX_DI,22151
 atomicshop/on_exit.py,sha256=9XlOnzoAG8zlI8wBF4AB8hyrC6Q1b84gkhqpAhhdN9g,6977
 atomicshop/pbtkmultifile_argparse.py,sha256=aEk8nhvoQVu-xyfZosK3ma17CwIgOjzO1erXXdjwtS4,4574
 atomicshop/print_api.py,sha256=SJNQIMqSLlYaPtjHnALySAI-jQYuYHOCGgfP7oe96fU,10957
@@ -91,7 +91,7 @@ atomicshop/archiver/shutils.py,sha256=BomnK7zT-nQXA1z0i2R2aTv8eu88wPx7tf2HtOdbmE
 atomicshop/archiver/zips.py,sha256=0Z_1MWs7YRiCBVpyaG8llnzRguHSO4R51KDMN3FJZt8,16984
 atomicshop/basics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/basics/ansi_escape_codes.py,sha256=uGVRW01v2O052701sOfAdCaM_GLF_cu_jrssuYiPbzA,3216
-atomicshop/basics/argparse_template.py,sha256=horwgSf3MX1ZgRnYxtmmQuz9OU_vKrKggF65gmjlmfg,5836
+atomicshop/basics/argparse_template.py,sha256=NRz63v2jr4tHcAGvqW1okYsGRt6n0u8FXuMQQT3dHPw,6071
 atomicshop/basics/booleans.py,sha256=V36NaMf8AffhCom_ovQeOZlYcdtGyIcQwWKki6h7O0M,1745
 atomicshop/basics/bytes_arrays.py,sha256=xfFW9CBQyzf0iXNWpx-EfrxtN3-tiKzuczPzOb6cOdU,7190
 atomicshop/basics/classes.py,sha256=dBSQktjc1GmphpD_qOGYNDl-mQcmwg8OkhSqtXPfHEU,15301
@@ -137,10 +137,10 @@ atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=yNlELenRvLvW37dl2zXstts5zLklay9xF7sVu_AytKM,8839
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
 atomicshop/mitm/connection_thread_worker.py,sha256=50RP7De2t0WlUk4Ywmv6B63GwvtvoJ9mULo9Q3b-zcY,32992
-atomicshop/mitm/import_config.py,sha256=gnm_eVkBg3pmLf_iZL_JiMWute2WVLH_AbAb-TCZiHY,18159
-atomicshop/mitm/initialize_engines.py,sha256=dO8u2pffixLDN_evZy0yJpnjmTx_J23cLnoHVLj5qbY,10800
+atomicshop/mitm/import_config.py,sha256=J3ZLF28AsKu1h76iRV_sCM52g0oh4dwDGddZl_XcJsU,18351
+atomicshop/mitm/initialize_engines.py,sha256=qzz5jzh_lKC03bI1w5ebngVXo1K-RV3poAyW-nObyqo,11042
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
-atomicshop/mitm/mitm_main.py,sha256=8xoyKn-Us1fmddDwt1_8_fkvaSwsd_mmM1Y-hT_KvWA,37244
+atomicshop/mitm/mitm_main.py,sha256=ucmdCr2p1F4c18DE8qJG3uG3FkkVLWdMEIWevN5BNKE,38967
 atomicshop/mitm/recs_files.py,sha256=tv8XFhYZMkBv4DauvpiAdPgvSo0Bcm1CghnmwO7dx8M,5018
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=5_sAYGX2Xunzo_pS2W5WijNCwr_BlGJbbOO462y_wN4,27533
@@ -195,7 +195,7 @@ atomicshop/wrappers/_process_wrapper_curl.py,sha256=XkZZXYl7D0Q6UfdWqy-18AvpU0yV
 atomicshop/wrappers/_process_wrapper_tar.py,sha256=WUMZFKNrlG4nJP9tWZ51W7BR1j_pIjsjgyAStmWjRGs,655
 atomicshop/wrappers/astw.py,sha256=VkYfkfyc_PJLIOxByT6L7B8uUmKY6-I8XGZl4t_z828,4239
 atomicshop/wrappers/configparserw.py,sha256=JwDTPjZoSrv44YKwIRcjyUnpN-FjgXVfMqMK_tJuSgU,22800
-atomicshop/wrappers/cryptographyw.py,sha256=LfzTnwvJE03G6WZryOOf43VKhhnyMakzHpn8DPPCoy4,13252
+atomicshop/wrappers/cryptographyw.py,sha256=QEUpDn8vUvMg3ADz6-4oC2kbDNC_woDlw7C0zU7qFVM,14233
 atomicshop/wrappers/ffmpegw.py,sha256=wcq0ZnAe0yajBOuTKZCCaKI7CDBjkq7FAgdW5IsKcVE,6031
 atomicshop/wrappers/githubw.py,sha256=DrFF_oN-rulPQV1iKgVzZadCjuYuCC5eKAjZp_3YD0g,23476
 atomicshop/wrappers/msiw.py,sha256=GQLqud72nfex3kvO1bJSruNriCYTYX1_G1gSf1MPkIA,6118
@@ -204,11 +204,11 @@ atomicshop/wrappers/numpyw.py,sha256=sBV4gSKyr23kXTalqAb1oqttzE_2XxBooCui66jbAqc
 atomicshop/wrappers/olefilew.py,sha256=biD5m58rogifCYmYhJBrAFb9O_Bn_spLek_9HofLeYE,2051
 atomicshop/wrappers/pipw.py,sha256=mu4jnHkSaYNfpBiLZKMZxEX_E2LqW5BVthMZkblPB_c,1317
 atomicshop/wrappers/process_wrapper_pbtk.py,sha256=ycPmBRnv627RWks6N8OhxJQe8Gu3h3Vwj-4HswPOw0k,599
-atomicshop/wrappers/pyopensslw.py,sha256=OBWxA6EJ2vU_Qlf4M8m6ilcG3hyYB4yB0EsXUf7NhEU,6804
+atomicshop/wrappers/pyopensslw.py,sha256=pklvXEbi0fHu5n1eRKKHEDLN_nsIqCTXv5Lv0bzReTo,7071
 atomicshop/wrappers/sysmonw.py,sha256=CdawuWuy_uUi3ALCm6lKP7pSyKeTk1MXyzOaTMbBSO8,5346
 atomicshop/wrappers/ubuntu_terminal.py,sha256=vGEBznz_EKzjhsFAXzefep3SwdP2toYPxWkagOjME3I,12328
 atomicshop/wrappers/wslw.py,sha256=2Z7X0j5M2hoRZjbHfm_vqwNXZeptsdkNCdhdcM_S9vo,6998
-atomicshop/wrappers/certauthw/certauth.py,sha256=hKedW0DOWlEigSNm8wu4SqHkCQsGJ1tJfH7s4nr3Bk0,12223
+atomicshop/wrappers/certauthw/certauth.py,sha256=qLo593_MLU8VfbhYoNQ3J5BvtZuE71aFQROysEt6_dk,12225
 atomicshop/wrappers/certauthw/certauthw.py,sha256=4WvhjANI7Kzqrr_nKmtA8Kf7B6rute_5wfP65gwQrjw,8082
 atomicshop/wrappers/ctyping/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/ctyping/file_details_winapi.py,sha256=dmdnCMwx4GgVEctiUIyniVShAoXmv_bZu_o81C450PY,2810
@@ -225,7 +225,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=AEk
 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=GgPSvXxJj15kZ-LPiaHLl8aekof53sSP_U-vUMUe7_8,10639
-atomicshop/wrappers/dockerw/install_docker.py,sha256=CeDlxWuOn_bRUhHEnvpgVGGYZgP7B-Q9qNMkDfFiV2E,10073
+atomicshop/wrappers/dockerw/install_docker.py,sha256=9fjbx3GtpnNA4d4YU2ziPynqANXxo-x-Sq90SUSQEPg,18448
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
 atomicshop/wrappers/elasticsearchw/elastic_infra.py,sha256=at0sD-SFtmEvfGyIU_YBEKoU-MNeVtDQSNscPm0JWLc,10368
@@ -284,7 +284,7 @@ atomicshop/wrappers/playwrightw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 atomicshop/wrappers/playwrightw/_tryouts.py,sha256=l1BLkFsiIMNlgv7nfZd1XGEvXQkIQkIcg48__9OaC00,4920
 atomicshop/wrappers/playwrightw/base.py,sha256=WeRpx8otdXuKSr-BjY-uCJTze21kbPpfitoOjKQz5-g,9818
 atomicshop/wrappers/playwrightw/combos.py,sha256=215y7wugyyBrFK9_0WutnMXsF1jqJ2PLm9eHEa2PMz0,7145
-atomicshop/wrappers/playwrightw/engine.py,sha256=fapOeaqSMNoxJucTvhzp30cKfKNSVe45drhZJcJ-fOk,15191
+atomicshop/wrappers/playwrightw/engine.py,sha256=sw8TfQBNn-v0kMYDtmaWAA0wXndM57-4TMteWMw0jnA,15195
 atomicshop/wrappers/playwrightw/infra.py,sha256=ncp62l6CgAgLz4lqBtKEWZO_6ES8cqnbzJBov-tlpBo,97
 atomicshop/wrappers/playwrightw/javascript.py,sha256=_bW7CAtm0Y8IHYrAalg5HpPFnk6juiqicmkvZ9dITaA,1235
 atomicshop/wrappers/playwrightw/keyboard.py,sha256=zN3YddGO-qUkn6C0CRVFejP4cTuaUwXLDNFhFREjERY,422
@@ -300,7 +300,7 @@ atomicshop/wrappers/psutilw/psutil_networks.py,sha256=79FplDAj45ofBCudlft77O3lfi
 atomicshop/wrappers/psutilw/psutilw.py,sha256=q3EwgprqyrR4zLCjl4l5DHFOQoukEvQMIPjNB504oQ0,21262
 atomicshop/wrappers/psycopgw/psycopgw.py,sha256=XJvVf0oAUjCHkrYfKeFuGCpfn0Oxj3u4SbKMKA1508E,7118
 atomicshop/wrappers/pycharmw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/pycharmw/ubuntu.py,sha256=m9MpgqvIYygulhPxo9g2zlGGXrihBpiY3GNLNyT-B7U,1290
+atomicshop/wrappers/pycharmw/ubuntu.py,sha256=vOvGWvTbzvTja9tRrJW2yJb0_r1EV11RrENGHckzvVE,1051
 atomicshop/wrappers/pycharmw/win.py,sha256=hNP-d95z1zhcCpYqhHE5HZVYxaAlt8JJCNXh65jZsHc,2757
 atomicshop/wrappers/pywin32w/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/pywin32w/cert_store.py,sha256=dV1XyoKTFKZ-HCIVqU2Nd6CTZ8HANqjAXv26rsNzO6s,4365
@@ -328,18 +328,18 @@ atomicshop/wrappers/socketw/exception_wrapper.py,sha256=qW_1CKyPgGlsIt7_jusKkMV4
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=9B3MvcDqr4C3x2fsnjG5SQognd1wRqsBgikxZa0wXG8,8243
 atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6DnPqK_XDUE,4754
-atomicshop/wrappers/socketw/sni.py,sha256=q-F-R1KtE94g8WGrR3QHgi-otXZJUPBprEwQqnY80_A,17639
+atomicshop/wrappers/socketw/sni.py,sha256=GaYnn-CFFmA1WcyFXqICnSLfkM2CNAeS8fTZsruLoaI,17927
 atomicshop/wrappers/socketw/socket_client.py,sha256=McBd3DeCy787oDGCEMUEP2awWy3vdkPqr9w-aFh2fBM,22502
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=NRr64RHrKPG049MplW7_eTtpZzJxBc2Nx_XNfuwP_Hk,42197
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=u_v0pjMMrgsdtI0iPPddiLe2wXnBoqTgNM9Y3zjGD4U,41013
 atomicshop/wrappers/socketw/ssl_base.py,sha256=62-hPm7zla1rh3m_WvDnXqKH-sDUTdiRptD8STCkgdk,2313
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqifgExgDGfQIa9pFxQA,5543
 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=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.3.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.1.dist-info/METADATA,sha256=RW937Udw4KjGiOk4f_Am7NJ_NHvaEWfu9rYXjjKoinc,10602
-atomicshop-3.3.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.3.1.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
-atomicshop-3.3.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.1.dist-info/RECORD,,
+atomicshop-3.3.3.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.3.dist-info/METADATA,sha256=_zTFWmzEYji52hVTJBoGFrdrjSxlo6wS1AhAhq0qHqQ,9288
+atomicshop-3.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.3.dist-info/entry_points.txt,sha256=SJEgEP0KoFtfxuGwe5tOzKfXkjR9Dv6YYug33KNYxyY,69
+atomicshop-3.3.3.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.3.dist-info/RECORD,,

{atomicshop-3.3.1.dist-info → atomicshop-3.3.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any