atomicshop 2.16.14__py3-none-any.whl → 2.16.15__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.16.14'
+__version__ = '2.16.15'

atomicshop/certificates.py

@@ -5,8 +5,10 @@ https://oidref.com/1.3.6.1.5.5.7.3.1
 
 
 import ssl
+from typing import Literal
 
 from .wrappers import cryptographyw
+from .wrappers.pywin32w import cert_store
 from .print_api import print_api
 
 
@@ -16,72 +18,165 @@ from .print_api import print_api
 SECONDS_NOT_AFTER_3_YEARS = 3 * 365 * 24 * 60 * 60
 
 
-def is_certificate_in_store(certificate, issuer_only: bool = False, thumbprint_only: bool = False):
+def get_pem_certificate_from_string(certificate: str) -> str:
     """
-    The function will check if the certificate is installed in the Windows certificate store.
-
-    :param certificate: x509 object, certificate to check.
-    :param issuer_only: bool, if True, will check only by the certificate issuer common name is installed in the store.
-        The problem that the issuer common name is not unique, so it can be installed multiple times.
-    :param thumbprint_only: bool, if True, will check only by the certificate thumbprint is installed in the store.
-        The problem that searching by the thumbprint will not tell you if there are multiple certificates with the same
-        issuer name.
-    :return: bool, True if certificate is installed, False if not.
+    Some PEM certificates can contain a private key. This function will return only the certificate part.
+
+    :param certificate: string, PEM certificate.
+    :return: string, certificate part.
     """
 
-    # Make sure the certificate is x509.Certificate object.
-    certificate = cryptographyw.convert_object_to_x509(certificate)
-    # Get the certificate thumbprint.
-    thumbprint = cryptographyw.get_sha1_thumbprint_from_x509(certificate)
-    issuer_common_name: str = cryptographyw.get_issuer_common_name_from_x509(certificate)
+    certificate_lines = certificate.split('\n')
+    certificate_part = ''
+    start = False
+    for line in certificate_lines:
+        if 'BEGIN CERTIFICATE' in line:
+            start = True
+        if start:
+            certificate_part += line + '\n'
+        if 'END CERTIFICATE' in line:
+            break
 
-    # for store in ["CA", "ROOT", "MY"]:
-    for cert, encoding, trust in ssl.enum_certificates("ROOT"):
-        store_certificate = cryptographyw.convert_object_to_x509(cert)
-        store_issuer_common_name: str = cryptographyw.get_issuer_common_name_from_x509(store_certificate)
-        store_thumbprint = cryptographyw.get_sha1_thumbprint_from_x509(store_certificate)
-
-        if issuer_only:
-            if store_issuer_common_name == issuer_common_name:
-                return True, certificate
-        elif thumbprint_only:
-            if store_thumbprint == thumbprint:
-                return True, certificate
-        elif not issuer_only and not thumbprint_only:
-            if store_thumbprint == thumbprint and store_issuer_common_name == issuer_common_name:
-                return True, certificate
+    return certificate_part
 
 
-def get_certificates_by_issuer_name(issuer_name: str, print_kwargs: dict = None):
+def write_crt_certificate_file_in_pem_format_from_pem_file(
+        pem_file_path: str,
+        crt_file_path: str
+):
     """
-    The function will return all certificates with the specified issuer name.
+    The function will read the PEM certificate file and write it to the CRT file in PEM format.
+    The function is used to convert the PEM certificate file to the CRT file.
 
-    :param issuer_name: string, issuer name to search for.
-    :param print_kwargs: dict, that contains all the arguments for 'print_api' function.
+    Basically the point here is that the CRT file is the same as the PEM file, but the extension is different,
+    and it doesn't support integrated private key.
 
-    :return: list, of certificates with the specified issuer name.
+    :param pem_file_path: string, path to the PEM certificate file.
+    :param crt_file_path: string, path to the CRT certificate file.
     """
 
-    if not print_kwargs:
-        print_kwargs = {}
+    with open(pem_file_path, 'r') as f:
+        certificate_string = f.read()
+
+    certificate_pem = get_pem_certificate_from_string(certificate_string)
+
+    with open(crt_file_path, 'w') as f:
+        f.write(certificate_pem)
+
+
+def is_certificate_in_store(
+        certificate: any = None,
+        by_cert_issuer: bool = True,
+        by_cert_thumbprint: bool = True,
+        issuer_name: str = None,
+        store_location: str = "ROOT"
+) -> tuple[bool, list]:
+    """
+    The function will check if the CA certificate is installed in the Windows certificate Trusted Root store.
+    NO ADMIN RIGHTS NEEDED.
+
+    :param certificate: x509 object, certificate to check. You can search by certificate or by issuer name.
+        Supported types:
+            string that is path to file will be imported as bytes object abd converted to x509.Certificate
+                After check if it's PEM or DER format.
+            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.
+    :param by_cert_issuer: bool, if True, will check only by the certificate issuer common name is installed in the store.
+        The problem if the search will be by issuer alone, that the issuer common name is not unique,
+        so it can be installed multiple times.
+    :param by_cert_thumbprint: bool, if True, will check only by the certificate thumbprint is installed in the store.
+        The problem that searching by the thumbprint alone will not tell you if there are multiple
+        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".
+    :return: tuple(bool - True if certificate is installed and False if not, list of certificates found)
+    """
 
-    certificates_list = []
+    if not by_cert_issuer and not by_cert_thumbprint:
+        raise ValueError('At least one of the parameters "by_issuer" or "by_thumbprint" must be True.')
+
+    if not certificate and not issuer_name:
+        raise ValueError('At least one of the parameters "certificate" or "issuer_name" must be provided.')
+    elif certificate and issuer_name:
+        raise ValueError('Only one of the parameters "certificate" or "issuer_name" must be provided.')
+
+    if certificate:
+        # Make sure the certificate is x509.Certificate object.
+        certificate_x509 = cryptographyw.convert_object_to_x509(certificate)
+        # 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)
+    elif issuer_name:
+        provided_thumbprint = None
+        provided_issuer_common_name = issuer_name
+    else:
+        raise ValueError('At least one of the parameters "certificate" or "issuer_name" must be provided.')
 
-    for cert, encoding, trust in ssl.enum_certificates("ROOT"):
+    # Iterate over all certificates in the store specifically in the ROOT.
+    # for store in ["CA", "ROOT", "MY"]:
+    result_found_list: list = []
+    found: bool = False
+    for cert, encoding, trust in ssl.enum_certificates(store_location):
         store_certificate = cryptographyw.convert_object_to_x509(cert)
         store_issuer_common_name: str = cryptographyw.get_issuer_common_name_from_x509(store_certificate)
+        store_thumbprint = cryptographyw.get_sha1_thumbprint_from_x509(store_certificate)
 
-        if store_issuer_common_name == issuer_name:
-            certificates_list.append(store_certificate)
+        if certificate:
+            if by_cert_issuer and not by_cert_thumbprint:
+                if store_issuer_common_name == provided_issuer_common_name:
+                    result_found_list.append(store_certificate)
+                    found = True
+            elif by_cert_thumbprint and not by_cert_issuer:
+                if store_thumbprint == provided_thumbprint:
+                    result_found_list.append(store_certificate)
+                    found = True
+            elif by_cert_issuer and by_cert_thumbprint:
+                if store_thumbprint == provided_thumbprint and store_issuer_common_name == provided_issuer_common_name:
+                    result_found_list.append(store_certificate)
+                    found = True
+        elif issuer_name:
+            if store_issuer_common_name == provided_issuer_common_name:
+                result_found_list.append(store_certificate)
+                found = True
+
+    return found, result_found_list
+
+
+def delete_certificate_by_issuer_name(
+        issuer_name: str,
+        store_location: Literal[
+            "ROOT",
+            "CA",
+            "MY"] = "ROOT",
+        print_kwargs: dict = None
+):
+    """
+    NEED ADMIN RIGHTS.
+    The function will remove all certificates with the specified issuer name.
+    There can be several certificates with this name.
 
-    if certificates_list:
-        for certificate_single in certificates_list:
-            issuer_name = cryptographyw.get_issuer_common_name_from_x509(certificate_single)
-            thumbprint = cryptographyw.get_sha1_thumbprint_from_x509(certificate_single)
-            message = f'Issuer name: {issuer_name} | Thumbprint: {thumbprint}'
-            print_api(message, **print_kwargs)
-    else:
-        message = f'No certificates with issuer name: {issuer_name}'
-        print_api(message, **print_kwargs)
+    :param issuer_name: string, issuer name to search for.
+    :param store_location: string, store location to search in. Default is "ROOT".
+    :param print_kwargs: dict, print_api kwargs.
+    """
+
+    cert_store.delete_certificate_by_issuer_name(issuer_name, store_location, print_kwargs)
+
+
+def install_certificate_file(
+        file_path: str,
+        store_location: Literal[
+            "ROOT", "CA", "MY"] = "ROOT",
+        print_kwargs: dict = None
+):
+    """
+    The function will install the certificate from the file to the specified store location.
+    NEED ADMIN RIGHTS.
+
+    :param file_path: string, full file path to the certificate file.
+    :param store_location: string, store location to install the certificate. Default is "ROOT".
+    :param print_kwargs: dict, print_api kwargs.
+    """
 
-    return certificates_list
+    cert_store.install_certificate_file(file_path, store_location, print_kwargs)

atomicshop/mitm/config_static.py

@@ -4,9 +4,9 @@ from dataclasses import dataclass
 from . import import_config
 
 
-SCRIPT_VERSION: str = '1.7.5'
+SCRIPT_VERSION: str = '1.7.6'
 """
-Added logs backup days
+added ca cert check and installation
 """
 
 
@@ -23,6 +23,8 @@ LIST_OF_BOOLEANS: list = [
     ('tcp', 'engines_usage'),
     ('tcp', 'server_response_mode'),
     ('logrec', 'enable_request_response_recordings_in_logs'),
+    ('certificates', 'install_ca_certificate_to_root_store'),
+    ('certificates', 'uninstall_unused_ca_certificates_with_mitm_ca_name'),
     ('certificates', 'default_server_certificate_usage'),
     ('certificates', 'sni_add_new_domains_to_default_server_certificate'),
     ('certificates', 'custom_server_certificate_usage'),
@@ -55,8 +57,11 @@ class MainConfig:
     # Certificates.
     default_server_certificate_name: str = 'default'
     ca_certificate_name: str = 'ElaborateCA'
+    ca_certificate_pem_filename: str = f'{ca_certificate_name}.pem'
+    ca_certificate_crt_filename: str = f'{ca_certificate_name}_for_manual_installation_not_used_by_script.crt'
     # CA Certificate name and file name without extension.
     ca_certificate_filepath: str = None
+    ca_certificate_crt_filepath: str = None
     # Default server certificate file name and path.
     default_server_certificate_filename = f'{default_server_certificate_name}.pem'
     default_server_certificate_filepath: str = None
@@ -65,7 +70,8 @@ class MainConfig:
     def update(cls):
         # This runs after the dataclass is initialized
         cls.ENGINES_DIRECTORY_PATH = cls.SCRIPT_DIRECTORY + os.sep + cls.ENGINES_DIRECTORY_NAME
-        cls.ca_certificate_filepath = f'{cls.SCRIPT_DIRECTORY}{os.sep}{cls.ca_certificate_name}.pem'
+        cls.ca_certificate_filepath = f'{cls.SCRIPT_DIRECTORY}{os.sep}{cls.ca_certificate_pem_filename}'
+        cls.ca_certificate_crt_filepath = f'{cls.SCRIPT_DIRECTORY}{os.sep}{cls.ca_certificate_crt_filename}'
         cls.default_server_certificate_filepath = \
             f'{cls.SCRIPT_DIRECTORY}{os.sep}{cls.default_server_certificate_filename}'
 
@@ -115,6 +121,9 @@ class LogRec:
 
 @dataclass
 class Certificates:
+    install_ca_certificate_to_root_store: bool
+    uninstall_unused_ca_certificates_with_mitm_ca_name: bool
+
     default_server_certificate_usage: bool
     sni_add_new_domains_to_default_server_certificate: bool
 

atomicshop/mitm/import_config.py

@@ -117,6 +117,14 @@ def check_configurations() -> int:
             print_api(message, color='red')
             return 1
 
+    # This is checked directly in the SocketWrapper.
+    # if (config_static.Certificates.install_ca_certificate_to_root_store and not is_admin) or \
+    #         (config_static.Certificates.uninstall_unused_ca_certificates_with_mitm_ca_name and not is_admin):
+    #     message: str = \
+    #         "Need to run the script with administrative rights to install or uninstall CA certificate.\nExiting..."
+    #     print_api(message, color='red')
+    #     return 1
+
     return 0
 
 

atomicshop/mitm/mitm_main.py

@@ -263,6 +263,10 @@ def mitm_server_main(config_file_path: str):
                 listening_port_list=config_static.TCPServer.listening_port_list,
                 ca_certificate_name=config_static.MainConfig.ca_certificate_name,
                 ca_certificate_filepath=config_static.MainConfig.ca_certificate_filepath,
+                ca_certificate_crt_filepath=config_static.MainConfig.ca_certificate_crt_filepath,
+                install_ca_certificate_to_root_store=config_static.Certificates.install_ca_certificate_to_root_store,
+                uninstall_unused_ca_certificates_with_ca_certificate_name=(
+                    config_static.Certificates.uninstall_unused_ca_certificates_with_mitm_ca_name),
                 default_server_certificate_usage=config_static.Certificates.default_server_certificate_usage,
                 default_server_certificate_name=config_static.MainConfig.default_server_certificate_name,
                 default_certificate_domain_list=config_static.Certificates.domains_all_times,
@@ -316,11 +320,10 @@ def mitm_server_main(config_file_path: str):
             dns_gateway_server_list = [base.DEFAULT_IPV4]
             set_dns_gateway = True
 
+        # Get current network interface state.
+        global NETWORK_INTERFACE_IS_DYNAMIC, NETWORK_INTERFACE_IPV4_ADDRESS_LIST
+        NETWORK_INTERFACE_IS_DYNAMIC, NETWORK_INTERFACE_IPV4_ADDRESS_LIST = dns.get_default_dns_gateway()
         if set_dns_gateway:
-            # Get current network interface state.
-            global NETWORK_INTERFACE_IS_DYNAMIC, NETWORK_INTERFACE_IPV4_ADDRESS_LIST
-            NETWORK_INTERFACE_IS_DYNAMIC, NETWORK_INTERFACE_IPV4_ADDRESS_LIST = dns.get_default_dns_gateway()
-
             # Set the DNS gateway to the specified one only if the DNS gateway is dynamic or it is static but different
             # from the one specified in the configuration file.
             if (NETWORK_INTERFACE_IS_DYNAMIC or (not NETWORK_INTERFACE_IS_DYNAMIC and

atomicshop/wrappers/cryptographyw.py

@@ -36,7 +36,9 @@ def convert_object_to_x509(certificate):
     """
 
     # Check if 'certificate' is a string and a path.
-    if isinstance(certificate, str) and os.path.isfile(certificate):
+    if isinstance(certificate, str):
+        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')
 

atomicshop/wrappers/pywin32w/cert_store.py

@@ -0,0 +1,89 @@
+from typing import Literal
+import win32crypt as wcrypt
+
+from ...print_api import print_api
+from ... import certificates
+
+
+# lpszStoreProvider
+CERT_STORE_PROV_SYSTEM = 0x0000000A
+# dwFlags
+CERT_SYSTEM_STORE_LOCAL_MACHINE = 0x00020000
+CERT_SYSTEM_STORE_CURRENT_USER = 0x00010000
+CERT_CLOSE_STORE_FORCE_FLAG = 0x00000001
+CRYPT_STRING_BASE64HEADER = 0x00000000
+X509_ASN_ENCODING = 0x00000001
+CERT_STORE_ADD_REPLACE_EXISTING = 3
+
+
+STORE_LOCATION_TO_CERT_SYSTEM_STORE: dict = {
+    "ROOT": CERT_SYSTEM_STORE_LOCAL_MACHINE,
+    "CA": CERT_SYSTEM_STORE_LOCAL_MACHINE,
+    "MY": CERT_SYSTEM_STORE_CURRENT_USER
+}
+
+
+def delete_certificate_by_issuer_name(
+        issuer_name: str,
+        store_location: Literal[
+            "ROOT",
+            "CA",
+            "MY"] = "ROOT",
+        print_kwargs: dict = None
+):
+    """
+    NEED ADMIN RIGHTS.
+    The function will remove all certificates with the specified issuer name.
+    There can be several certificates with this name.
+
+    :param issuer_name: string, issuer name to search for.
+    :param store_location: string, store location to search in. Default is "ROOT".
+    :param print_kwargs: dict, print_api kwargs.
+    """
+
+    store = wcrypt.CertOpenStore(
+        CERT_STORE_PROV_SYSTEM, 0, None, STORE_LOCATION_TO_CERT_SYSTEM_STORE[store_location], store_location)
+
+    for cert in store.CertEnumCertificatesInStore():
+        # Certificate properties.
+        # cert.CertEnumCertificateContextProperties()
+        subject_string: str = wcrypt.CertNameToStr(cert.Subject)
+        if subject_string == issuer_name:
+            # Remove the certificate.
+            cert.CertDeleteCertificateFromStore()
+            print_api(f"Removed the Certificate with issuer: {issuer_name}", **(print_kwargs or {}))
+
+    # There is an exception about store close.
+    # store.CertCloseStore()
+
+
+def install_certificate_file(
+        file_path: str,
+        store_location: Literal[
+            "ROOT", "CA", "MY"] = "ROOT",
+        print_kwargs: dict = None
+):
+    """
+    NEED ADMIN RIGHTS.
+    The function will install the certificate from the file to the specified store location.
+
+    :param file_path: string, full file path to the certificate file.
+    :param store_location: string, store location to install the certificate. Default is "ROOT".
+    :param print_kwargs: dict, print_api kwargs.
+    """
+
+    with open(file_path, 'r') as f:
+        certificate_string = f.read()
+
+    certificate_pem = certificates.get_pem_certificate_from_string(certificate_string)
+
+    certificate_bytes = wcrypt.CryptStringToBinary(certificate_pem, CRYPT_STRING_BASE64HEADER)[0]
+
+    store = wcrypt.CertOpenStore(
+        CERT_STORE_PROV_SYSTEM, 0, None, STORE_LOCATION_TO_CERT_SYSTEM_STORE[store_location], store_location)
+
+    store.CertAddEncodedCertificateToStore(X509_ASN_ENCODING, certificate_bytes, CERT_STORE_ADD_REPLACE_EXISTING)
+    store.CertCloseStore(CERT_CLOSE_STORE_FORCE_FLAG)
+
+    message = f"Certificate installed to the store: [{store_location}] from file: [{file_path}]"
+    print_api(message, **(print_kwargs or {}))

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -1,10 +1,13 @@
 import threading
 import select
 from typing import Literal, Union
+from pathlib import Path
 
 from ..psutilw import networks
+from ..certauthw import certauthw
 from ...script_as_string_processor import ScriptAsStringProcessor
-from ... import queues, filesystem
+from ...permissions import permissions
+from ... import queues, filesystem, certificates
 from ...basics import booleans
 from ...print_api import print_api
 
@@ -30,6 +33,9 @@ class SocketWrapper:
             forwarding_dns_service_ipv4_list___only_for_localhost: list = None,
             ca_certificate_name: str = None,
             ca_certificate_filepath: str = None,
+            ca_certificate_crt_filepath: str = None,
+            install_ca_certificate_to_root_store: bool = False,
+            uninstall_unused_ca_certificates_with_ca_certificate_name: bool = False,
             default_server_certificate_usage: bool = False,
             default_server_certificate_name: str = None,
             default_certificate_domain_list: list = None,
@@ -68,7 +74,13 @@ class SocketWrapper:
             Example: '0.0.0.0'. For all interfaces.
         :param listening_port_list: list, of ports that will be listened on.
         :param ca_certificate_name: CA certificate name.
-        :param ca_certificate_filepath: CA certificate file path.
+        :param ca_certificate_filepath: CA certificate file path with '.pem' extension.
+        :param ca_certificate_crt_filepath: CA certificate file path with '.crt' extension.
+            This file will be created from the PEM file 'ca_certificate_filepath' for manual installation.
+        :param install_ca_certificate_to_root_store: boolean, if True, CA certificate will be installed
+            to the root store.
+        :param uninstall_unused_ca_certificates_with_ca_certificate_name: boolean, if True, unused CA certificates
+            with provided 'ca_certificate_name' will be uninstalled.
         :param default_server_certificate_usage: boolean, if True, default server certificate will be used
             for each incoming socket.
         :param sni_custom_callback_function: callable, custom callback function that will be executed when
@@ -150,6 +162,10 @@ class SocketWrapper:
         self.listening_port_list: list[int] = listening_port_list
         self.ca_certificate_name: str = ca_certificate_name
         self.ca_certificate_filepath: str = ca_certificate_filepath
+        self.ca_certificate_crt_filepath: str = ca_certificate_crt_filepath
+        self.install_ca_certificate_to_root_store: bool = install_ca_certificate_to_root_store
+        self.uninstall_unused_ca_certificates_with_ca_certificate_name: bool = \
+            uninstall_unused_ca_certificates_with_ca_certificate_name
         self.default_server_certificate_usage: bool = default_server_certificate_usage
         self.default_server_certificate_name: str = default_server_certificate_name
         self.default_certificate_domain_list: list = default_certificate_domain_list
@@ -270,6 +286,59 @@ class SocketWrapper:
                 error_messages.append(f"Port [{port}] is already in use by process: {process_info}")
             raise SocketWrapperPortInUseError("\n".join(error_messages))
 
+        if not filesystem.is_file_exists(file_path=self.ca_certificate_filepath):
+            # Initialize CertAuthWrapper.
+            ca_certificate_directory: str = str(Path(self.ca_certificate_filepath).parent)
+            certauth_wrapper = certauthw.CertAuthWrapper(
+                ca_certificate_name=self.ca_certificate_name,
+                ca_certificate_filepath=self.ca_certificate_filepath,
+                server_certificate_directory=ca_certificate_directory
+            )
+
+            # Create CA certificate if it doesn't exist.
+            certauth_wrapper.create_use_ca_certificate()
+
+            certificates.write_crt_certificate_file_in_pem_format_from_pem_file(
+                pem_file_path=self.ca_certificate_filepath,
+                crt_file_path=self.ca_certificate_crt_filepath)
+
+        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" \
+                          "But you didn't set [ca_certificate_filepath]."
+                raise SocketWrapperConfigurationValuesError(message)
+
+            # Before installation check if there are any unused certificates with the same name.
+            if self.uninstall_unused_ca_certificates_with_ca_certificate_name:
+                # Check how many certificates with our ca certificate name are installed.
+                is_installed_by_name, certificate_list_by_name = certificates.is_certificate_in_store(
+                    issuer_name=self.ca_certificate_name)
+                # If there is more than one certificate with the same name, delete them all.
+                if is_installed_by_name and len(certificate_list_by_name) > 1:
+                    certificates.delete_certificate_by_issuer_name(self.ca_certificate_name)
+                # 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)
+                    # If the certificate is not the same, delete it.
+                    if not is_installed_by_file:
+                        if not permissions.is_admin():
+                            raise SocketWrapperConfigurationValuesError(
+                                "You need to run the script with admin rights to uninstall the unused certificates.")
+                        certificates.delete_certificate_by_issuer_name(
+                            self.ca_certificate_name, store_location="ROOT", print_kwargs={'logger': self.logger})
+
+            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)
+                if not is_installed_by_file:
+                    if not permissions.is_admin():
+                        raise SocketWrapperConfigurationValuesError(
+                            "You need to run the script with admin rights to install the CA certificate.")
+                    certificates.install_certificate_file(
+                        self.ca_certificate_filepath, store_location="ROOT", print_kwargs={'logger': self.logger})
+
     # Creating listening sockets.
     def create_socket_ipv4_tcp(self, ip_address: str, port: int):
         self.sni_execute_extended = True

atomicshop/wrappers/socketw/ssl_base.py

@@ -60,7 +60,7 @@ def is_tls(client_socket) -> Optional[Tuple[str, str]]:
     }
 
     # Get the tuple of the type and version as strings.
-    tls_content_and_version_tuple: tuple =\
+    tls_content_and_version_tuple: tuple = \
         content_type_map.get(content_type), version_map.get((version_major, version_minor))
 
     # If both parts of the tuple are not None, return the protocol type.

{atomicshop-2.16.14.dist-info → atomicshop-2.16.15.dist-info}/METADATA

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

{atomicshop-2.16.14.dist-info → atomicshop-2.16.15.dist-info}/RECORD

@@ -1,9 +1,9 @@
-atomicshop/__init__.py,sha256=waCY7DPxgBrQX24BI-0hmphU84XoLtMKDMT9OE3ps6g,124
+atomicshop/__init__.py,sha256=UzNeZyRkmLnYywv5edPjB0_p7zEgYfoGzcusp1FpodI,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
 atomicshop/appointment_management.py,sha256=BsYH_PClTGLVazcuNjt30--hpXKYjSmHp1R1iQbM4Hc,7330
-atomicshop/certificates.py,sha256=J-cmd6Rpq3zZyzsOH-GcdqIXdg2UwM8_E9mg7XtUph8,3787
+atomicshop/certificates.py,sha256=ssOTD1uN4OaB9TU7mI0Dg_sSGFb6Xxw28A7TtyKmMMY,7637
 atomicshop/command_line_processing.py,sha256=u5yT9Ger_cu7ni5ID0VFlRbVD46ARHeNC9tRM-_YXrQ,1038
 atomicshop/config_init.py,sha256=BSxc2FhytQPv06g5z9wbAXuA6oYCAsAJLxu_mTExhwI,2491
 atomicshop/console_output.py,sha256=AOSJjrRryE97PAGtgDL03IBtWSi02aNol8noDnW3k6M,4667
@@ -122,13 +122,13 @@ atomicshop/file_io/tomls.py,sha256=ol8EvQPf9sryTmZUf1v55BYSUQ6ml7HVVBHpNKbsIlA,9
 atomicshop/file_io/xlsxs.py,sha256=v_dyg9GD4LqgWi6wA1QuWRZ8zG4ZwB6Dz52ytdcmmmI,2184
 atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,2104
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/mitm/config_static.py,sha256=ds31SXyOnOEvd7RAVWvw1o8MrQTVWWZCZeQX0wUptbM,7171
+atomicshop/mitm/config_static.py,sha256=UNvRTb3ZuFVGZpF33fvaIf0xw_VGyml2ExIwqW_uYcg,7777
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
 atomicshop/mitm/connection_thread_worker.py,sha256=1MBpRoLpzWJMvxqQKizo6IVQ4XYsbKGsjxianNQLUlE,20051
-atomicshop/mitm/import_config.py,sha256=5peDr6cT0ZWK3J53yG-VEew77CKrvB88CphM10SQd3I,7868
+atomicshop/mitm/import_config.py,sha256=_nu8mgA-M4s6dZ8_QWx3x0aVb75upvsCuX_PIUg4X2w,8345
 atomicshop/mitm/initialize_engines.py,sha256=kBG8TBnyFuwlJ1uKaWDzc5AiZNpwdvouq2pr-PYrdEA,8349
 atomicshop/mitm/message.py,sha256=d_sm3O_aoZf87dDQP44xOMNEG-uZBN1ZecQgMCacbZs,1814
-atomicshop/mitm/mitm_main.py,sha256=N7ckWZhGkkIO2dJ7m7mnh_h7lQTihUeSAfzTTsHEKts,20903
+atomicshop/mitm/mitm_main.py,sha256=CdCv4nYt_jwd23AI14v6lC2H8SZeIZqsXjFhwq61UtM,21285
 atomicshop/mitm/recs_files.py,sha256=btOuYQca4DuBOAKp9OY21HGjeEVOx9r_k-AnZOqs3Dk,3007
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
 atomicshop/mitm/statistic_analyzer.py,sha256=AzL9rQhg0tLJj33gZfxdwWghmbXGLh_HyMBDpzuBmsQ,24709
@@ -178,7 +178,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=_5jgzQjgCDQrFN1f6_0y-IdIR6bGaYIjIy92bjJRuHI,13168
+atomicshop/wrappers/cryptographyw.py,sha256=LfzTnwvJE03G6WZryOOf43VKhhnyMakzHpn8DPPCoy4,13252
 atomicshop/wrappers/ffmpegw.py,sha256=wcq0ZnAe0yajBOuTKZCCaKI7CDBjkq7FAgdW5IsKcVE,6031
 atomicshop/wrappers/githubw.py,sha256=AQcFuT5mvDUNT_cI31MwkJ7srdhMtttF8FyXS8vs5cU,12270
 atomicshop/wrappers/msiw.py,sha256=GQLqud72nfex3kvO1bJSruNriCYTYX1_G1gSf1MPkIA,6118
@@ -278,6 +278,7 @@ atomicshop/wrappers/pycharmw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 atomicshop/wrappers/pycharmw/ubuntu.py,sha256=l2_9SXrw7ApSvFOROGZdPZa5ylZBKofk4sYqf4IugQs,1223
 atomicshop/wrappers/pycharmw/win.py,sha256=jdnTkUqZX_BrMW8AmW-xGtxdV-wmmNr_NMA2jB6JHsQ,2725
 atomicshop/wrappers/pywin32w/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+atomicshop/wrappers/pywin32w/cert_store.py,sha256=bpFm5nH9j6I9eJdLjPnSvo-g4OyJO7Sb5VddzVE9-UM,3156
 atomicshop/wrappers/pywin32w/console.py,sha256=LstHajPLgXp9qQxFNR44QfH10nOnNp3bCJquxaTquns,1175
 atomicshop/wrappers/pywin32w/winshell.py,sha256=i2bKiMldPU7_azsD5xGQDdMwjaM7suKJd3k0Szmcs6c,723
 atomicshop/wrappers/pywin32w/win_event_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -303,13 +304,13 @@ atomicshop/wrappers/socketw/sender.py,sha256=d7YQFlCBMFTYtkGxbS-8cm5rh5WWFeBVvrE
 atomicshop/wrappers/socketw/sni.py,sha256=fVwyh3h9IqfLMnf4__bMIzcF4c-Kk9mlbDWMRXKN-ow,17155
 atomicshop/wrappers/socketw/socket_client.py,sha256=FNmTt94YvjZP0X4RPb7icO3xD_nBHQ_XynnObdWFiAU,19682
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=wAwyst8YdVyVfZfERav1A9_OnMJAiVBy-4uY0RpNqkU,6339
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=g7f_8RkW80EZeQWNTqGYnfrQkgAI56T3SwWybq7ZsXg,28521
-atomicshop/wrappers/socketw/ssl_base.py,sha256=k4V3gwkbq10MvOH4btU4onLX2GNOsSfUAdcHmL1rpVE,2274
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=DiDzg9OlgahxpqAsnOkCKHNcE-H-YAY3ndVMeU-oCjw,33363
+atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=V_m1D0KpizQox3IEWp2AUcncwWy5kG25hbFrc-mBSJE,3029
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.14.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.14.dist-info/METADATA,sha256=V_qBUztY_EbQm-h-yHG_P1-KbkF1PpntRW34Q1zW07U,10503
-atomicshop-2.16.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.14.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.14.dist-info/RECORD,,
+atomicshop-2.16.15.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.15.dist-info/METADATA,sha256=i5Xgtqpn2TfPbeSQ_L3nAryipoFyy2Z6whmJsDFQyD4,10503
+atomicshop-2.16.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.15.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.15.dist-info/RECORD,,