atomicshop 2.16.21__py3-none-any.whl → 2.16.23__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.21'
+__version__ = '2.16.23'

atomicshop/basics/classes.py

@@ -7,6 +7,25 @@ from pathlib import Path
 from ..file_io.file_io import read_file
 
 
+"""
+class ParserParent:
+    # Initializing the logger in the "class variable" section will leave the instance of the logger initiated
+    # and the rest of the instances of the class will use the same logger.
+    # It is not in the "__init__" section, so it's not going to be initiated again.
+    # The name of the logger using "__name__" variable, which is the full name of the module package.
+    # Example: classes.parsers.parser_1_reference_general
+
+    # The code outside the functions will be executed during import of the module. When initializing a class
+    # in the script these lines will not be called again, only the "init" function.
+    logger = create_custom_logger()
+
+    def __init__(self, class_client_message: ClientMessage):
+        self.class_client_message: ClientMessage = class_client_message
+
+    # Usage: self.logger.info("Message")
+"""
+
+
 def create_empty_class():
     """
     Function creates empty class, you can add parameters to it dynamically.

atomicshop/mitm/connection_thread_worker.py

@@ -125,7 +125,8 @@ def thread_worker_main(
 
             network_logger.info("Initializing Receiver")
             # Getting message from the client over the socket using specific class.
-            client_received_raw_data = receiver.Receiver(function_client_socket_object).receive()
+            client_received_raw_data = receiver.Receiver(
+                ssl_socket=function_client_socket_object, logger=network_logger).receive()
 
             # If the message is empty, then the connection was closed already by the other side,
             # so we can close the socket as well.
@@ -239,13 +240,14 @@ def thread_worker_main(
                                 service_name=client_message.server_name, service_port=client_message.destination_port,
                                 tls=is_tls,
                                 dns_servers_list=(
-                                    config_static.TCPServer.forwarding_dns_service_ipv4_list___only_for_localhost)
+                                    config_static.TCPServer.forwarding_dns_service_ipv4_list___only_for_localhost),
+                                logger=network_logger
                             )
                         # If we're not on localhost, then connect to domain directly.
                         else:
                             service_client = socket_client.SocketClient(
                                 service_name=client_message.server_name, service_port=client_message.destination_port,
-                                tls=is_tls)
+                                tls=is_tls, logger=network_logger)
 
                     # Sending current client message and receiving a response.
                     # If there was an error it will be passed to "client_message" object class and if not, "None" will
@@ -301,7 +303,9 @@ def thread_worker_main(
 
                         # Iterate through the list of byte responses.
                         for response_raw_bytes in client_message.response_list_of_raw_bytes:
-                            function_data_sent = sender.Sender(function_client_socket_object, response_raw_bytes).send()
+                            function_data_sent = sender.Sender(
+                                ssl_socket=function_client_socket_object, class_message=response_raw_bytes,
+                                logger=network_logger).send()
 
                             # If there was problem with sending data, we'll break current loop.
                             if not function_data_sent:

atomicshop/mitm/engines/__parent/parser___parent.py

@@ -2,20 +2,11 @@ from ...shared_functions import create_custom_logger
 from ...message import ClientMessage
 
 
-# Class that parses the message received from client.
 class ParserParent:
-    # Initializing the logger in the "class variable" section will leave the instance of the logger initiated
-    # and the rest of the instances of the class will use the same logger.
-    # It is not in the "__init__" section, so it's not going to be initiated again.
-    # The name of the logger using "__name__" variable, which is the full name of the module package.
-    # Example: classes.parsers.parser_1_reference_general
-
-    # The code outside the functions will be executed during import of the module. When initializing a class
-    # in the script these lines will not be called again, only the "init" function.
-    logger = create_custom_logger()
-
+    """Class that parses the message received from client."""
     def __init__(self, class_client_message: ClientMessage):
         self.class_client_message: ClientMessage = class_client_message
+        self.logger = create_custom_logger()
 
     def parse(self):
         # This is general parser, so we don't parse anything and 'request_body_parsed' gets empty byte string.

atomicshop/mitm/engines/__parent/recorder___parent.py

@@ -9,9 +9,6 @@ from ....file_io import file_io
 
 # The class that is responsible for Recording Requests / Responses.
 class RecorderParent:
-    # The code outside the functions will be executed during import of the module. When initializing a class
-    # in the script these lines will not be called again, only the "init" function.
-    logger = create_custom_logger()
 
     def __init__(self, class_client_message: message.ClientMessage, record_path: str):
         self.class_client_message: message.ClientMessage = class_client_message
@@ -22,6 +19,8 @@ class RecorderParent:
         self.engine_record_path: str = str()
         self.record_file_path: str = str()
 
+        self.logger = create_custom_logger()
+
         # Get engine name and module name
         self.get_engine_module()
         # Build full file path.

atomicshop/mitm/engines/__parent/responder___parent.py

@@ -7,20 +7,17 @@ from urllib.parse import unquote
 from urllib.parse import urlparse
 from urllib.parse import parse_qs
 
-from ...shared_functions import create_custom_logger
 from ...message import ClientMessage
 from ....http_parse import HTTPResponseParse
 from ....print_api import print_api
 
+from atomicshop.mitm.shared_functions import create_custom_logger
 
-# The class that is responsible for generating response to client based on the received message.
-class ResponderParent:
-    # The code outside the functions will be executed during import of the module. When initializing a class
-    # in the script these lines will not be called again, only the "init" function.
-    logger = create_custom_logger()
 
+class ResponderParent:
+    """The class that is responsible for generating response to client based on the received message."""
     def __init__(self):
-        return
+        self.logger = create_custom_logger()
 
     @staticmethod
     def get_path_parts(path: str):

atomicshop/mitm/engines/__reference_general/parser___reference_general.py

@@ -3,21 +3,24 @@ from atomicshop.mitm.engines.__parent.parser___parent import ParserParent
 from atomicshop.mitm.shared_functions import create_custom_logger
 from atomicshop.mitm.message import ClientMessage
 
-# # This is 'example' '.proto' file that contains message 'ExampleRequest'.
-# from .example_pb2 import ExampleRequest
-# # Import from 'protobuf' library of function 'MessageToDict' that
-# converts protobuf message object type to python dict.
-# from google.protobuf.json_format import MessageToDict
+
+"""
+# This is 'example' '.proto' file that contains message 'ExampleRequest'.
+from .example_pb2 import ExampleRequest
+# Import from 'protobuf' library of function 'MessageToDict' that
+converts protobuf message object type to python dict.
+from google.protobuf.json_format import MessageToDict
+"""
 
 
 # Class that parses the message received from client.
 class ParserGeneral(ParserParent):
-    logger = create_custom_logger()
-
     # When initializing main classes through "super" you need to pass parameters to init
     def __init__(self, class_client_message: ClientMessage):
         super().__init__(class_client_message)
 
+        self.logger = create_custom_logger()
+
     # ==================================================================================================================
     # Uncomment this section in order to begin building custom responder.
     # def parse_example_request(self):

atomicshop/mitm/engines/__reference_general/recorder___reference_general.py

@@ -4,10 +4,10 @@ from atomicshop.mitm.shared_functions import create_custom_logger
 from atomicshop.mitm.message import ClientMessage
 
 
-# The class that is responsible for Recording Requests / Responses
 class RecorderGeneral(RecorderParent):
-    logger = create_custom_logger()
-
+    """The class that is responsible for Recording Requests / Responses"""
     # When initializing main classes through "super" you need to pass parameters to init
     def __init__(self, class_client_message: ClientMessage, record_path):
         super().__init__(class_client_message, record_path)
+
+        self.logger = create_custom_logger()

atomicshop/mitm/engines/__reference_general/responder___reference_general.py

@@ -14,14 +14,14 @@ from google.protobuf import json_format
 """
 
 
-# The class that is responsible for generating response to client based on the received message.
 class ResponderGeneral(ResponderParent):
-    logger = create_custom_logger()
-
+    """The class that is responsible for generating response to client based on the received message."""
     # When initializing main classes through "super" you need to pass parameters to init
     def __init__(self):
         super().__init__()
 
+        self.logger = create_custom_logger()
+
     # ==================================================================================================================
     # Uncomment this section in order to begin building custom responder.
     # @staticmethod

atomicshop/mitm/initialize_engines.py

@@ -62,6 +62,17 @@ class ModuleCategory:
             engine_directory_path, get_file=True, file_name_check_pattern=configuration_data['recorder_file'])[0].path
 
     def initialize_engine(self, logs_path: str, logger=None, reference_general: bool = False, **kwargs):
+        # Initiating logger for each engine by its name
+        loggingw.create_logger(
+            logger_name=self.engine_name,
+            directory_path=logs_path,
+            add_stream=True,
+            add_timedfile=True,
+            formatter_streamhandler='DEFAULT',
+            formatter_filehandler='DEFAULT',
+            backupCount=config_static.LogRec.store_logs_for_x_days
+        )
+
         if not reference_general:
             self.parser_class_object = import_first_class_name_from_file_path(
                 self.script_directory, self.parser_file_path, logger=logger, stdout=False)
@@ -83,18 +94,6 @@ class ModuleCategory:
             logger.error_exception(f"Exception while initializing responder: {exception_object}")
             sys.exit()
 
-        # Initiating logger for each engine by its name
-        # initiate_logger(current_module.engine_name, log_file_extension)
-        loggingw.create_logger(
-            logger_name=self.engine_name,
-            directory_path=logs_path,
-            add_stream=True,
-            add_timedfile=True,
-            formatter_streamhandler='DEFAULT',
-            formatter_filehandler='DEFAULT',
-            backupCount=config_static.LogRec.store_logs_for_x_days
-        )
-
 
 # Assigning external class object by message domain received from client. If the domain is not in the list,
 # the reference general module will be assigned.

atomicshop/mitm/mitm_main.py

@@ -242,7 +242,8 @@ def mitm_server_main(config_file_path: str):
                 resolve_to_tcp_server_all_domains=config_static.DNSServer.resolve_to_tcp_server_all_domains,
                 resolve_regular=config_static.DNSServer.resolve_regular,
                 cache_timeout_minutes=config_static.DNSServer.cache_timeout_minutes,
-                request_domain_queue=domain_queue
+                request_domain_queue=domain_queue,
+                logger=network_logger
             )
         except (dns_server.DnsPortInUseError, dns_server.DnsConfigurationValuesError) as e:
             print_api(e, error_type=True, color="red", logger=system_logger)
@@ -302,6 +303,11 @@ def mitm_server_main(config_file_path: str):
             # Wait for the message to be printed and saved to file.
             time.sleep(1)
             return 1
+        except socket_wrapper.SocketWrapperConfigurationValuesError as e:
+            print_api(e, error_type=True, color="red", logger=system_logger, logger_method='critical')
+            # Wait for the message to be printed and saved to file.
+            time.sleep(1)
+            return 1
 
         statistics_writer = socket_wrapper_instance.statistics_writer
 

atomicshop/mitm/statistic_analyzer.py

@@ -429,30 +429,13 @@ def deviation_calculator_by_moving_average(
 
     if deviation_list:
         if summary:
-            summary_deviation_list: list = []
             for deviation in deviation_list:
-                value = deviation.get('value', None)
-                ma_value = deviation.get('ma_value', None)
-                if not value or not ma_value:
-                    total_entries_averaged = None
-                else:
-                    total_entries_averaged = deviation['data']['count']
-                    
-                summary_deviation_list.append({
-                    'day': deviation['day'],
-                    'host': deviation['host'],
-                    'message': deviation['message'],
-                    'value': deviation.get('value', None),
-                    'ma_value': deviation.get('ma_value', None),
-                    'deviation_percentage': deviation.get('deviation_percentage', None),
-                    'total_entries_averaged': total_entries_averaged,
-                    'median_request_size': deviation.get('median_request_size', None),
-                    'median_response_size': deviation.get('median_response_size', None),
-                    'mm_request_size': deviation.get('mm_request_size', None),
-                    'mm_response_size': deviation.get('mm_response_size', None),
-                })
-
-            deviation_list = summary_deviation_list
+                _ = deviation.pop('check_type')
+                _ = deviation.pop('percentage')
+                _ = deviation.pop('ma_value_checked')
+                _ = deviation.pop('deviation_type')
+                _ = deviation.pop('data')
+                _ = deviation.pop('ma_data')
 
         if output_file_path:
             if not summary:

atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py

@@ -270,6 +270,7 @@ def compute_average_for_current_day_from_past_x_days(
         ma_count = statistics.mean(host_dict['counts'])
         ma_request_size = statistics.mean(host_dict['avg_request_sizes'])
         ma_response_size = statistics.mean(host_dict['avg_response_sizes'])
+        mm_count = statistics.median(host_dict['counts'])
         mm_request_size = statistics.median(host_dict['median_request_sizes'])
         mm_response_size = statistics.median(host_dict['median_response_sizes'])
 
@@ -277,6 +278,7 @@ def compute_average_for_current_day_from_past_x_days(
             'ma_count': ma_count,
             'ma_request_size': ma_request_size,
             'ma_response_size': ma_response_size,
+            'mm_count': mm_count,
             'mm_request_size': mm_request_size,
             'mm_response_size': mm_response_size,
             'counts': host_dict['counts'],
@@ -332,8 +334,28 @@ def find_deviation_from_moving_average(
             deviation_percentage = (
                     (host_moving_average_by_type - day_statistics_content_dict[check_type]) /
                     host_moving_average_by_type)
+
         if deviation_type:
             message = f'[{check_type}] is [{deviation_type}] the moving average.'
+
+            # Get the right moving median.
+            if check_type == 'count':
+                median_type_string: str = 'count'
+                moving_median_type_string: str = 'mm_count'
+            else:
+                median_type_string: str = check_type.replace('avg', 'median')
+                moving_median_type_string: str = check_type.replace('avg', 'mm')
+
+            # The median and the total count are None for the count, Since they are the count.
+            if check_type == 'count':
+                total_entries_averaged = None
+                median_size = None
+            else:
+                total_entries_averaged = day_statistics_content_dict['count']
+                median_size = day_statistics_content_dict[median_type_string]
+
+            moving_median_size = moving_averages_dict[host][moving_median_type_string]
+
             deviation_list.append({
                 'day': day,
                 'host': host,
@@ -344,11 +366,10 @@ def find_deviation_from_moving_average(
                 'percentage': top_bottom_deviation_percentage,
                 'ma_value_checked': check_type_moving_above,
                 'deviation_percentage': deviation_percentage,
+                'total_entries_averaged': total_entries_averaged,
                 'deviation_type': deviation_type,
-                'median_request_size': day_statistics_content_dict['median_request_size'],
-                'median_response_size': day_statistics_content_dict['median_response_size'],
-                'mm_request_size': moving_averages_dict[host]['mm_request_size'],
-                'mm_response_size': moving_averages_dict[host]['mm_response_size'],
+                'median_size': median_size,
+                'mm_size': moving_median_size,
                 'data': day_statistics_content_dict,
                 'ma_data': moving_averages_dict[host]
             })
@@ -373,9 +394,19 @@ def find_deviation_from_moving_average(
                 deviation_list.append({
                     'day': day,
                     'host': host,
-                    'data': host_dict,
                     'message': message,
-                    'type': 'clear'
+                    'value': None,
+                    'ma_value': None,
+                    'check_type': None,
+                    'percentage': None,
+                    'ma_value_checked': None,
+                    'deviation_percentage': None,
+                    'total_entries_averaged': None,
+                    'deviation_type': 'clear',
+                    'median_size': None,
+                    'mm_size': None,
+                    'data': host_dict,
+                    'ma_data': previous_day_moving_average_dict
                 })
                 continue
 

atomicshop/ssh_remote.py

@@ -1,19 +1,19 @@
 import sys
 import base64
 import socket
+import logging
+from pathlib import Path
 
-from .print_api import print_api
-from .wrappers.loggingw import loggingw
-from .wrappers.socketw import base
-
-
-# External Libraries
 try:
     import paramiko
 except ImportError as exception_object:
     print(f"Library missing: {exception_object.name}. Install by executing: pip install paramiko")
     sys.exit()
 
+from .print_api import print_api
+from .wrappers.loggingw import loggingw
+from .wrappers.socketw import base
+
 
 class SSHRemote:
     """
@@ -87,9 +87,13 @@ class SSHRemote:
             sys.exit(main())
 
     """
-    logger = loggingw.get_logger_with_level("network." + __name__.rpartition('.')[2])
-
-    def __init__(self, ip_address: str, username: str, password: str):
+    def __init__(
+            self,
+            ip_address: str,
+            username: str,
+            password: str,
+            logger: logging.Logger = None
+    ):
         self.ip_address: str = ip_address
         self.username: str = username
         self.password: str = password
@@ -97,6 +101,12 @@ class SSHRemote:
         # Initializing paramiko SSHClient class
         self.ssh_client = paramiko.SSHClient()
 
+        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
+
     def connect(self):
         error: str = str()
 

atomicshop/wrappers/loggingw/loggers.py

@@ -25,6 +25,14 @@ def is_logger_exists(
     return logger_name in logging.Logger.manager.loggerDict
 
 
+def get_all_existing_loggers_names() -> list:
+    """
+    Function to get all existing loggers names.
+    :return: list, List of all existing loggers names.
+    """
+    return list(logging.Logger.manager.loggerDict.keys())
+
+
 def get_logger(logger_name: str) -> logging.Logger:
     """
     Function to get a logger.

atomicshop/wrappers/loggingw/loggingw.py

@@ -5,10 +5,13 @@ from typing import Literal, Union
 from . import loggers, handlers
 
 
+class LoggingwLoggerAlreadyExistsError(Exception):
+    pass
+
+
 # noinspection PyPep8Naming
 def create_logger(
         logger_name: str,
-        get_existing_if_exists: bool = True,
         file_path: str = None,
         directory_path: str = None,
         add_stream: bool = False,
@@ -43,8 +46,6 @@ def create_logger(
     Function to get a logger and add StreamHandler and TimedRotatingFileHandler to it.
 
     :param logger_name: Name of the logger.
-    :param get_existing_if_exists: bool, If set to True, the logger will be returned if it already exists.
-        If set to False, the new stream/file handler will be added to existing logger again.
     :param file_path: full path to the log file. If you don't want to use the file, set it to None.
         You can set the directory_path only and then the 'logger_name' will be used as the file name with the
         'file_type' as the file extension.
@@ -165,6 +166,10 @@ def create_logger(
         main()
     """
 
+    # Check if the logger exists before creating it.
+    if loggers.is_logger_exists(logger_name):
+        raise LoggingwLoggerAlreadyExistsError(f"Logger '{logger_name}' already exists.")
+
     if not directory_path and not file_path:
         raise ValueError("You need to provide 'directory_path' or 'file_path'.")
     if directory_path and file_path:
@@ -176,15 +181,8 @@ def create_logger(
 
         file_path = f"{directory_path}{os.sep}{logger_name}.{file_type}"
 
-    # Check if the logger exists before creating it/getting the existing.
-    is_logger_exists = loggers.is_logger_exists(logger_name)
-
     logger = get_logger_with_level(logger_name, logging_level)
 
-    # If the logger already exists, and we don't want to add the handlers again, return the logger.
-    if get_existing_if_exists and is_logger_exists:
-        return logger
-
     if add_stream:
         handlers.add_stream_handler(
             logger=logger, logging_level=logging_level, formatter=formatter_streamhandler,

atomicshop/wrappers/socketw/dns_server.py

@@ -3,6 +3,8 @@ import datetime
 import time
 import threading
 import socket
+import logging
+from pathlib import Path
 
 from ...print_api import print_api
 from ..loggingw import loggingw
@@ -28,8 +30,7 @@ class DnsServer:
     """
     DnsServer class is responsible to handle DNS Requests on port 53 based on configuration and send DNS Response back.
     """
-    logger = loggingw.get_logger_with_level("network." + __name__.rpartition('.')[2])
-
+    # noinspection PyPep8Naming
     def __init__(
             self,
             listening_interface: str,
@@ -49,6 +50,7 @@ class DnsServer:
             response_ttl: int = 60,
             dns_service_retries: int = 5,
             cache_timeout_minutes: int = 60,
+            logger: logging.Logger = None
     ):
         """
         Initialize the DNS Server object with all the necessary settings.
@@ -80,6 +82,7 @@ class DnsServer:
             (socket connect / request send / response receive).
         :param cache_timeout_minutes: int: Timeout in minutes to clear the DNS Cache.
             server. Each domain will be pass in the queue as a string.
+        :param logger: logging.Logger: Logger object to use for logging. If not provided, a new logger will be created.
         """
 
         self.listening_interface: str = listening_interface
@@ -127,13 +130,28 @@ class DnsServer:
         # Logger that logs all the DNS Requests and responses in DNS format. These entries will not present in
         # network log of TCP Server module.
         self.dns_full_logger = loggingw.create_logger(
-            logger_name="dns",
+            logger_name="dns_full",
             directory_path=self.log_directory_path,
             add_timedfile=True,
             formatter_filehandler='DEFAULT',
             backupCount=backupCount_log_files_x_days
         )
 
+        # Check if the logger was provided, if not, create a new logger.
+        if not logger:
+            self.logger = loggingw.create_logger(
+                logger_name=Path(__file__).stem,
+                directory_path=self.log_directory_path,
+                add_stream=True,
+                add_timedfile=True,
+                formatter_streamhandler='DEFAULT',
+                formatter_filehandler='DEFAULT',
+                backupCount=backupCount_log_files_x_days
+            )
+        else:
+            # 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}')
+
         self.test_config()
 
     def test_config(self):

atomicshop/wrappers/socketw/get_process.py

@@ -1,6 +1,7 @@
 # Needed to redirect output from console to logger on LOCALHOST process command line harvesting.
 import io
 from contextlib import redirect_stdout
+import logging
 
 from . import base
 from ...ssh_remote import SSHRemote
@@ -15,12 +16,14 @@ class GetCommandLine:
             client_socket=None,
             ssh_script_processor=None,
             ssh_user: str = None,
-            ssh_pass: str = None
+            ssh_pass: str = None,
+            logger: logging.Logger = None
     ):
         self.client_socket = client_socket
         self.ssh_script_processor = ssh_script_processor
         self.ssh_user: str = ssh_user
         self.ssh_pass: str = ssh_pass
+        self.logger: logging.Logger = logger
 
     def get_process_name(self, print_kwargs: dict = None):
         # Get client ip and the source port.
@@ -53,7 +56,8 @@ class GetCommandLine:
 
             print_api(f"Initializing SSH connection to [{client_ip}]", **print_kwargs)
             # Initializing SSHRemote class.
-            current_ssh_client = SSHRemote(ip_address=client_ip, username=self.ssh_user, password=self.ssh_pass)
+            current_ssh_client = SSHRemote(
+                ip_address=client_ip, username=self.ssh_user, password=self.ssh_pass, logger=self.logger)
 
             execution_output, execution_error = current_ssh_client.connect_get_client_commandline(script_string)
         # Else, if we're on localhost, then execute the script directly without SSH.

atomicshop/wrappers/socketw/receiver.py

@@ -1,5 +1,7 @@
+import logging
 import socket
 import ssl
+from pathlib import Path
 
 from ...print_api import print_api
 from ..loggingw import loggingw
@@ -20,9 +22,11 @@ def peek_first_bytes(client_socket, bytes_amount: int = 1) -> bytes:
 
 class Receiver:
     """ Receiver Class is responsible for receiving the message from socket and populate the message class """
-    logger = loggingw.get_logger_with_level("network." + __name__.rpartition('.')[2])
-
-    def __init__(self, ssl_socket: ssl.SSLSocket):
+    def __init__(
+            self,
+            ssl_socket: ssl.SSLSocket,
+            logger: logging.Logger = None
+    ):
         self.ssl_socket: ssl.SSLSocket = ssl_socket
         self.buffer_size_receive: int = 16384
         # Timeout of 2 is enough for regular HTTP sessions`.
@@ -39,6 +43,12 @@ class Receiver:
         # Will get client Local port from the socket
         self.class_client_local_port: int = int()
 
+        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 receive only the buffer, with error handling
     def socket_receive_message_buffer(self):
         # Defining the data variable

atomicshop/wrappers/socketw/sender.py

@@ -1,16 +1,27 @@
 import ssl
+import logging
+from pathlib import Path
 
 from ...print_api import print_api
 from ..loggingw import loggingw
 
 
 class Sender:
-    logger = loggingw.get_logger_with_level("network." + __name__.rpartition('.')[2])
-
-    def __init__(self, ssl_socket: ssl.SSLSocket, class_message: bytearray):
+    def __init__(
+            self,
+            ssl_socket: ssl.SSLSocket,
+            class_message: bytearray,
+            logger: logging.Logger = None
+    ):
         self.class_message: bytearray = class_message
         self.ssl_socket: ssl.SSLSocket = ssl_socket
 
+        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 send a message to server
     def send(self):
         # "socket.send()" returns number of bytes sent. "0" meaning that the socket was closed by the other side.

atomicshop/wrappers/socketw/socket_client.py

@@ -2,6 +2,8 @@ import socket
 import ssl
 import time
 from typing import Literal, Union
+import logging
+from pathlib import Path
 
 from cryptography import x509
 
@@ -18,11 +20,15 @@ import dns.resolver
 
 
 class SocketClient:
-    logger = loggingw.get_logger_with_level("network." + __name__.rpartition('.')[2])
-
     def __init__(
             self,
-            service_name: str, service_port: int, tls: bool = False, connection_ip=None, dns_servers_list=None):
+            service_name: str,
+            service_port: int,
+            tls: bool = False,
+            connection_ip=None,
+            dns_servers_list=None,
+            logger: logging.Logger = None
+    ):
         """
         If you have a certificate for domain, but not for the IPv4 address, the SSL Socket context can be created for
         domain and the connection itself (socket.connect()) made for the IP. This way YOU decide to which IPv4 your
@@ -38,6 +44,7 @@ class SocketClient:
             'service_name' by these DNS servers, with the first IPv4 result.
         :param dns_servers_list: (Optional) List object with dns IPv4 addresses that 'service_name' will be resolved
             with, using 'dnspython' module. 'connection_ip' will be populated with first resolved IP.
+        :param logger: (Optional) Logger object. If not provided, the default logger will be used.
 
         If both 'connection_ip' and 'dns_servers_list' specified, ValueException with raise.
         """
@@ -60,6 +67,12 @@ 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.
@@ -208,7 +221,8 @@ class SocketClient:
                 f"[{self.service_name}] resolves to ip: [{self.connection_ip}]. Pulled IP from the socket.")
 
             # Send the data received from the client to the service over socket
-            function_data_sent = Sender(self.socket_instance, request_bytes).send()
+            function_data_sent = Sender(
+                ssl_socket=self.socket_instance, class_message=request_bytes, logger=self.logger).send()
 
             # If the socket disconnected on data send
             if not function_data_sent:
@@ -218,7 +232,8 @@ class SocketClient:
                 self.close_socket()
             # Else if send was successful
             else:
-                function_service_data = Receiver(self.socket_instance).receive()
+                function_service_data = Receiver(
+                    ssl_socket=self.socket_instance, logger=self.logger).receive()
 
                 # If data received is empty meaning the socket was closed on the other side
                 if not function_service_data:

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -432,7 +432,8 @@ class SocketWrapper:
                         client_socket=client_socket,
                         ssh_script_processor=self.ssh_script_processor,
                         ssh_user=self.ssh_user,
-                        ssh_pass=self.ssh_pass)
+                        ssh_pass=self.ssh_pass,
+                        logger=self.logger)
                     process_name = get_command_instance.get_process_name(print_kwargs={'logger': self.logger})
 
                 # If 'accept()' function worked well, SSL worked well, then 'client_socket' won't be empty.

{atomicshop-2.16.21.dist-info → atomicshop-2.16.23.dist-info}/METADATA

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

{atomicshop-2.16.21.dist-info → atomicshop-2.16.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=zKVPai5VQ8seJQHyf_xQ-rQvYdF2i_Ndo5C7J_u4bvA,124
+atomicshop/__init__.py,sha256=nFFyrQAHTstcKiEqAJ9esDeQ3MmcErpmeonwOprd9VU,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
@@ -35,7 +35,7 @@ atomicshop/scheduling.py,sha256=MvF20M6uU0Kh_CQn2ERxMTLvvF-ToBrdMhXNrKxYFj8,4682
 atomicshop/script_as_string_processor.py,sha256=uAIWwhHE-eP2FniuwBqEiM6VzyQX96uwdE3aA31rIm8,1883
 atomicshop/sound.py,sha256=tHiQQbFBk7EYN3pAfGNcxfF9oNsoYnZgu9z9iq8hxQE,24352
 atomicshop/speech_recognize.py,sha256=55-dIjgkpF93mvJnJuxSFuft5H5eRvGNlUj9BeIOZxk,5903
-atomicshop/ssh_remote.py,sha256=HUP4FHaEHexI0EnoLI9i2AgVQNTpsMNPNC4ZCI22EAA,17029
+atomicshop/ssh_remote.py,sha256=Mxixqs2-xGy1bhbcP0LKqjxKTNPz1Gmzz8PzO8aLB4c,17345
 atomicshop/sys_functions.py,sha256=MTBxRve5bh58SPvhX3gMiGqHlSBuI_rdNN1NnnBBWqI,906
 atomicshop/system_resource_monitor.py,sha256=WvnnQrD5W9NRqOWI2YNcL-ut2UrvhrYToVlRR2c1vs8,13720
 atomicshop/system_resources.py,sha256=0mhDZBEcMzToCOw5ArJhtqYjktOW6iJGdyRkJ01Cpwk,9272
@@ -84,7 +84,7 @@ atomicshop/basics/ansi_escape_codes.py,sha256=WtIkm-BjSZS5J5irDUdAMBNvdX-qXFZcTX
 atomicshop/basics/argparse_template.py,sha256=horwgSf3MX1ZgRnYxtmmQuz9OU_vKrKggF65gmjlmfg,5836
 atomicshop/basics/booleans.py,sha256=QM0pibMmEKRKtBlpW9M5hkfD4S4rzirde0f8TSTnScE,2198
 atomicshop/basics/bytes_arrays.py,sha256=WvSRDhIGt1ywF95t-yNgpxLm1nlZUbM1Dz6QckcyE8Y,5915
-atomicshop/basics/classes.py,sha256=EijW_g4EhdNBnKPMG3nT3HjFspTchtM7to6zm9Ad_Mk,9771
+atomicshop/basics/classes.py,sha256=T0Bm13hKvkXG3med68ptL7XuoWiCi3TE-K5TMINDlrY,10655
 atomicshop/basics/dicts.py,sha256=DeYHIh940pMMBrFhpXt4dsigFVYzTrlqWymNo4Pq_Js,14049
 atomicshop/basics/dicts_nested.py,sha256=StYxYnYPa0SEJr1lmEwAv5zfERWWqoULeyG8e0zRAwE,4107
 atomicshop/basics/enumerations.py,sha256=41VVQYh_vnVapggxKg2IRU5e_EiMpZzX1n1mtxvoSzM,1364
@@ -124,28 +124,28 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/connection_thread_worker.py,sha256=rfullUfMRR5YUEI45KJdGXlbOGYF89GfPkhUBoHizhM,20297
 atomicshop/mitm/import_config.py,sha256=_nu8mgA-M4s6dZ8_QWx3x0aVb75upvsCuX_PIUg4X2w,8345
-atomicshop/mitm/initialize_engines.py,sha256=kBG8TBnyFuwlJ1uKaWDzc5AiZNpwdvouq2pr-PYrdEA,8349
+atomicshop/mitm/initialize_engines.py,sha256=Od1vC1ZGls0BNZiPgoRQj8Mc44UO8INJj3w1p5YQw5A,8274
 atomicshop/mitm/message.py,sha256=d_sm3O_aoZf87dDQP44xOMNEG-uZBN1ZecQgMCacbZs,1814
-atomicshop/mitm/mitm_main.py,sha256=CdCv4nYt_jwd23AI14v6lC2H8SZeIZqsXjFhwq61UtM,21285
+atomicshop/mitm/mitm_main.py,sha256=gA8sV7hI107OnoeedCHpy8f3zcE4vAsBc44l_VTjVFo,21622
 atomicshop/mitm/recs_files.py,sha256=B8fSuvYXlh50LWfwLRw_bYswreTjmdZLuHJzbDC5Gss,2930
 atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
-atomicshop/mitm/statistic_analyzer.py,sha256=0QYmkdSp5tjHkyl5MGWVEsgpRR3FgN7A2fE6pKTSO8I,27164
+atomicshop/mitm/statistic_analyzer.py,sha256=c1Iv9qGy6_IGg95VxhRQ06sleygLdJi_B13MjZ0FJAU,26183
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/create_module_template.py,sha256=tRjVSm1sD6FzML71Qbuwvita0qsusdFGm8NZLsZ-XMs,4853
 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=Q1hEhbOXa8oBm9uD1VG2hLRCzUzpMjGeeS2Npd0a4Hw,1336
-atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=G1TNVxUKFfRopUgENcLCQS0XGzNJmKYBep70wWHvPAQ,4650
-atomicshop/mitm/engines/__parent/responder___parent.py,sha256=gufSZP2Pic6iF7eTzbIi0z5-TPIDeIgoRQAplUwtcNk,12185
+atomicshop/mitm/engines/__parent/parser___parent.py,sha256=VjV_cDuB3V0a3dPbJqLBEo3674Asa8-HVzvqxGULME8,720
+atomicshop/mitm/engines/__parent/recorder___parent.py,sha256=s_FZwqBMZrX3SJZ5wmJNR3qQ5ODiIwmkTMLZ6JQ26DE,4466
+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=QolWZKm8SiPxxSoyWY_UK7ODam7EUMAgVfOPFnXxODE,2987
-atomicshop/mitm/engines/__reference_general/recorder___reference_general.py,sha256=KENDVf9OwXD9gwSh4B1XxACCe7iHYjrvnW1t6F64wdE,695
-atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=1AM49UaFTKA0AHw-k3SV3uH3QbG-o6ux0c-GoWkKNU0,6993
+atomicshop/mitm/engines/__reference_general/parser___reference_general.py,sha256=57MEPZMAjTO6xBDZ-yt6lgGJyqRrP0Do5Gk_cgCiPns,2998
+atomicshop/mitm/engines/__reference_general/recorder___reference_general.py,sha256=3eCGxD2oDulpVDgmMq19TyXohjsY-O_3HUiN8oKsUI4,712
+atomicshop/mitm/engines/__reference_general/responder___reference_general.py,sha256=IUyQYMPeEhIARfALWiKPFeXagSQD6lRzAxUdi4ZIT88,7010
 atomicshop/mitm/statistic_analyzer_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/statistic_analyzer_helper/analyzer_helper.py,sha256=pk6L1t1ea1kvlBoR9QEJptOmaX-mumhwLsP2GCKukbk,5920
-atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=Wge-OfbbClfjeEWwOyksd-x9C5QZdRD3KRSjtP9VL9Q,16651
+atomicshop/mitm/statistic_analyzer_helper/moving_average_helper.py,sha256=XkJBAKD20j4rBpTWuhRJG3ONDWsktOh3PfOqzVDSORo,17883
 atomicshop/monitor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/monitor/change_monitor.py,sha256=K5NlVp99XIDDPnQQMdru4BDmua_DtcDIhVAzkTOvD5s,7673
 atomicshop/monitor/checks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -248,8 +248,8 @@ atomicshop/wrappers/loggingw/consts.py,sha256=JWiUJEydjhwatBxtIJsGTmDUSTLbmIRidt
 atomicshop/wrappers/loggingw/filters.py,sha256=CMs5PAMb68zxJgBcQobaOFDG5kLJBOVYnoBHjDgksO8,2859
 atomicshop/wrappers/loggingw/formatters.py,sha256=7XUJvlB0CK4DCkEp8NTL0S0dkyrZD0UTADgEwkStKOY,5483
 atomicshop/wrappers/loggingw/handlers.py,sha256=hAPFJQ-wFoNO8QzGrJRSvyuP09Q1F0Dl9_w7zzlgcW0,18155
-atomicshop/wrappers/loggingw/loggers.py,sha256=QH5QainlGLyrDpsDu4T1C8-WQQau3JW2OS5RgC-kXpM,2677
-atomicshop/wrappers/loggingw/loggingw.py,sha256=6HUn2z4ZW8PgakPscosKx23qYwHlBQcLiZGw-VZHi-k,12374
+atomicshop/wrappers/loggingw/loggers.py,sha256=mmM__XR3W4QC82wbsDRG_M4_0JYGGEP0Qn0WCOSp-go,2910
+atomicshop/wrappers/loggingw/loggingw.py,sha256=nt4UxOBHL--M-Ls9b3eicffCrspYWDWG1q4ZVlHATIs,12068
 atomicshop/wrappers/loggingw/reading.py,sha256=ERBSiQbEksySKpXpu2E_6k9dZ6MPH95ZIsmdjWW9MUE,16436
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/mongodbw/install_mongodb.py,sha256=3ZPqrXxj3lC-PnAKGXclylLuOqsbyXYeUpb5iGjdeUU,6626
@@ -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=53S52lkA9RWetNlee-mjt000OJW4Mi7Ktcru0WXrMZE,45504
+atomicshop/wrappers/socketw/dns_server.py,sha256=G3roqkj_gMRTkVs2kgwiQR9S7YqA-uQWraCt8FqKjlo,46375
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
-atomicshop/wrappers/socketw/get_process.py,sha256=_YMVxYhVlzjJpeOR36tphZ5QWeKYwk03Ilw0muCxDbg,5950
-atomicshop/wrappers/socketw/receiver.py,sha256=G3hDTacm7nwwUNHEbKZpxO0c8rHcl0NeKpZy7Xc6zpA,9008
-atomicshop/wrappers/socketw/sender.py,sha256=d7YQFlCBMFTYtkGxbS-8cm5rh5WWFeBVvrEivWHYstI,3666
+atomicshop/wrappers/socketw/get_process.py,sha256=zKEqh98cB9UDLFhtxVpperfXsCjyIMNANHilDD06p0U,6094
+atomicshop/wrappers/socketw/receiver.py,sha256=XVvWOoeCo3vA0O5p19ryi-hcDIyx382WNG7WzMNVeYk,9322
+atomicshop/wrappers/socketw/sender.py,sha256=OcX1aeI2OBDPPfvQkiEcV4Ak22DSJVvjMGYKOlgfpmI,3993
 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_client.py,sha256=hcHtOh43UhJAxYe7DSg4YVSJnCEKLRWKPiZ8DD8ite8,20237
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=DiDzg9OlgahxpqAsnOkCKHNcE-H-YAY3ndVMeU-oCjw,33363
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=M47tjC8SoXZJV2fC_OYmSNNTs-3-ZQcpaB1WmvqVCTU,33408
 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.21.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.21.dist-info/METADATA,sha256=laLfi_M6QxDCtlg45NOSU4pblQDzfKTAavug5lp8Ewo,10473
-atomicshop-2.16.21.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.21.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.21.dist-info/RECORD,,
+atomicshop-2.16.23.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.23.dist-info/METADATA,sha256=Ye4Ij67GZEdRL0YppIdiL1YjtpKcJWWbIzIG3ldpxsg,10473
+atomicshop-2.16.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.23.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.23.dist-info/RECORD,,