atomicshop 2.16.35__py3-none-any.whl → 2.16.37__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.35'
+__version__ = '2.16.37'

atomicshop/basics/exceptions.py

@@ -1,4 +1,3 @@
-# v1.0.3 - 28.03.2023 17:20
 import sys
 
 from .threads import current_thread_id
@@ -15,3 +14,8 @@ def print_exception() -> None:
     exc_type, exc_value, exc_traceback = sys.exc_info()
 
     print(f"{error_log_prefix} Thread {thread_id}: * Details: {exc_type}, {exc_value}")
+
+
+def get_exception_type_string(exception: Exception) -> str:
+    """ Get exception type string """
+    return type(exception).__name__

atomicshop/mitm/connection_thread_worker.py

@@ -273,6 +273,8 @@ def thread_worker_main(
 
                     # So if the socket was closed and there was an error we can break the loop
                     if not service_ssl_socket:
+                        record_and_statistics_write()
+                        recorded = True
                         break
 
                 # If there is a response, then send it.

atomicshop/wrappers/socketw/dns_server.py

@@ -316,7 +316,7 @@ class DnsServer:
             print_api(message, logger=self.logger)
 
             message = f"Current engine domains: {self.tcp_resolve_domain_list}"
-            print_api(message, logger=self.logger, color='green')
+            print_api(message, logger=self.logger, color='blue')
 
         if self.resolve_to_tcp_server_all_domains:
             message = "Routing all domains to Built-in TCP Server."
@@ -324,7 +324,7 @@ class DnsServer:
 
         if self.resolve_regular:
             message = f"Routing all domains to Live DNS Service: {self.forwarding_dns_service_ipv4}"
-            print_api(message, logger=self.logger, color='green')
+            print_api(message, logger=self.logger, color='blue')
 
         # The list that will hold all the threads that can be joined later
         threads_list: list = list()

atomicshop/wrappers/socketw/sender.py

@@ -76,7 +76,7 @@ class Sender:
                 destination_address = self.ssl_socket.server_hostname
             destination: str = f'[{source_address}:{source_port}<->{destination_address}:{destination_port}]'
 
-            error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
+            error_class_type = type(e).__name__
             exception_error = tracebacks.get_as_string(one_line=True)
 
             if 'ssl' in error_class_type.lower():

atomicshop/wrappers/socketw/socket_client.py

@@ -18,6 +18,7 @@ from .. import cryptographyw
 from ..loggingw import loggingw
 from ...print_api import print_api
 from ...file_io import file_io
+from ...basics import tracebacks
 
 
 class SocketClient:
@@ -55,6 +56,12 @@ class SocketClient:
         self.connection_ip = connection_ip
         self.dns_servers_list = dns_servers_list
 
+        if logger:
+            # Create child logger for the provided logger with the module's name.
+            self.logger: logging.Logger = loggingw.get_logger_with_level(f'{logger.name}.{Path(__file__).stem}')
+        else:
+            self.logger: logging.Logger = logger
+
         self.socket_instance = None
 
         # If 'connection_ip' was specified, but no 'dns_servers_list', then this IP will be used for 'socket.connect()'.
@@ -68,12 +75,6 @@ class SocketClient:
         elif self.connection_ip and self.dns_servers_list:
             raise ValueError("Both 'connection_ip' and 'dns_servers_list' were specified.")
 
-        if logger:
-            # Create child logger for the provided logger with the module's name.
-            self.logger: logging.Logger = loggingw.get_logger_with_level(f'{logger.name}.{Path(__file__).stem}')
-        else:
-            self.logger: logging.Logger = logger
-
     # Function to create SSL socket to destination service
     def create_service_socket(self):
         # If TLS is enabled.
@@ -86,8 +87,18 @@ class SocketClient:
             return creator.wrap_socket_with_ssl_context_client___default_certs___ignore_verification(
                 socket_object, self.service_name)
 
-    def service_connection(self):
-        """ Function to establish connection to server """
+    def service_connection(
+            self
+    ) -> tuple[
+            Union[socket.socket, ssl.SSLSocket, None],
+            Union[str, None]]:
+        """
+        Function to establish connection to server
+
+        :return: Tuple with socket object and error string.
+        If connection was successful, the error string will be None.
+        If connection wasn't successful, the socket object will be None.
+        """
         # Check if socket to service domain exists.
         # If not
         if not self.socket_instance:
@@ -106,8 +117,8 @@ class SocketClient:
                 f"Socket already defined to [{self.service_name}:{self.service_port}]. "
                 f"Should be connected - Reusing.")
             # Since, restart the function each send_receive iteration, and there's still a connection we need to
-            # set it True, or the socket object will be nullified in the next step.
-            return True
+            # return the socket, or the socket object will be nullified in the next step.
+            return self.socket_instance
 
         # If 'dns_servers_list' was provided, we will resolve the domain to ip through these servers.
         if self.dns_servers_list:
@@ -125,11 +136,13 @@ class SocketClient:
                 # Get only the first entry of the list of IPs [0]
                 self.connection_ip = function_server_address[0].to_text()
                 self.logger.info(f"Resolved to [{self.connection_ip}]")
-            except dns.resolver.NXDOMAIN:
-                self.logger.error(f"Domain {self.service_name} doesn't exist - Couldn't resolve with "
-                                  f"{self.dns_servers_list}.")
-                pass
-                return None
+            except dns.resolver.NXDOMAIN as e:
+                exception_type: str = type(e).__name__
+                error_string = (
+                    f"Socket Client Connect: {exception_type}: "
+                    f"Domain {self.service_name} doesn't exist - Couldn't resolve with {self.dns_servers_list}.")
+                print_api(error_string, logger=self.logger, logger_method='error')
+                return None, error_string
 
         # If DNS was resolved correctly or DNS servers weren't specified - we can try connecting.
         # If 'connection_ip' was manually specified or resolved with 'dnspython' - the connection
@@ -144,49 +157,31 @@ class SocketClient:
         try:
             # "connect()" to the server using address and port
             self.socket_instance.connect((destination, self.service_port))
-        except ConnectionRefusedError:
-            message = f"Couldn't connect to: {self.service_name}. The server is unreachable - Connection refused."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except ConnectionAbortedError:
-            message = f"Connection was aborted (by the software on host) to {self.service_name}."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except socket.gaierror:
-            message = f"Couldn't resolve [{self.service_name}] to IP using default methods. " \
-                      f"Domain doesn't exist or there's no IP assigned to it."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except ssl.SSLError:
-            message = f"SSLError raised on connection to {self.service_name}."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except TimeoutError:
-            message = f"TimeoutError raised on connection to {self.service_name}."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except ValueError as e:
-            message = f'{str(e)} | on connect to [{self.service_name}].'
-            print_api(message, logger=self.logger, logger_method='error')
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
+        except Exception as e:
+            exception_type: str = type(e).__name__
+            exception_error: str = tracebacks.get_as_string(one_line=True)
+            error_string: str = f"Socket Client Connect: {destination}: {exception_type}"
+
+            if exception_type in ['ConnectionRefusedError', 'ConnectionAbortedError', 'ConnectionResetError',
+                                  'ssl.SSLError', 'TimeoutError']:
+                error_message: str = f"{error_string}: {exception_error}"
+                print_api(error_message, logger=self.logger, logger_method='error')
+                return None, error_message
+            elif exception_type == 'socket.gaierror':
+                custom_error_message: str = (
+                    f"Couldn't resolve [{self.service_name}] to IP using default methods. "
+                    f"Domain doesn't exist or there's no IP assigned to it.")
+                error_message: str = f"{error_string}: {custom_error_message}"
+                print_api(error_message, logger=self.logger, logger_method='error')
+                return None, error_message
+            else:
+                raise e
 
         # If everything was fine, we'll log the connection.
         self.logger.info("Connected...")
 
         # Return the connected socket.
-        return self.socket_instance
+        return self.socket_instance, None
 
     def get_socket(self):
         return self.socket_instance
@@ -200,14 +195,12 @@ class SocketClient:
     def send_receive_to_service(self, request_bytes: bytearray):
         # Define variables
         function_service_data = None
-        error_string = None
+        error_message = None
 
+        service_socket, error_message = self.service_connection()
         # If connection to service server wasn't successful
-        if not self.service_connection():
-            error_string = "Wasn't able to connect to service, closing the destination service socket"
-            print_api(error_string, logger=self.logger, logger_method='error')
-
-            # We'll close the socket and nullify the object
+        if error_message:
+            # Wasn't able to connect to service, closing the destination service socket and nullify the object.
             self.close_socket()
         # If the connection to the service was successful
         else:
@@ -227,7 +220,7 @@ class SocketClient:
 
             # If the socket disconnected on data send
             if error_on_send:
-                error_string = f"Service socket closed on data send: {error_on_send}"
+                error_message = f"Service socket closed on data send: {error_on_send}"
 
                 # We'll close the socket and nullify the object
                 self.close_socket()
@@ -238,12 +231,12 @@ class SocketClient:
 
                 # If data received is empty meaning the socket was closed on the other side
                 if not function_service_data:
-                    error_string = "Service server closed the connection on receive"
+                    error_message = "Service server closed the connection on receive"
 
                     # We'll close the socket and nullify the object
                     self.close_socket()
 
-        return function_service_data, error_string, self.connection_ip, self.socket_instance
+        return function_service_data, error_message, self.connection_ip, self.socket_instance
 
     def send_receive_message_list_with_interval(
             self, requests_bytes_list: list, intervals_list: list, intervals_defaults: int, cycles: int = 1):
@@ -316,15 +309,15 @@ class SocketClient:
                 # be passed.
                 # If there was connection error or socket close, then "ssl_socket" of the "service_client"
                 # will be empty.
-                response_raw_bytes, error_string, self.connection_ip, service_ssl_socket = \
+                response_raw_bytes, error_message, self.connection_ip, service_ssl_socket = \
                     self.send_receive_to_service(request_raw_bytes)
 
                 # Adding the response to responses list. Same for error.
                 responses_list.append(response_raw_bytes)
-                errors_list.append(error_string)
+                errors_list.append(error_message)
 
                 self.logger.info(f"Response: {response_raw_bytes}")
-                self.logger.info(f"Error: {error_string}")
+                self.logger.info(f"Error: {error_message}")
 
                 # So if the socket was closed and there was an error we can break the loop.
                 # This is needed for more complex operations
@@ -359,7 +352,7 @@ class SocketClient:
             raise ValueError("If 'save_as_file' is True, then 'cert_file_path' must be provided.")
 
         # Connect and get the connected socket.
-        server_socket_for_certificate = self.service_connection()
+        server_socket_for_certificate, error_message = self.service_connection()
         # Get the DER byte certificate from the socket.
         certificate_from_socket_der_bytes = ssl_base.get_certificate_from_socket(server_socket_for_certificate)
         print_api('Fetched certificate from socket.', logger=self.logger, **kwargs)

{atomicshop-2.16.35.dist-info → atomicshop-2.16.37.dist-info}/METADATA

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

{atomicshop-2.16.35.dist-info → atomicshop-2.16.37.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=UtKTcWqPrVHpu6j_BPCWMmIdo2RCZbCRac7Es1CoDwI,124
+atomicshop/__init__.py,sha256=ym3OPl2oH_mHsSJELO-ElUvWSSDSZmEGXFuzBQB5lt8,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
@@ -90,7 +90,7 @@ atomicshop/basics/dicts.py,sha256=DeYHIh940pMMBrFhpXt4dsigFVYzTrlqWymNo4Pq_Js,14
 atomicshop/basics/dicts_nested.py,sha256=StYxYnYPa0SEJr1lmEwAv5zfERWWqoULeyG8e0zRAwE,4107
 atomicshop/basics/enumerations.py,sha256=41VVQYh_vnVapggxKg2IRU5e_EiMpZzX1n1mtxvoSzM,1364
 atomicshop/basics/enums.py,sha256=aAk1jFeQLvrC4NOpk9kgyX1-DCBr2ArPhZ8Ad7cMAVA,3537
-atomicshop/basics/exceptions.py,sha256=-1Gu8bHA3hrf11mmeaPuVE73jWV3EOyRgh2vSpWfveg,504
+atomicshop/basics/exceptions.py,sha256=8mhhdQloYVz8D3u16I5O_cMeuIf5pPTXoi1iY94O9zw,616
 atomicshop/basics/guids.py,sha256=iRx5n18ATZWhpo748BwEjuLWLsu9y3OwF5-Adp-Dtik,403
 atomicshop/basics/hexs.py,sha256=i8CTG-J0TGGa25yFSbWEvpVyHFnof_qSWUrmXY-ylKM,1054
 atomicshop/basics/if_else.py,sha256=MakivJChofZCpr0mOVjwCthzpiaBxXVB-zv7GwMOqVo,202
@@ -125,7 +125,7 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=ROAtbibSWSsF3BraUbhu-QO3MPIFqYY5KUKgsQbiSkk,7813
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=fybUBcZckgF7TC_P1z2yIYGH6ATX7jQEfsQSBuddt2s,16531
+atomicshop/mitm/connection_thread_worker.py,sha256=YdPL2E2ZYV5nnuaXXtyBZssT4qDalVb05BVO62MwW0k,16627
 atomicshop/mitm/import_config.py,sha256=ZKQXxbtjVqzN9fpRrMwPNQREecH06RG8F_nXZAKTUJM,8182
 atomicshop/mitm/initialize_engines.py,sha256=VyJE8QnzlgD3QbX5inz5o6rC3zQ3is9CeTL7-B10g1w,8292
 atomicshop/mitm/message.py,sha256=URR5JKSuAT8XmGIkyprEjlPW2GW4ef_gfUz_GgcFseE,2184
@@ -299,21 +299,21 @@ atomicshop/wrappers/socketw/accepter.py,sha256=hZZKVYlF3LOHQJsSIEKXZUf6QXXWm-Atq
 atomicshop/wrappers/socketw/base.py,sha256=evoOIxg5Xff3THJnrVX00D5HobaOpDp6_e_gso7TJmA,2191
 atomicshop/wrappers/socketw/certificator.py,sha256=3CpQKtcW68FSbH6LVSEZTqWBS6Yg_-3K0x4nFkId4UY,12236
 atomicshop/wrappers/socketw/creator.py,sha256=3_OraDkw2DAWZfoSdY3svCGMOIxpjLEEY7NxWd7M5P4,9873
-atomicshop/wrappers/socketw/dns_server.py,sha256=VHV6s7vd0zqqW3dhE6li-260YRzmEB5ZUXqYJ9p0vVA,49069
+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=XVvWOoeCo3vA0O5p19ryi-hcDIyx382WNG7WzMNVeYk,9322
-atomicshop/wrappers/socketw/sender.py,sha256=5HPrgTS2pA1g-jbG1TUtR7drHT1Z_8UevlRCTwW7dgY,5007
+atomicshop/wrappers/socketw/sender.py,sha256=vjgU1TaADJjaYiZOkLzfxcdCbmkvjhEhVjSV5mmIbw8,4969
 atomicshop/wrappers/socketw/sni.py,sha256=J1kPnQ77XwKN1pO5aOI1c_VfhuivCm95OOaQxMpPuZ0,17627
-atomicshop/wrappers/socketw/socket_client.py,sha256=XC-YaqA1wu0rvWQ9Q99DWLxcycKPkPc72pSnflzalfo,20320
+atomicshop/wrappers/socketw/socket_client.py,sha256=B_4jI0RWorHcO3i9R9KLoX1-4NlTf2pfJfgXiMGH0jM,19861
 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/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=w1AH-zf4mBuT4euf28UKij9ihM-b1BRU9Qfby0QDdqI,2957
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.35.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.35.dist-info/METADATA,sha256=Dbczjg5jtonq5G-BaD0Hqj93hiHQhsodw5FN3Ytv6UM,10473
-atomicshop-2.16.35.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.35.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.35.dist-info/RECORD,,
+atomicshop-2.16.37.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.37.dist-info/METADATA,sha256=ZuxU8sOc4ZRnmt_V-mWPB5p-Itv8PYnSrWGloBL_dTU,10473
+atomicshop-2.16.37.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.37.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.37.dist-info/RECORD,,