atomicshop 2.19.2__py3-none-any.whl → 2.19.4__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.19.2'
+__version__ = '2.19.4'

atomicshop/mitm/connection_thread_worker.py

@@ -247,7 +247,7 @@ def thread_worker_main(
         if error_string:
             client_message.errors.append(error_string)
 
-        if client_received_raw_data == b'':
+        if client_received_raw_data == b'' or client_received_raw_data is None:
             return
 
         client_message.request_auto_parsed = parse_http(client_message.request_raw_bytes, client_message)
@@ -278,7 +278,7 @@ def thread_worker_main(
         if error_string:
             client_message.errors.append(error_string)
 
-        if service_received_raw_data == b'':
+        if service_received_raw_data == b'' or service_received_raw_data is None:
             return
 
         client_message.response_auto_parsed = parse_http(client_message.response_raw_bytes, client_message)

atomicshop/mitm/mitm_main.py

@@ -420,6 +420,7 @@ def mitm_server_main(config_file_path: str, script_version: str):
         exit_cleanup()
         return 0
     except Exception as e:
+        print_api.print_api('', error_type=True, color='red', traceback_string=True)
         # The error logger will not be initiated if there will be a problem with configuration file or checks.
         if MITM_ERROR_LOGGER is not None:
             MITM_ERROR_LOGGER.write(e)

atomicshop/wrappers/pywin32w/cert_store.py

@@ -41,17 +41,44 @@ def delete_certificate_by_issuer_name(
     :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)
+    """
+    WinAPI doesn't like to do 2 actions in one iteration. So, first we will collect all certificates to remove,
+    and in the second iteration remove them.
+    
+    Full Explanation:
+    When you iterate with for cert in store.CertEnumCertificatesInStore(): and call 
+    cert.CertDeleteCertificateFromStore() inside that loop, you’re modifying the underlying certificate store 
+    while its internal enumeration is still active. This can lead to a segmentation fault (access violation 0xC0000005).
+    By collecting the certificates in the first pass, you freeze the iteration so the store 
+    doesn’t get mutated mid-enumeration.
+    In the second pass, when you actually remove them, you’re no longer in the middle of enumerating. 
+    This prevents the store’s pointer from becoming invalid.
+    
+    This approach should stop the Process finished with exit code -1073741819 (0xC0000005) issue.
+    """
 
+    store = wcrypt.CertOpenStore(
+        CERT_STORE_PROV_SYSTEM,
+        0,
+        None,
+        STORE_LOCATION_TO_CERT_SYSTEM_STORE[store_location],
+        store_location
+    )
+
+    # Collect all matching certificates in a list
+    certs_to_remove = []
     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 {}))
+            certs_to_remove.append(cert)
+
+    # Remove all certificates from the list.
+    for cert in certs_to_remove:
+        cert.CertDeleteCertificateFromStore()
+        print_api(f"Removed the Certificate from store [{store_location}] with issuer [{issuer_name}]", **(print_kwargs or {}))
 
     # There is an exception about store close.
     # store.CertCloseStore()

atomicshop/wrappers/socketw/receiver.py

@@ -93,13 +93,13 @@ class Receiver:
             # A signal to close connection will be empty bytes string: b''.
             received_data = self.ssl_socket.recv(self.buffer_size_receive)
         except ConnectionAbortedError:
-            error_message = "* Connection was aborted by the client. Exiting..."
-            print_api(error_message, logger=self.logger, logger_method='critical', traceback_string=True)
+            error_message = "ConnectionAbortedError: * Connection was aborted by the other side..."
+            print_api(error_message, logger=self.logger, logger_method='critical', traceback_string=False)
         except ConnectionResetError:
-            error_message = "* Connection was forcibly closed by the client. Exiting..."
-            print_api(error_message, logger=self.logger, logger_method='critical', traceback_string=True)
+            error_message = "ConnectionResetError: * Connection was forcibly closed by the other side..."
+            print_api(error_message, logger=self.logger, logger_method='critical', traceback_string=False)
         except ssl.SSLError:
-            error_message = "* Encountered SSL error on packet receive. Exiting..."
+            error_message = "ssl.SSLError: * Encountered SSL error on receive..."
             print_api(error_message, logger=self.logger, logger_method='critical', traceback_string=True)
 
         if received_data == b'':

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -298,7 +298,7 @@ class SocketWrapper:
             # Check file existence.
             if not filesystem.is_file_exists(file_path=self.custom_server_certificate_path):
                 message = f"File not found: {self.custom_server_certificate_path}"
-                print_api(message, color='red')
+                print_api(message, color='red', logger=self.logger)
                 return 1
 
             # And if 'custom_private_key_path' field was populated in [advanced] section, we'll check its existence.
@@ -306,7 +306,7 @@ class SocketWrapper:
                 # Check private key file existence.
                 if not filesystem.is_file_exists(file_path=self.custom_private_key_path):
                     message = f"File not found: {self.custom_private_key_path}"
-                    print_api(message, color='red')
+                    print_api(message, color='red', logger=self.logger)
                     return 1
 
         port_in_use = networks.get_processes_using_port_list(self.listening_port_list)
@@ -345,6 +345,8 @@ class SocketWrapper:
                     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:
+                    message = f"More than one certificate with the same issuer name is installed. Removing all..."
+                    print_api(message, color='yellow', logger=self.logger)
                     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:
@@ -355,6 +357,10 @@ class SocketWrapper:
                         if not permissions.is_admin():
                             raise SocketWrapperConfigurationValuesError(
                                 "You need to run the script with admin rights to uninstall the unused certificates.")
+                        message = (
+                            f"Certificate with the same issuer name is installed, but it is not the same certificate. "
+                            f"Removing...")
+                        print_api(message, color='yellow', logger=self.logger)
                         certificates.delete_certificate_by_issuer_name(
                             self.ca_certificate_name, store_location="ROOT", print_kwargs={'logger': self.logger})
 
@@ -367,7 +373,8 @@ class SocketWrapper:
                         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})
+                        self.ca_certificate_filepath, store_location="ROOT",
+                        print_kwargs={'logger': self.logger, 'color': 'blue'})
 
     # Creating listening sockets.
     def create_socket_ipv4_tcp(self, ip_address: str, port: int):

{atomicshop-2.19.2.dist-info → atomicshop-2.19.4.dist-info}/METADATA

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

{atomicshop-2.19.2.dist-info → atomicshop-2.19.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=SBk9Y1eYsyMmy9xWJ483qY8NFoOX5qMgy1HMpVCjXO0,123
+atomicshop/__init__.py,sha256=2gEn2WdCk0RCwEWqqFtueCBw9uFygvrBG4hm-HaHdQU,123
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -128,11 +128,11 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=DjSnDtMU8srdqca8s6Q-oFCWgjjiCjXRhyk-nafRAUk,7788
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=2180oQgD3qRS53zloeALs_vYt66RJWJtnaCqjl2jVs4,28187
+atomicshop/mitm/connection_thread_worker.py,sha256=TzC-wTdCT7NIkO-x0myvGbDItbFPm82PpoRmK22_tjo,28260
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=-3B8xkXyPOwrC_mDJm_uaW9s56VeV-f6VTu4-8dou2s,8258
 atomicshop/mitm/message.py,sha256=mNo4Lphr_Jo6IlNX5mPJzABpogWGkjOhwI4meAivwHw,2987
-atomicshop/mitm/mitm_main.py,sha256=RqRlh5YIY2u817n_L1IUnki6JYXSmr7fTi3bjY5ygRA,23498
+atomicshop/mitm/mitm_main.py,sha256=hLFg5ATozqY8S-4PgHXojy-gDYsj_J9cUFE33RXyyhQ,23584
 atomicshop/mitm/recs_files.py,sha256=ZAAD0twun-FtmbSniXe3XQhIlawvANNB_HxwbHj7kwI,3151
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=5_sAYGX2Xunzo_pS2W5WijNCwr_BlGJbbOO462y_wN4,27533
@@ -290,7 +290,7 @@ atomicshop/wrappers/pycharmw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 atomicshop/wrappers/pycharmw/ubuntu.py,sha256=m9MpgqvIYygulhPxo9g2zlGGXrihBpiY3GNLNyT-B7U,1290
 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/cert_store.py,sha256=dV1XyoKTFKZ-HCIVqU2Nd6CTZ8HANqjAXv26rsNzO6s,4365
 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
@@ -311,19 +311,19 @@ atomicshop/wrappers/socketw/creator.py,sha256=aSwfN_IwXXf4Hob35vHXUxD_OPeshZcRDZ
 atomicshop/wrappers/socketw/dns_server.py,sha256=RklzINNuoMQn4PGGQEI5hiAldprbVwwvikY6u9X-jTY,49067
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
-atomicshop/wrappers/socketw/receiver.py,sha256=O1h7nhJIRD4KDQxSe6JvYwA-vmKeeP3ONmxF8x6C97M,8207
+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=T9PXROiTYYxrd_7X4Hoj9hoNPXXTQpa2HdvmBJJIoeA,17607
 atomicshop/wrappers/socketw/socket_client.py,sha256=oa3GwS4OPgokrJE5_Oc4-5_wlXHxSH9J5f2DKebms8k,22035
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=WtylpezgIIBuz-A6PfM0hO1sm9Exd4j3qhDXcFc74-E,35567
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=S03micuzwD06BSz5YU8DsKfAs_toppgQsndpczj60s4,36124
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh30KAV-jOpoFKT-m8,3395
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=AENV88H1qDidrcpyM9OwEZxX5svfi-Jb4N6FkS1xtqA,8851
-atomicshop-2.19.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.19.2.dist-info/METADATA,sha256=hyYsPo_Wfx0n6Q8cdQNEWsP4RqH5_oo3og7-2M5hFBs,10630
-atomicshop-2.19.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.19.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.19.2.dist-info/RECORD,,
+atomicshop-2.19.4.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.19.4.dist-info/METADATA,sha256=eSfshvAU4DddcC-LbGoIJSBJ2GMPusBLhqc0pWWZEN0,10630
+atomicshop-2.19.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.19.4.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.19.4.dist-info/RECORD,,