atomicshop 2.16.29__py3-none-any.whl → 2.16.31__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.29'
+__version__ = '2.16.31'

atomicshop/http_parse.py

@@ -2,6 +2,7 @@ from http.server import BaseHTTPRequestHandler
 from http.client import HTTPResponse
 import http
 from io import BytesIO
+import socket
 
 
 class HTTPRequestParse(BaseHTTPRequestHandler):
@@ -50,38 +51,25 @@ class HTTPRequestParse(BaseHTTPRequestHandler):
 
     # noinspection PyMissingConstructor
     def __init__(self, request_text):
-        self.rfile = BytesIO(request_text)
-        self.raw_requestline = self.rfile.readline()
-        self.error_code = self.error_message = None
-        self.parse_request()
+        self.request_text = request_text
 
-        # Check if ".path" attribute exists after HTTP request parsing
-        if not hasattr(self, 'path'):
-            # noinspection PyTypeChecker
-            self.path = None
+        # noinspection PyTypeChecker
+        self.rfile = None
+        self.raw_requestline = None
+        self.error_code = None
+        self.error_message = None
 
         self.content_length = None
         self.body = None
-
-        # Before checking for body, we need to make sure that ".headers" property exists, if not, return empty values.
-        if hasattr(self, 'headers'):
-            # The "body" of request is in the 'Content-Length' key. If it exists in "headers" - get the body
-            if 'Content-Length' in self.headers.keys():
-                # "self.headers.get('Content-Length')" returns number in string format, "int" converts it to integer
-                self.content_length = int(self.headers.get('Content-Length'))
-                self.body = self.rfile.read(self.content_length)
-
-        # Examples:
-        # Getting path: self.path
-        # Getting Request Version: self.request_version
-        # Getting specific header: self.headers['host']
+        # noinspection PyTypeChecker
+        self.path = None
 
     # noinspection PyMethodOverriding
     def send_error(self, code, message):
         self.error_code = code
         self.error_message = message
 
-    def check_if_http(self):
+    def parse(self):
         """
         Function to check if parsed object is HTTP request or not.
         'reason' will be populated with parsing status and errors.
@@ -116,7 +104,26 @@ class HTTPRequestParse(BaseHTTPRequestHandler):
             client_message.request_raw_decoded = request_decoded
         """
 
-        error: bool = False
+        error: str = str()
+        info: str = str()
+
+        self.rfile = BytesIO(self.request_text)
+        self.raw_requestline = self.rfile.readline()
+        self.error_code = self.error_message = None
+        self.parse_request()
+
+        # Before checking for body, we need to make sure that ".headers" property exists, if not, return empty values.
+        if hasattr(self, 'headers'):
+            # The "body" of request is in the 'Content-Length' key. If it exists in "headers" - get the body
+            if 'Content-Length' in self.headers.keys():
+                # "self.headers.get('Content-Length')" returns number in string format, "int" converts it to integer
+                self.content_length = int(self.headers.get('Content-Length'))
+                self.body = self.rfile.read(self.content_length)
+
+        # Examples:
+        # Getting path: self.path
+        # Getting Request Version: self.request_version
+        # Getting specific header: self.headers['host']
 
         # If there's any error in HTTP parsing
         if self.error_message:
@@ -125,67 +132,82 @@ class HTTPRequestParse(BaseHTTPRequestHandler):
                 # If it's 'Bad request' this is not HTTP request, so we can
                 # continue the execution and parse the code as NON-HTTP Request.
                 # Currently, seen 'Bad request syntax' and 'Bad request version'.
-                reason = f"HTTP Request Parsing: Not HTTP request: {self.error_message}"
-                function_result = False
-                error: False
+                error = f"HTTP Request Parsing: Not HTTP request: {self.error_message}"
+                is_http = False
             else:
-                reason = f"HTTP Request Parsing: HTTP Request with Script Undocumented ERROR: {self.error_message}"
-                function_result = True
-                error = True
+                error = f"HTTP Request Parsing: HTTP Request with Script Undocumented ERROR: {self.error_message}"
+                is_http = False
         # If there's no error at all in HTTP Parsing, then it's fine HTTP Request
         else:
-            reason = "HTTP Request Parsing: Valid HTTP request"
-            function_result = True
-            error = False
+            is_http = True
+            info = "HTTP Request Parsing: Valid HTTP request"
 
-        return function_result, reason, error
+        return self, is_http, info, error
 
 
 class FakeSocket:
     """
-    FakeSocket is needed to parse HTTP Response. Socket object is needed for HTTPResponse class input.
+    FakeSocket mimics a socket object for parsing HTTP responses.
     """
     def __init__(self, response_bytes):
         self._file = BytesIO(response_bytes)
 
-    def makefile(self, *args, **kwargs):
+    def makefile(self, mode='rb', buffering=-1) -> BytesIO:
+        """
+        Mimics the socket's makefile method, returning the BytesIO object.
+        """
         return self._file
 
+    def fileno(self) -> int:
+        """
+        Provide a dummy file descriptor, as some code might call this.
+        """
+        raise OSError("File descriptor not available in FakeSocket")
+
 
 class HTTPResponseParse:
     def __init__(self, response_raw_bytes: bytes):
-        self.error = None
         self.response_raw_bytes: bytes = response_raw_bytes
+
+        self.error = None
+        self.source = None
+        self.response_raw_decoded = None
+        self.is_http: bool = False
+
+    def parse(self):
         # Assigning FakeSocket with response_raw_bytes.
         self.source = FakeSocket(self.response_raw_bytes)
 
         # Initializing HTTPResponse class with the FakeSocket with response_raw_bytes as input.
+        # noinspection PyTypeChecker
         self.response_raw_decoded = HTTPResponse(self.source)
 
         # Try to parse HTTP Response.
         try:
             self.response_raw_decoded.begin()
+            self.is_http = True
         # If there were problems with the status line.
         except http.client.BadStatusLine:
             self.error = "HTTP Response Parsing: Not a valid HTTP Response: Bad Status Line."
-            pass
-
-        try:
-            # If no exception was thrown, but there are some problems with headers.
-            if self.response_raw_decoded.headers.defects:
-                self.error = f"HTTP Response Parsing: Not a valid HTTP Response: Some defects in headers: " \
-                             f"{self.response_raw_decoded.headers.defects}"
-        # If the attribute of defects doesn't exist, probably the response wasn't parsed at all by the library,
-        # Meaning, that the exception was already handled.
-        except AttributeError:
-            pass
-
-        # Before checking for body, we need to make sure that ".headers" property exists, if not, return empty values
-        self.response_raw_decoded.content_length = None
-        self.response_raw_decoded.body = None
-        if hasattr(self.response_raw_decoded, 'headers') and self.response_raw_decoded is not None:
-            # The "body" of response is in the 'Content-Length' key. If it exists in "headers" - get the body.
-            if 'Content-Length' in self.response_raw_decoded.headers.keys():
+            self.is_http = False
+
+        header_exists: bool = False
+        if (self.response_raw_decoded is not None and hasattr(self.response_raw_decoded, 'headers') and
+                self.response_raw_decoded.headers is not None):
+            header_exists = True
+
+        if header_exists and self.response_raw_decoded.headers.defects:
+            self.error = f"HTTP Response Parsing: Not a valid HTTP Response: Some defects in headers: " \
+                         f"{self.response_raw_decoded.headers.defects}"
+            self.is_http = False
+
+        if self.is_http:
+            # Before checking for body, we need to make sure that ".headers" property exists,
+            # if not, return empty values.
+            self.response_raw_decoded.content_length = None
+            self.response_raw_decoded.body = None
+            if header_exists and 'Content-Length' in self.response_raw_decoded.headers.keys():
+                # The "body" of response is in the 'Content-Length' key. If it exists in "headers" - get the body.
                 # "self.response_raw_decoded.headers.get('Content-Length')" returns number in string format,
                 # "int" converts it to integer.
                 self.response_raw_decoded.content_length = int(self.response_raw_decoded.headers.get('Content-Length'))
@@ -193,6 +215,5 @@ class HTTPResponseParse:
                 # of the response that we received.
                 # self.response_raw_bytes[-23:]
                 self.response_raw_decoded.body = self.response_raw_bytes[-self.response_raw_decoded.content_length:]
-            else:
-                self.response_raw_decoded.content_length = None
-                self.response_raw_decoded.body = None
+
+        return self.response_raw_decoded, self.is_http, self.error

atomicshop/mitm/connection_thread_worker.py

@@ -82,29 +82,22 @@ def thread_worker_main(
     def parse_http():
         nonlocal error_message
         # Parsing the raw bytes as HTTP.
-        request_decoded = HTTPRequestParse(client_message.request_raw_bytes)
-        # Getting the status of http parsing
-        request_is_http, http_parsing_reason, http_parsing_error = request_decoded.check_if_http()
+        request_decoded, is_http_request, request_parsing_info, request_parsing_error = (
+            HTTPRequestParse(client_message.request_raw_bytes).parse())
 
-        # Currently, we don't care if it's HTTP. If there was no error we can continue. Just log the reason.
-        if not http_parsing_error:
-            print_api(http_parsing_reason, logger=network_logger, logger_method='info')
-        # If there was error - the request is really HTTP, but there's a problem with its structure.
-        else:
-            client_message.error = http_parsing_reason
-            error_message = (
-                f'HTTP Parse Request Error: '
-                f'The request is HTTP protocol, but there was a problem with its structure: '
-                f'{http_parsing_error}')
-            print_api(error_message, logger=network_logger, logger_method='error', color='yellow')
-            statistics_error_list.append(error_message)
-
-        # If the request is HTTP protocol.
-        if request_is_http:
+        if is_http_request:
             client_message.protocol = 'HTTP'
+            client_message.request_raw_decoded = request_decoded
+            print_api(request_parsing_info, logger=network_logger, logger_method='info')
             network_logger.info(f"Method: {request_decoded.command}")
             network_logger.info(f"Path: {request_decoded.path}")
-            client_message.request_raw_decoded = request_decoded
+        # If there was error - the request is really HTTP, but there's a problem with its structure.
+        else:
+            # client_message.error = request_parsing_error
+            print_api(request_parsing_error, logger=network_logger, logger_method='error', color='yellow')
+            # It doesn't matter if we have HTTP Parsing error, since the request may not be really HTTP, so it is OK
+            # not to log it into statistics.
+            # statistics_error_list.append(error_message)
 
     def finish_thread():
         # At this stage there could be several times that the same socket was used to the service server - we need to
@@ -184,6 +177,8 @@ def thread_worker_main(
             client_message.destination_port = destination_port
             client_message.process_name = process_commandline
             client_message.server_name = server_name
+            # Getting current time of message received from client.
+            client_message.request_time_received = datetime.now()
 
             network_logger.info(f"Initializing Receiver on cycle: {str(cycle_count+1)}")
             # Getting message from the client over the socket using specific class.
@@ -196,10 +191,10 @@ def thread_worker_main(
             if client_received_raw_data:
                 # Putting the received message to the aggregating message class.
                 client_message.request_raw_bytes = client_received_raw_data
-                # Getting current time of message received from client.
-                client_message.request_time_received = datetime.now()
 
                 parse_http()
+                if client_message.protocol != 'HTTP':
+                    pass
 
                 # Custom parser, should parse HTTP body or the whole message if not HTTP.
                 parser_instance = parser(client_message)
@@ -268,8 +263,13 @@ def thread_worker_main(
                     client_message.response_list_of_raw_decoded = list()
                     # Make HTTP Response parsing only if there was response at all.
                     if response_raw_bytes:
-                        response_raw_decoded = HTTPResponseParse(response_raw_bytes).response_raw_decoded
-                        client_message.response_list_of_raw_decoded.append(response_raw_decoded)
+                        response_raw_decoded, is_http_response, response_parsing_error = (
+                            HTTPResponseParse(response_raw_bytes).parse())
+
+                        if is_http_response:
+                            client_message.response_list_of_raw_decoded.append(response_raw_decoded)
+                        else:
+                            client_message.response_list_of_raw_decoded.append(None)
 
                     # So if the socket was closed and there was an error we can break the loop
                     if not service_ssl_socket:

atomicshop/mitm/engines/__parent/recorder___parent.py

@@ -1,5 +1,6 @@
 import os
 from datetime import datetime
+import json
 
 from ...shared_functions import build_module_names, create_custom_logger, get_json
 from ... import message, recs_files
@@ -87,10 +88,13 @@ class RecorderParent:
         # Convert the requests and responses to hex.
         self.convert_messages()
         # Get the message in dict / JSON format
-        record_message = get_json(self.class_client_message)
+        # record_message = get_json(self.class_client_message)
+        record_message_dict: dict = dict(self.class_client_message)
+        recorded_message_json_string = json.dumps(record_message_dict)
 
         # Since we already dumped the object to dictionary string, we'll just save the object to regular file.
-        file_io.write_file(record_message, self.record_file_path, enable_long_file_path=True, **{'logger': self.logger})
+        file_io.write_file(
+            recorded_message_json_string, self.record_file_path, enable_long_file_path=True, **{'logger': self.logger})
 
         self.logger.info(f"Recorded to file: {self.record_file_path}")
 

atomicshop/mitm/message.py

@@ -1,15 +1,21 @@
+from datetime import datetime
+from typing import Union
+
+from .. import http_parse
+from ..basics import dicts
+
+
 class ClientMessage:
     """ A class that will store all the message details from the client """
     def __init__(self):
         self.request_raw_bytes: bytearray = bytearray()
-        self.request_time_received = None
-        self.request_raw_decoded = None
+        # noinspection PyTypeChecker
+        self.request_time_received: datetime = None
+        self.request_raw_decoded: Union[http_parse.HTTPRequestParse, any] = None
         self.request_body_parsed = None
         self.request_raw_hex: hex = None
-        # self.response_raw_bytes: bytearray = bytearray()
         self.response_list_of_raw_bytes: list = list()
         self.response_list_of_raw_decoded: list = list()
-        # self.response_raw_hex: hex = None
         self.response_list_of_raw_hex: list = list()
         self.server_name: str = str()
         self.server_ip: str = str()
@@ -22,3 +28,23 @@ class ClientMessage:
         self.error: str = str()
         self.protocol: str = str()
         self.recorded_file_path: str = str()
+
+    def __iter__(self):
+        # __dict__ returns a dictionary containing the instance's attributes
+        for key, value in self.__dict__.items():
+            if key == 'request_raw_bytes':
+                value = str(value)
+            elif key == 'request_time_received':
+                value = value.strftime('%Y-%m-%d-%H:%M:%S.%f')
+            elif key == 'request_raw_decoded':
+                if isinstance(value, http_parse.HTTPRequestParse):
+                    value = dicts.convert_complex_object_to_dict(value)
+                else:
+                    value = str(value)
+            elif key == 'request_body_parsed':
+                value = dicts.convert_complex_object_to_dict(value)
+            elif key == 'response_list_of_raw_bytes':
+                value = [str(bytes_response) for bytes_response in value]
+            elif key == 'response_list_of_raw_decoded':
+                value = [dicts.convert_complex_object_to_dict(complex_response) for complex_response in value]
+            yield key, value

atomicshop/mitm/mitm_main.py

@@ -38,9 +38,11 @@ def exit_cleanup():
             dns.set_connection_dns_gateway_dynamic(use_default_connection=True)
             print_api.print_api("Returned default DNS gateway...", color='blue')
 
-    print_api.print_api(RECS_PROCESS_INSTANCE.is_alive())
-    RECS_PROCESS_INSTANCE.terminate()
-    RECS_PROCESS_INSTANCE.join()
+    # The process will not be executed if there was an exception in the beginning.
+    if RECS_PROCESS_INSTANCE is not None:
+        print_api.print_api(RECS_PROCESS_INSTANCE.is_alive())
+        RECS_PROCESS_INSTANCE.terminate()
+        RECS_PROCESS_INSTANCE.join()
 
 
 def mitm_server(config_file_path: str):
@@ -392,8 +394,8 @@ def mitm_server_main(config_file_path: str):
         exit_cleanup()
         return 0
     except Exception as e:
-        RECS_PROCESS_INSTANCE.terminate()
-
-        MITM_ERROR_LOGGER.write(e)
+        # 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)
         exit_cleanup()
         return 1

atomicshop/wrappers/socketw/dns_server.py

@@ -589,7 +589,7 @@ class DnsServer:
                                             google_dns_ipv4_socket.recvfrom(self.buffer_size_receive)
                                     except TimeoutError as function_exception_object:
                                         print_api(function_exception_object, logger=self.logger, logger_method='error',
-                                                  traceback_string=True)
+                                                  traceback_string=True, oneline=True)
                                         google_dns_ipv4_socket.close()
                                         counter += 1
                                         # Pass the exception.

atomicshop/wrappers/socketw/sender.py

@@ -6,6 +6,8 @@ from ...print_api import print_api
 from ..loggingw import loggingw
 from ...basics import tracebacks
 
+from . import base, ssl_base
+
 
 class Sender:
     def __init__(
@@ -66,22 +68,32 @@ class Sender:
 
             # At this point the sending loop finished successfully
             self.logger.info(f"Sent the message to destination.")
-        except ConnectionResetError as e:
-            error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
-            exception_error = tracebacks.get_as_string(one_line=True)
-            error_message = (f"Socket Send: Error, Couldn't reach the server - Connection was reset | "
-                             f"{error_class_type}: {exception_error}")
-        except (ssl.SSLEOFError, ssl.SSLZeroReturnError, ssl.SSLWantWriteError, TimeoutError) as e:
-            error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
-            exception_error = tracebacks.get_as_string(one_line=True)
-            error_message = f"Socket Send: {error_class_type}: {exception_error}"
         except Exception as e:
+            source_tuple, destination_tuple = base.get_source_destination(self.ssl_socket)
+            source_address, source_port = source_tuple
+            destination_address, destination_port = destination_tuple
+            if self.ssl_socket.server_hostname:
+                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("'>", '')
             exception_error = tracebacks.get_as_string(one_line=True)
+
             if 'ssl' in error_class_type.lower():
-                error_message = f"Socket Send: SSL UNDOCUMENTED Exception: {error_class_type}{exception_error}"
+                if error_class_type in ['ssl.SSLEOFError', 'ssl.SSLZeroReturnError', 'ssl.SSLWantWriteError']:
+                    error_message = f"Socket Send: {destination}: {error_class_type}: {exception_error}"
+                else:
+                    error_message = (f"Socket Send: {destination}: "
+                                     f"SSL UNDOCUMENTED Exception: {error_class_type}{exception_error}")
             else:
-                error_message = f"Socket Send: Error, UNDOCUMENTED Exception: {error_class_type}{exception_error}"
+                if error_class_type == 'ConnectionResetError':
+                    error_message = (f"Socket Send: {destination}: "
+                                     f"Error, Couldn't reach the server - Connection was reset | "
+                                     f"{error_class_type}: {exception_error}")
+                elif error_class_type in ['TimeoutError']:
+                    error_message = f"Socket Send: {destination}: {error_class_type}: {exception_error}"
+                else:
+                    raise e
 
         if error_message:
             print_api(error_message, logger=self.logger, logger_method='error')

atomicshop/wrappers/socketw/sni.py

@@ -1,10 +1,12 @@
 import ssl
 from dataclasses import dataclass
 
-from . import certificator, creator
+from ..loggingw import loggingw
 from ...domains import get_domain_without_first_subdomain_if_no_subdomain_return_as_is
 from ...print_api import print_api
 
+from . import certificator, creator
+
 
 @dataclass
 class SNIReceivedParameters:
@@ -43,7 +45,8 @@ class SNISetup:
             forwarding_dns_service_ipv4_list___only_for_localhost: list,
             tls: bool,
             domain_from_dns_server: str = None,
-            skip_extension_id_list: list = None
+            skip_extension_id_list: list = None,
+            exceptions_logger: loggingw.ExceptionCsvLogger = None
     ):
         self.ca_certificate_name = ca_certificate_name
         self.ca_certificate_filepath = ca_certificate_filepath
@@ -68,6 +71,7 @@ class SNISetup:
         self.domain_from_dns_server: str = domain_from_dns_server
         self.skip_extension_id_list = skip_extension_id_list
         self.tls = tls
+        self.exceptions_logger = exceptions_logger
 
         self.certificator_instance = None
 
@@ -154,7 +158,8 @@ class SNISetup:
                 sni_create_server_certificate_for_each_domain=self.sni_create_server_certificate_for_each_domain,
                 certificator_instance=self.certificator_instance,
                 domain_from_dns_server=self.domain_from_dns_server,
-                default_certificate_domain_list=self.default_certificate_domain_list
+                default_certificate_domain_list=self.default_certificate_domain_list,
+                exceptions_logger=self.exceptions_logger
             )
             ssl_context.set_servername_callback(
                 sni_handler_instance.setup_sni_callback(print_kwargs=print_kwargs))
@@ -172,7 +177,8 @@ class SNIHandler:
             sni_create_server_certificate_for_each_domain: bool,
             certificator_instance: certificator.Certificator,
             domain_from_dns_server: str,
-            default_certificate_domain_list: list
+            default_certificate_domain_list: list,
+            exceptions_logger: loggingw.ExceptionCsvLogger
     ):
         self.sni_use_default_callback_function_extended = sni_use_default_callback_function_extended
         self.sni_add_new_domains_to_default_server_certificate = sni_add_new_domains_to_default_server_certificate
@@ -180,6 +186,7 @@ class SNIHandler:
         self.certificator_instance = certificator_instance
         self.domain_from_dns_server: str = domain_from_dns_server
         self.default_certificate_domain_list = default_certificate_domain_list
+        self.exceptions_logger = exceptions_logger
 
         # noinspection PyTypeChecker
         self.sni_received_parameters: SNIReceivedParameters = None
@@ -202,18 +209,22 @@ class SNIHandler:
                 sni_ssl_socket: ssl.SSLSocket,
                 sni_destination_name: str,
                 sni_ssl_context: ssl.SSLContext):
-            # Set 'server_hostname' for the socket.
-            sni_ssl_socket.server_hostname = sni_destination_name
-
-            # If 'sni_execute_extended' was set to True.
-            if self.sni_use_default_callback_function_extended:
-                self.sni_received_parameters = SNIReceivedParameters(
-                    ssl_socket=sni_ssl_socket,
-                    destination_name=sni_destination_name,
-                    ssl_context=sni_ssl_context
-                )
-
-                self.sni_handle_extended(print_kwargs=print_kwargs)
+
+            try:
+                # Set 'server_hostname' for the socket.
+                sni_ssl_socket.server_hostname = sni_destination_name
+
+                # If 'sni_execute_extended' was set to True.
+                if self.sni_use_default_callback_function_extended:
+                    self.sni_received_parameters = SNIReceivedParameters(
+                        ssl_socket=sni_ssl_socket,
+                        destination_name=sni_destination_name,
+                        ssl_context=sni_ssl_context
+                    )
+
+                    self.sni_handle_extended(print_kwargs=print_kwargs)
+            except Exception as e:
+                self.exceptions_logger.write(e)
 
         return sni_handle
 

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -426,7 +426,6 @@ class SocketWrapper:
             listening_socket_list = self.listening_sockets
 
         while True:
-            # noinspection PyBroadException
             try:
                 # Using "select.select" which is currently the only API function that works on all
                 # operating system types: Windows / Linux / BSD.
@@ -503,7 +502,8 @@ class SocketWrapper:
                             domain_from_dns_server=domain_from_dns_server,
                             forwarding_dns_service_ipv4_list___only_for_localhost=(
                                 self.forwarding_dns_service_ipv4_list___only_for_localhost),
-                            tls=is_tls
+                            tls=is_tls,
+                            exceptions_logger=self.exceptions_logger
                         )
 
                         ssl_client_socket, accept_error_message = \
@@ -538,7 +538,7 @@ class SocketWrapper:
                     if not pass_function_reference_to_thread:
                         before_socket_thread_worker(
                             callable_function=reference_function_name, thread_args=thread_args,
-                            exception_logger=self.exceptions_logger)
+                            exceptions_logger=self.exceptions_logger)
                     # If 'pass_function_reference_to_thread' was set to 'True', execute the callable function reference
                     # in a new thread.
                     else:
@@ -552,11 +552,8 @@ class SocketWrapper:
                         error_message=accept_error_message,
                         host=domain_from_dns_server,
                         process_name=process_name)
-            except Exception:
-                print_api("Undocumented exception in while loop of listening sockets.", error_type=True,
-                          logger_method="error", traceback_string=True, logger=self.logger)
-                pass
-                continue
+            except Exception as e:
+                self.exceptions_logger.write(e)
 
     def _send_accepted_socket_to_thread(self, thread_function_name, reference_args=()):
         # Creating thread for each socket
@@ -575,17 +572,17 @@ class SocketWrapper:
 def before_socket_thread_worker(
         callable_function: callable,
         thread_args: tuple,
-        exception_logger: loggingw.ExceptionCsvLogger = None
+        exceptions_logger: loggingw.ExceptionCsvLogger = None
 ):
     """
     Function that will be executed before the thread is started.
     :param callable_function: callable, function that will be executed in the thread.
     :param thread_args: tuple, arguments that will be passed to the function.
-    :param exception_logger: loggingw.ExceptionCsvLogger, logger object that will be used to log exceptions.
+    :param exceptions_logger: loggingw.ExceptionCsvLogger, logger object that will be used to log exceptions.
     :return:
     """
 
     try:
         callable_function(*thread_args)
     except Exception as e:
-        exception_logger.write(e)
+        exceptions_logger.write(e)

{atomicshop-2.16.29.dist-info → atomicshop-2.16.31.dist-info}/METADATA

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

{atomicshop-2.16.29.dist-info → atomicshop-2.16.31.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=i8HvtTRZFtZFX7kwB4VqwPlkg-1D7OwfyNzJul477ZI,124
+atomicshop/__init__.py,sha256=sCusnYw5eAOy-azyQImMCB9etQnC6WjnQr70CnWZluk,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
@@ -19,7 +19,7 @@ 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
 atomicshop/hashing.py,sha256=Le8qGFyt3_wX-zGTeQShz7L2HL_b6nVv9PnawjglyHo,3474
-atomicshop/http_parse.py,sha256=wky-d3iRxS9hNoHXcOzXDvrFX0-DLWRSPYQ7DFf-Gs4,9618
+atomicshop/http_parse.py,sha256=bIrJODFmumfI6uSwWkTtjtJWS-o40kn_eg7J9Mmwr20,10002
 atomicshop/inspect_wrapper.py,sha256=sGRVQhrJovNygHTydqJj0hxES-aB2Eg9KbIk3G31apw,11429
 atomicshop/ip_addresses.py,sha256=Hvi4TumEFoTEpKWaq5WNF-YzcRzt24IxmNgv-Mgax1s,1190
 atomicshop/keyboard_press.py,sha256=1W5kRtOB75fulVx-uF2yarBhW0_IzdI1k73AnvXstk0,452
@@ -124,11 +124,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=ROAtbibSWSsF3BraUbhu-QO3MPIFqYY5KUKgsQbiSkk,7813
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=OIKaaVnewxtIMPEjwrJmQqiaIQWEq-pl2AfmEYTAGlc,16516
+atomicshop/mitm/connection_thread_worker.py,sha256=fybUBcZckgF7TC_P1z2yIYGH6ATX7jQEfsQSBuddt2s,16531
 atomicshop/mitm/import_config.py,sha256=_nu8mgA-M4s6dZ8_QWx3x0aVb75upvsCuX_PIUg4X2w,8345
 atomicshop/mitm/initialize_engines.py,sha256=VyJE8QnzlgD3QbX5inz5o6rC3zQ3is9CeTL7-B10g1w,8292
-atomicshop/mitm/message.py,sha256=WcKnE102GImbl8N3f4NliCuahHpkqMB4e4XlD2BOrOY,1035
-atomicshop/mitm/mitm_main.py,sha256=nBSAibYOkRozrl4X1SBnof4eKs6LkjImAAhFF-UaOm8,22193
+atomicshop/mitm/message.py,sha256=URR5JKSuAT8XmGIkyprEjlPW2GW4ef_gfUz_GgcFseE,2184
+atomicshop/mitm/mitm_main.py,sha256=wEW0UAqxnn9kI4oO5zyNtG04Glmi3hR-C-0W6SpxVWY,22446
 atomicshop/mitm/recs_files.py,sha256=VjgtJF7vy365mBjctwB2bpDYoLMkEeogzF8kbb01dAk,2977
 atomicshop/mitm/shared_functions.py,sha256=jjCDZVQCwQ8hf9QNMe3T8W3ISkfZo4Mm2HtXOJLZYgI,1999
 atomicshop/mitm/statistic_analyzer.py,sha256=mBmwEe68WAjnIskGndQTRldnsAsDHuaOW0O7UXlM3Pc,26702
@@ -137,7 +137,7 @@ atomicshop/mitm/engines/create_module_template.py,sha256=tRjVSm1sD6FzML71Qbuwvit
 atomicshop/mitm/engines/create_module_template_example.py,sha256=X5xhvbV6-g9jU_bQVhf_crZmaH50LRWz3bS-faQ18ds,489
 atomicshop/mitm/engines/__parent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/__parent/parser___parent.py,sha256=RK2wviepP0oeq7zuLpgkvqvTJtc0r0a7hDGWdV0dGc4,657
-atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=gUQF1OFMBKLbvd5JhqLPURjD8j7NvQyg5SSmmLdFfWQ,4493
+atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=xPc_5BGDubPfgNa4z8qBtm8MacDlas_yQNkfNsji46k,4677
 atomicshop/mitm/engines/__parent/responder___parent.py,sha256=7WQeR3UmMnN74bDwn-0nz2OfhXJ3-ClXpNGUFZ7wJUE,12004
 atomicshop/mitm/engines/__reference_general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/__reference_general/parser___reference_general.py,sha256=57MEPZMAjTO6xBDZ-yt6lgGJyqRrP0Do5Gk_cgCiPns,2998
@@ -296,21 +296,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=GhotsER4NfZ0k_jP5Fgzv1zzS9TSkmDQ71Sx6lBZ1xA,48953
+atomicshop/wrappers/socketw/dns_server.py,sha256=F-t2ZOrMAS0hZ5AaoTsIEbe7jj0tUathp8gs4CTNDqM,48967
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=zKEqh98cB9UDLFhtxVpperfXsCjyIMNANHilDD06p0U,6094
 atomicshop/wrappers/socketw/receiver.py,sha256=XVvWOoeCo3vA0O5p19ryi-hcDIyx382WNG7WzMNVeYk,9322
-atomicshop/wrappers/socketw/sender.py,sha256=PBCUk7k2mjJaLRpB2ANjvWs_wR-Yqv_AjBQaeJ5KMKE,4521
-atomicshop/wrappers/socketw/sni.py,sha256=fVwyh3h9IqfLMnf4__bMIzcF4c-Kk9mlbDWMRXKN-ow,17155
+atomicshop/wrappers/socketw/sender.py,sha256=5HPrgTS2pA1g-jbG1TUtR7drHT1Z_8UevlRCTwW7dgY,5007
+atomicshop/wrappers/socketw/sni.py,sha256=J1kPnQ77XwKN1pO5aOI1c_VfhuivCm95OOaQxMpPuZ0,17627
 atomicshop/wrappers/socketw/socket_client.py,sha256=XC-YaqA1wu0rvWQ9Q99DWLxcycKPkPc72pSnflzalfo,20320
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=V9X_tK2w-roE9GF6rgmz1rDc54D3EZmLXLcNW2StEno,35614
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=jOIux6eedupRtiEKQeaPSBt7xJbJixpBbK1zNcQUDqU,35451
 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.29.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.29.dist-info/METADATA,sha256=PIQz6ksXLRjwULJweIFjOJIeCSN-ej1dB48nyC5b17M,10473
-atomicshop-2.16.29.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.29.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.29.dist-info/RECORD,,
+atomicshop-2.16.31.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.31.dist-info/METADATA,sha256=qf8gXgqyW9JhWKob2yEkM118Kt1OcfQyVeqTrz9nj-0,10473
+atomicshop-2.16.31.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.31.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.31.dist-info/RECORD,,