atomicshop 2.16.24__py3-none-any.whl → 2.16.26__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.24'
+__version__ = '2.16.26'

atomicshop/filesystem.py

@@ -338,18 +338,20 @@ def create_directory(directory_fullpath: str):
     pathlib.Path(directory_fullpath).mkdir(parents=True, exist_ok=True)
 
 
-def rename_file(source_file_path: str, target_file_path: str) -> None:
+def rename_file(file_path: str, new_file_name: str) -> None:
     """
     The function renames file from source to target.
 
-    :param source_file_path: string, full path to source file.
-    :param target_file_path: string, full path to target file.
+    :param file_path: string, full path to file that will be renamed.
+    :param new_file_name: string, new name of the file. No path should be included.
 
     :return: None
     """
 
+    renamed_file_path = str(Path(file_path).parent) + os.sep + new_file_name
+
     # Rename file.
-    os.rename(source_file_path, target_file_path)
+    os.rename(file_path, renamed_file_path)
 
 
 @contextmanager
@@ -1569,7 +1571,7 @@ def backup_file(
         else:
             file_name: str = f"{file_name_no_extension}_{timestamp}{file_extension}"
         backup_file_path: str = str(Path(backup_directory) / file_name)
-        move_file(file_path, backup_directory)
+        rename_file(file_path, file_name)
 
         return backup_file_path
     else:

atomicshop/mitm/config_static.py

@@ -48,6 +48,8 @@ TOML_TO_STATIC_CATEGORIES: dict = {
 
 
 class MainConfig:
+    LOGGER_NAME: str = 'network'
+
     SCRIPT_DIRECTORY: str = None
 
     ENGINES_DIRECTORY_PATH: str = None

atomicshop/mitm/initialize_engines.py

@@ -63,15 +63,15 @@ class ModuleCategory:
 
     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
-        )
+        # 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(

atomicshop/mitm/mitm_main.py

@@ -1,4 +1,4 @@
-import os
+import logging
 import threading
 import time
 import datetime
@@ -6,6 +6,8 @@ import datetime
 import atomicshop   # Importing atomicshop package to get the version of the package.
 
 from .. import filesystem, queues, dns, on_exit
+from ..basics import tracebacks
+from ..file_io import csvs
 from ..permissions import permissions
 from ..python_functions import get_current_python_version_string, check_python_version_compliance
 from ..wrappers.socketw import socket_wrapper, dns_server, base
@@ -21,6 +23,12 @@ NETWORK_INTERFACE_IS_DYNAMIC: bool = bool()
 NETWORK_INTERFACE_IPV4_ADDRESS_LIST: list[str] = list()
 
 
+EXCEPTIONS_CSV_LOGGER_NAME: str = 'exceptions'
+EXCEPTIONS_CSV_LOGGER_HEADER: str = 'time,exception'
+# noinspection PyTypeChecker
+MITM_ERROR_LOGGER: logging.Logger = None
+
+
 def exit_cleanup():
     if permissions.is_admin():
         is_dns_dynamic, current_dns_gateway = dns.get_default_dns_gateway()
@@ -32,7 +40,7 @@ def exit_cleanup():
             print_api("Returned default DNS gateway...", color='blue')
 
 
-def mitm_server_main(config_file_path: str):
+def mitm_server(config_file_path: str):
     on_exit.register_exit_handler(exit_cleanup)
 
     # Main function should return integer with error code, 0 is successful.
@@ -45,6 +53,16 @@ def mitm_server_main(config_file_path: str):
     if result != 0:
         return result
 
+    global MITM_ERROR_LOGGER
+    MITM_ERROR_LOGGER = loggingw.create_logger(
+        logger_name=EXCEPTIONS_CSV_LOGGER_NAME,
+        directory_path=config_static.LogRec.logs_path,
+        file_type="csv",
+        add_timedfile=True,
+        formatter_filehandler='MESSAGE',
+        header=EXCEPTIONS_CSV_LOGGER_HEADER
+    )
+
     # Create folders.
     filesystem.create_directory(config_static.LogRec.logs_path)
 
@@ -57,11 +75,10 @@ def mitm_server_main(config_file_path: str):
         filesystem.create_directory(
             config_static.Certificates.sni_server_certificate_from_server_socket_download_directory)
 
-    # Create a logger that will log messages to file, Initiate System logger.
-    logger_name = "system"
-    system_logger = loggingw.create_logger(
-        logger_name=logger_name,
-        file_path=f"{config_static.LogRec.logs_path}{os.sep}{logger_name}.txt",
+    network_logger_name = config_static.MainConfig.LOGGER_NAME
+    network_logger = loggingw.create_logger(
+        logger_name=network_logger_name,
+        directory_path=config_static.LogRec.logs_path,
         add_stream=True,
         add_timedfile=True,
         formatter_streamhandler='DEFAULT',
@@ -69,6 +86,10 @@ def mitm_server_main(config_file_path: str):
         backupCount=config_static.LogRec.store_logs_for_x_days
     )
 
+    # Initiate Listener logger, which is a child of network logger, so he uses the same settings and handlers
+    listener_logger = loggingw.get_logger_with_level(f'{network_logger_name}.listener')
+    system_logger = loggingw.get_logger_with_level(f'{network_logger_name}.system')
+
     # Writing first log.
     system_logger.info("======================================")
     system_logger.info("Server Started.")
@@ -202,22 +223,6 @@ def mitm_server_main(config_file_path: str):
     # Assigning all the engines domains to all time domains, that will be responsible for adding new domains.
     config_static.Certificates.domains_all_times = list(domains_engine_list_full)
 
-    network_logger_name = "network"
-    network_logger = loggingw.create_logger(
-        logger_name=network_logger_name,
-        directory_path=config_static.LogRec.logs_path,
-        add_stream=True,
-        add_timedfile=True,
-        formatter_streamhandler='DEFAULT',
-        formatter_filehandler='DEFAULT',
-        backupCount=config_static.LogRec.store_logs_for_x_days
-    )
-    system_logger.info(f"Loaded network logger: {network_logger}")
-
-    # Initiate Listener logger, which is a child of network logger, so he uses the same settings and handlers
-    listener_logger = loggingw.get_logger_with_level(f'{network_logger_name}.listener')
-    system_logger.info(f"Loaded listener logger: {listener_logger}")
-
     print_api("Press [Ctrl]+[C] to stop.", color='blue')
 
     # Create request domain queue.
@@ -339,22 +344,16 @@ def mitm_server_main(config_file_path: str):
                     use_default_connection=True
                 )
 
-        # General exception handler will catch all the exceptions that occurred in the threads and write it to the log.
-        # noinspection PyBroadException
-        try:
-            socket_thread = threading.Thread(
-                target=socket_wrapper_instance.loop_for_incoming_sockets,
-                kwargs={
-                    'reference_function_name': thread_worker_main,
-                    'reference_function_args': (network_logger, statistics_writer, engines_list, reference_module,)
-                }
-            )
+        socket_thread = threading.Thread(
+            target=socket_wrapper_instance.loop_for_incoming_sockets,
+            kwargs={
+                'reference_function_name': thread_worker_main,
+                'reference_function_args': (network_logger, statistics_writer, engines_list, reference_module,)
+            }
+        )
 
-            socket_thread.daemon = True
-            socket_thread.start()
-        except Exception:
-            message = f"Unhandled Exception occurred in 'loop_for_incoming_sockets' function"
-            print_api(message, error_type=True, color="red", logger=network_logger, traceback_string=True)
+        socket_thread.daemon = True
+        socket_thread.start()
 
         # Compress recordings each day in a separate process.
         recs_archiver_thread = threading.Thread(target=_loop_at_midnight_recs_archive)
@@ -380,3 +379,17 @@ def _loop_at_midnight_recs_archive():
             previous_date = current_date
         # Sleep for 1 minute.
         time.sleep(60)
+
+
+def mitm_server_main(config_file_path: str):
+    try:
+        # Main function should return integer with error code, 0 is successful.
+        return mitm_server(config_file_path)
+    except KeyboardInterrupt:
+        print_api("Server Stopped by [KeyboardInterrupt].", color='blue')
+        return 0
+    except Exception as e:
+        msg = tracebacks.get_as_string()
+        output_csv_line: str = csvs.escape_csv_line_to_string([datetime.datetime.now(), msg])
+        MITM_ERROR_LOGGER.info(output_csv_line)
+        print_api(str(e), error_type=True, color="red", traceback_string=True)

atomicshop/mitm/shared_functions.py

@@ -4,6 +4,8 @@ import inspect
 from ..wrappers.loggingw import loggingw
 from ..basics import dicts
 
+from . import config_static
+
 
 # If the string has several dot characters (".") - return the most right string after the last dot.
 # Meaning if the class name contains several child classes like: classes.parsers.parser_something,
@@ -32,7 +34,8 @@ def create_custom_logger():
     # 'f_globals' is a dictionary of all the global variables of the calling initiated class.
     class_name = calling_frame.f_globals['__name__']
     # Get the logger name only.
-    logger_name = build_module_names(class_name)[0]
+    engine_logger_part = build_module_names(class_name)[0]
+    logger_name = f'{config_static.MainConfig.LOGGER_NAME}.{engine_logger_part}'
 
     return loggingw.get_logger_with_level(logger_name)
 

atomicshop/wrappers/socketw/dns_server.py

@@ -5,12 +5,14 @@ import threading
 import socket
 import logging
 from pathlib import Path
+from typing import Literal
 
 from ...print_api import print_api
 from ..loggingw import loggingw
 from ..psutilw import networks
 from ... import queues
-from ...basics import booleans
+from ...basics import booleans, tracebacks
+from ...file_io import csvs
 
 # noinspection PyPackageRequirements
 import dnslib
@@ -26,6 +28,115 @@ class DnsConfigurationValuesError(Exception):
     pass
 
 
+LOGGER_NAME: str = 'dns_traffic'
+DNS_STATISTICS_HEADER: str = (
+    'timestamp,dns_type,client_ipv4,client_port,qname,qtype,qclass,header,error')
+
+
+class DnsStatisticsCSVWriter:
+    """
+    Class to write statistics to CSV file.
+    This can be initiated at the main, and then passed to the thread worker function.
+    """
+    def __init__(
+            self,
+            statistics_directory_path: str
+    ):
+        self.csv_logger = loggingw.create_logger(
+            logger_name=LOGGER_NAME,
+            directory_path=statistics_directory_path,
+            add_timedfile=True,
+            formatter_filehandler='MESSAGE',
+            file_type='csv',
+            header=DNS_STATISTICS_HEADER
+        )
+
+    def write_row(
+            self,
+            client_address: tuple,
+            timestamp=None,
+            dns_type: Literal['request', 'response'] = None,
+            dns_request = None,
+            dns_response = None,
+            error: str = None,
+    ):
+        if not timestamp:
+            timestamp = datetime.datetime.now()
+
+        if not dns_type:
+            if not dns_request and not dns_response:
+                raise ValueError("Either DNS Request or DNS Response must be provided.")
+            elif dns_request and dns_response:
+                raise ValueError("Either DNS Request or DNS Response must be provided. Not both.")
+
+        if dns_request:
+            dns_type = 'request'
+        elif dns_response:
+            dns_type = 'response'
+
+        if dns_type not in ['request', 'response']:
+            raise ValueError(f"DNS Type can be only 'request' or 'response'. Provided: {dns_type}")
+
+        client_ipv4, client_port = client_address
+        client_ipv4: str
+        client_port: str = str(client_port)
+
+        qname: str = str()
+        qtype: str = str()
+        qclass: str = str()
+        rr: str = str()
+        header: str = str()
+
+        if dns_request:
+            qname = str(dns_request.q.qname)[:-1]
+            qtype = dnslib.QTYPE[dns_request.q.qtype]
+            qclass = dnslib.CLASS[dns_request.q.qclass]
+
+        if dns_response:
+            qname = str(dns_response.q.qname)[:-1]
+            qtype = dnslib.QTYPE[dns_response.q.qtype]
+            qclass = dnslib.CLASS[dns_response.q.qclass]
+            rr: str = str(dns_response.rr)
+            header = str(dns_response.header)
+
+        escaped_line_string: str = csvs.escape_csv_line_to_string([
+            timestamp,
+            dns_type,
+            client_ipv4,
+            client_port,
+            qname,
+            qtype,
+            qclass,
+            rr,
+            header,
+            error
+        ])
+
+        self.csv_logger.info(escaped_line_string)
+
+    def write_error(
+            self,
+            dns_type: Literal['request', 'response'],
+            error_message: str,
+            client_address: tuple
+    ):
+        """
+        Write the error message to the statistics CSV file.
+        This is used for easier execution, since most of the parameters will be empty on accept.
+
+        :param dns_type: Literal['request', 'response'], DNS request or response.
+        :param error_message: string, error message.
+        :param client_address: tuple, client address (IPv4, Port).
+        :return:
+        """
+
+        self.write_row(
+            dns_type=dns_type,
+            client_address=client_address,
+            error=error_message
+        )
+
+
 class DnsServer:
     """
     DnsServer class is responsible to handle DNS Requests on port 53 based on configuration and send DNS Response back.
@@ -129,13 +240,7 @@ 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_full",
-            directory_path=self.log_directory_path,
-            add_timedfile=True,
-            formatter_filehandler='DEFAULT',
-            backupCount=backupCount_log_files_x_days
-        )
+        self.dns_statistics_csv_writer = DnsStatisticsCSVWriter(statistics_directory_path=log_directory_path)
 
         # Check if the logger was provided, if not, create a new logger.
         if not logger:
@@ -250,20 +355,19 @@ class DnsServer:
                     client_data: bytes
                     client_address: tuple
                 except ConnectionResetError:
+                    traceback_string = tracebacks.get_as_string(one_line=True)
                     # This error happens when the client closes the connection before the server.
                     # This is not an error for a DNS Server, but we'll log it anyway only with the full DNS logger.
-                    message = "Error: to receive DNS request, An existing connection was forcibly closed"
-                    # print_api(message, logger=self.logger, logger_method='error', traceback_string=True)
-                    print_api(
-                        message, logger=self.dns_full_logger, logger_method='error', traceback_string=True)
-                    self.dns_full_logger.info("==========")
+                    message = (f"Error: to receive DNS request, An existing connection was forcibly closed | "
+                               f"{traceback_string}")
+                    self.dns_statistics_csv_writer.write_error(
+                        dns_type='request', client_address=client_address, error_message=message)
                     pass
                     continue
                 except Exception:
                     message = "Unknown Exception: to receive DNS request"
                     print_api(
                         message, logger=self.logger, logger_method='critical', traceback_string=True)
-                    self.logger.info("==========")
                     pass
                     continue
 
@@ -297,26 +401,18 @@ class DnsServer:
                     # "dns_object.q.qname" returns only the questioned domain with "." (dot) in the end,
                     # which needs to be removed.
                     question_domain: str = str(dns_object.q.qname)[:-1]
-                    self.dns_full_logger.info(f"QCLASS: {qclass_string}")
-                    self.dns_full_logger.info(f"QTYPE: {qtype_string}")
-                    self.dns_full_logger.info(f"Question Domain: {question_domain}")
+                    self.dns_statistics_csv_writer.write_row(client_address=client_address, dns_request=dns_object)
 
                     message = (f"Received DNS request: {question_domain} | {qclass_string} | {qtype_string} |   "
                                f"From: {client_address}.")
                     self.logger.info(message)
-                    self.dns_full_logger.info(message)
-
-                    self.dns_full_logger.info("--")
 
                     # Nullifying the DNS cache for current request before check.
                     dns_cached_request = False
                     # Check if the received data request from client is already in the cache
                     if client_data in self.dns_questions_to_answers_cache:
-                        message = "!!! Question / Answer is already in the dictionary..."
+                        # message = "!!! Question / Answer is already in the dictionary..."
                         # self.logger.info(message)
-                        self.dns_full_logger.info(message)
-
-                        self.dns_full_logger.info("--")
 
                         # Get the response from the cached answers list
                         dns_response = self.dns_questions_to_answers_cache[client_data]
@@ -395,7 +491,6 @@ class DnsServer:
                                         message = f"!!! Question / Answer is in offline mode returning " \
                                                   f"{self.offline_route_ipv6}."
                                         self.logger.info(message)
-                                        self.dns_full_logger.info(message)
 
                                     # SRV Record type explanation:
                                     # https://www.cloudflare.com/learning/dns/dns-records/dns-srv-record/
@@ -412,7 +507,6 @@ class DnsServer:
                                         message = f"!!! Question / Answer is in offline mode returning: " \
                                                   f"{self.offline_srv_answer}."
                                         self.logger.info(message)
-                                        self.dns_full_logger.info(message)
                                     elif qtype_string == "ANY":
                                         dns_built_response.add_answer(
                                             *RR.fromZone(question_domain + " " + str(self.response_ttl) + " CNAME " +
@@ -422,7 +516,6 @@ class DnsServer:
                                         message = f"!!! Question / Answer is in offline mode returning " \
                                                   f"{self.offline_route_domain}."
                                         self.logger.info(message)
-                                        self.dns_full_logger.info(message)
                                     else:
                                         dns_built_response.add_answer(
                                             *RR.fromZone(
@@ -433,7 +526,6 @@ class DnsServer:
                                         message = f"!!! Question / Answer is in offline mode returning " \
                                                   f"{self.offline_route_ipv4}."
                                         self.logger.info(message)
-                                        self.dns_full_logger.info(message)
                                 # Values error means in most cases that you create wrong response
                                 # for specific type of request.
                                 except ValueError:
@@ -450,18 +542,14 @@ class DnsServer:
                                 except Exception:
                                     message = \
                                         (f"Unknown exception while creating response for QTYPE: {qtype_string}. "
-                                         f"Response: ")
+                                         f"Response: \n{dns_built_response}")
                                     print_api(message, logger=self.logger, logger_method='critical',
                                               traceback_string=True)
-                                    print_api(f"{dns_built_response}", logger=self.logger, logger_method='critical',
-                                              traceback_string=True)
                                     # Pass the exception.
                                     pass
                                     # Continue to the next DNS request, since there's nothing to do here right now.
                                     continue
 
-                                self.dns_full_logger.info("--")
-
                                 # Encode the response that was built above to legit DNS Response
                                 dns_response = dns_built_response.pack()
                             # If we're in online mode
@@ -476,7 +564,7 @@ class DnsServer:
                                     # Since, it's probably going to succeed.
                                     if counter > 0:
                                         self.logger.info(f"Retry #: {counter}/{self.dns_service_retries}")
-                                    self.dns_full_logger.info(
+                                    self.logger.info(
                                         f"Forwarding request. Creating UDP socket to: "
                                         f"{self.forwarding_dns_service_ipv4}:"
                                         f"{self.forwarding_dns_service_port}")
@@ -486,7 +574,7 @@ class DnsServer:
 
                                         message = "Socket created, Forwarding..."
                                         # self.logger.info(message)
-                                        self.dns_full_logger.info(message)
+                                        self.logger.info(message)
 
                                         google_dns_ipv4_socket.sendto(client_data, (
                                             self.forwarding_dns_service_ipv4,
@@ -495,7 +583,7 @@ class DnsServer:
                                         # The script needs to wait a second or receive can hang
                                         message = "Request sent to the forwarding DNS, Receiving the answer..."
                                         # self.logger.info(message)
-                                        self.dns_full_logger.info(message)
+                                        self.logger.info(message)
 
                                         dns_response, google_address = \
                                             google_dns_ipv4_socket.recvfrom(self.buffer_size_receive)
@@ -516,7 +604,6 @@ class DnsServer:
                                                 f"Couldn't forward DNS request to: "
                                                 f"[{self.forwarding_dns_service_ipv4}]. "
                                                 f"Continuing to next request.")
-                                            self.dns_full_logger.info("==========")
 
                                         # From here continue to the next iteration of While loop.
                                         continue
@@ -529,12 +616,12 @@ class DnsServer:
                                 if retried:
                                     continue
 
-                                self.dns_full_logger.info(
+                                self.logger.info(
                                     f"Answer received from: {self.forwarding_dns_service_ipv4}")
 
                                 # Closing the socket to forwarding service
                                 google_dns_ipv4_socket.close()
-                                self.dns_full_logger.info("Closed socket to forwarding service")
+                                self.logger.info("Closed socket to forwarding service")
 
                                 # Appending current DNS Request and DNS Answer to the Cache
                                 self.dns_questions_to_answers_cache.update({client_data: dns_response})
@@ -542,14 +629,15 @@ class DnsServer:
                     # If 'forward_to_tcp_server' it means that we built the response, and we don't need to reparse it,
                     # since we already have all the data.
                     if forward_to_tcp_server:
-                        self.dns_full_logger.info(f"Response IP: {dns_built_response.short()}")
-                        self.logger.info(f"Response {dns_built_response.short()}")
+                        # self.logger.info(f"Response {dns_built_response.short()}")
+                        self.dns_statistics_csv_writer.write_row(
+                            client_address=client_address, dns_response=dns_built_response)
 
                         message = f"Response Details: {dns_built_response.rr}"
-                        print_api(message, logger=self.dns_full_logger, logger_method='info', oneline=True)
+                        print_api(message, logger=self.logger, logger_method='info', oneline=True)
 
-                        message = f"Response Full Details: {dns_built_response.format(prefix='', sort=True)}"
-                        print_api(message, logger=self.dns_full_logger, logger_method='info', oneline=True)
+                        # message = f"Response Full Details: {dns_built_response.format(prefix='', sort=True)}"
+                        # print_api(message, logger=self.logger, logger_method='info', oneline=True)
 
                         # Now we can turn it to false, so it won't trigger this
                         # condition next time if the response was not built
@@ -569,20 +657,23 @@ class DnsServer:
                         if dns_response_parsed.rr:
                             for rr in dns_response_parsed.rr:
                                 if isinstance(rr.rdata, A):
-                                    self.dns_full_logger.info(f"Response IP: {rr.rdata}")
+                                    self.dns_statistics_csv_writer.write_row(
+                                        client_address=client_address, dns_response=dns_response_parsed)
+
+                                    self.logger.info(f"Response IP: {rr.rdata}")
 
                                     # Adding the address to the list as 'str' object and not 'dnslib.dns.A'.
                                     ipv4_addresses.append(str(rr.rdata))
 
-                        message = f"Response Details: {dns_response_parsed.rr}"
-                        print_api(message, logger=self.dns_full_logger, logger_method='info', oneline=True)
-
-                        message = f"Response Full Details: {dns_response_parsed}"
-                        print_api(message, logger=self.dns_full_logger, logger_method='info', oneline=True)
+                        # message = f"Response Details: {dns_response_parsed.rr}"
+                        # print_api(message, logger=self.dns_statistics_csv_writer, logger_method='info', oneline=True)
+                        #
+                        # message = f"Response Full Details: {dns_response_parsed}"
+                        # print_api(message, logger=self.dns_statistics_csv_writer, logger_method='info', oneline=True)
 
-                    self.dns_full_logger.info("Sending DNS response back to client...")
+                    self.logger.info("Sending DNS response back to client...")
                     main_socket_object.sendto(dns_response, client_address)
-                    self.dns_full_logger.info("DNS Response sent...")
+                    self.logger.info("DNS Response sent...")
 
                     # 'ipv4_addresses' list contains entries of type 'dnslib.dns.A' and not string.
                     # We'll convert each entry to string, so strings can be searched in this list.
@@ -661,9 +752,9 @@ class DnsServer:
                                 ) as output_file:
                                     output_file.write(record_string_line)
 
-                                self.dns_full_logger.info(
-                                    f"Saved new known domains file: "
-                                    f"{self.log_directory_path}{os.sep}{self.known_domains_filename}")
+                                # self.logger.info(
+                                #     f"Saved new known domains file: "
+                                #     f"{self.log_directory_path}{os.sep}{self.known_domains_filename}")
 
                     # Known domain list managements EOF
                     # ==================================================================================================
@@ -720,9 +811,9 @@ class DnsServer:
                                     ) as output_file:
                                         output_file.write(record_string_line)
 
-                                    self.dns_full_logger.info(
-                                        f"Saved new known IPv4 addresses file: "
-                                        f"{self.log_directory_path}{os.sep}{self.known_ipv4_filename}")
+                                    # self.logger.info(
+                                    #     f"Saved new known IPv4 addresses file: "
+                                    #     f"{self.log_directory_path}{os.sep}{self.known_ipv4_filename}")
 
                     # Known IPv4 address to domains list management EOF
                     # ==================================================================================================
@@ -743,7 +834,7 @@ class DnsServer:
                     # EOF Writing IPs by time.
                     # ==================================================================================================
 
-                    self.dns_full_logger.info("==========")
+                    # self.logger.info("==========")
                 except Exception:
                     message = "Unknown Exception: to parse DNS request"
                     print_api(

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -5,6 +5,7 @@ from pathlib import Path
 
 from ..psutilw import networks
 from ..certauthw import certauthw
+from ..loggingw import loggingw
 from ...script_as_string_processor import ScriptAsStringProcessor
 from ...permissions import permissions
 from ... import queues, filesystem, certificates
@@ -143,6 +144,7 @@ class SocketWrapper:
         :param ssh_pass: string, SSH password that will be used to connect to remote host.
         :param ssh_script_to_execute: string, script that will be executed to get the process name on ssh remote host.
         :param logger: logging.Logger object, logger object that will be used to log messages.
+            If not provided, logger will be created with default settings.
         :param statistics_logs_directory: string, path to directory where daily statistics.csv files will be stored.
             After you initialize the SocketWrapper object, you can get the statistics_writer object from it and use it
             to write statistics to the file in a worker thread.
@@ -219,6 +221,16 @@ class SocketWrapper:
         self.statistics_writer = statistics_csv.StatisticsCSVWriter(
             statistics_directory_path=self.statistics_logs_directory)
 
+        if not self.logger:
+            self.logger = loggingw.create_logger(
+                logger_name='SocketWrapper',
+                directory_path=self.statistics_logs_directory,
+                add_stream=True,
+                add_timedfile=True,
+                formatter_streamhandler='DEFAULT',
+                formatter_filehandler='DEFAULT'
+            )
+
         self.test_config()
 
     def test_config(self):

atomicshop/wrappers/socketw/statistics_csv.py

@@ -5,9 +5,9 @@ from ..loggingw import loggingw
 
 
 LOGGER_NAME: str = 'statistics'
-STATISTICS_HEADER: str = \
-    ('request_time_sent,tls,protocol,host,path,command,status_code,request_size_bytes,response_size_bytes,file_path,'
-     'process_cmd,error')
+STATISTICS_HEADER: str = (
+    'request_time_sent,tls,protocol,host,path,command,status_code,request_size_bytes,response_size_bytes,file_path,'
+    'process_cmd,error')
 
 
 class StatisticsCSVWriter:
@@ -19,8 +19,6 @@ class StatisticsCSVWriter:
             self,
             statistics_directory_path: str
     ):
-        self.statistics_directory_path = statistics_directory_path
-
         self.csv_logger = loggingw.create_logger(
             logger_name=LOGGER_NAME,
             directory_path=statistics_directory_path,

{atomicshop-2.16.24.dist-info → atomicshop-2.16.26.dist-info}/METADATA

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

{atomicshop-2.16.24.dist-info → atomicshop-2.16.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=CTmlCQGjYSV8TXiXGaZZB1S8I3hG61RNpEbQc104SF8,124
+atomicshop/__init__.py,sha256=joVK_ueWgYu4gbqtZdDb4rswSixoXOc-sNEsTq6qwqs,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
@@ -14,7 +14,7 @@ atomicshop/dns.py,sha256=J4yX6vCaRdL0McYWnlJ9arCDKW-yRui7Y5WyL5BoD6M,6391
 atomicshop/domains.py,sha256=Rxu6JhhMqFZRcoFs69IoEd1PtYca0lMCG6F1AomP7z4,3197
 atomicshop/emails.py,sha256=I0KyODQpIMEsNRi9YWSOL8EUPBiWyon3HRdIuSj3AEU,1410
 atomicshop/file_types.py,sha256=-0jzQMRlmU1AP9DARjk-HJm1tVE22E6ngP2mRblyEjY,763
-atomicshop/filesystem.py,sha256=XPrOjqxQRP3fa01QztDvuDUpiFjCYtpPUC0KhaGHxqs,60222
+atomicshop/filesystem.py,sha256=ZDRRikFSUMleaUQJqxJGI5oVVH3H5qa2zeDVkZqghUE,60309
 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
@@ -122,15 +122,15 @@ atomicshop/file_io/tomls.py,sha256=ol8EvQPf9sryTmZUf1v55BYSUQ6ml7HVVBHpNKbsIlA,9
 atomicshop/file_io/xlsxs.py,sha256=v_dyg9GD4LqgWi6wA1QuWRZ8zG4ZwB6Dz52ytdcmmmI,2184
 atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,2104
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/mitm/config_static.py,sha256=UNvRTb3ZuFVGZpF33fvaIf0xw_VGyml2ExIwqW_uYcg,7777
+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=rfullUfMRR5YUEI45KJdGXlbOGYF89GfPkhUBoHizhM,20297
 atomicshop/mitm/import_config.py,sha256=_nu8mgA-M4s6dZ8_QWx3x0aVb75upvsCuX_PIUg4X2w,8345
-atomicshop/mitm/initialize_engines.py,sha256=Od1vC1ZGls0BNZiPgoRQj8Mc44UO8INJj3w1p5YQw5A,8274
+atomicshop/mitm/initialize_engines.py,sha256=VyJE8QnzlgD3QbX5inz5o6rC3zQ3is9CeTL7-B10g1w,8292
 atomicshop/mitm/message.py,sha256=d_sm3O_aoZf87dDQP44xOMNEG-uZBN1ZecQgMCacbZs,1814
-atomicshop/mitm/mitm_main.py,sha256=gA8sV7hI107OnoeedCHpy8f3zcE4vAsBc44l_VTjVFo,21622
+atomicshop/mitm/mitm_main.py,sha256=yqVyyZvxqfu-lqsFmHGinXFGJ9TZ3ljGgJ-jU-wXJFk,21852
 atomicshop/mitm/recs_files.py,sha256=B8fSuvYXlh50LWfwLRw_bYswreTjmdZLuHJzbDC5Gss,2930
-atomicshop/mitm/shared_functions.py,sha256=hplm98tz8pgJ4WHUVI9sf_oVqUM2KJ1Y2pD6EFSb8P0,1879
+atomicshop/mitm/shared_functions.py,sha256=jjCDZVQCwQ8hf9QNMe3T8W3ISkfZo4Mm2HtXOJLZYgI,1999
 atomicshop/mitm/statistic_analyzer.py,sha256=mBmwEe68WAjnIskGndQTRldnsAsDHuaOW0O7UXlM3Pc,26702
 atomicshop/mitm/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/engines/create_module_template.py,sha256=tRjVSm1sD6FzML71Qbuwvita0qsusdFGm8NZLsZ-XMs,4853
@@ -296,7 +296,7 @@ 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=G3roqkj_gMRTkVs2kgwiQR9S7YqA-uQWraCt8FqKjlo,46375
+atomicshop/wrappers/socketw/dns_server.py,sha256=r1kWeKVoiqqNb_HpZdk0Pm3Xo-NGDkCs0_0DzMmtE8o,48954
 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
@@ -304,13 +304,13 @@ atomicshop/wrappers/socketw/sender.py,sha256=OcX1aeI2OBDPPfvQkiEcV4Ak22DSJVvjMGY
 atomicshop/wrappers/socketw/sni.py,sha256=fVwyh3h9IqfLMnf4__bMIzcF4c-Kk9mlbDWMRXKN-ow,17155
 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=M47tjC8SoXZJV2fC_OYmSNNTs-3-ZQcpaB1WmvqVCTU,33408
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=VQNvR68xj0RD_v1OL19tDZf4xRskZQjrVE6piHvRXR8,33896
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
-atomicshop/wrappers/socketw/statistics_csv.py,sha256=V_m1D0KpizQox3IEWp2AUcncwWy5kG25hbFrc-mBSJE,3029
+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.24.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.24.dist-info/METADATA,sha256=172BnmXPSDlG-AxPVViiY5xQNY2m7UqFq6DQ0ytD9zM,10473
-atomicshop-2.16.24.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.24.dist-info/RECORD,,
+atomicshop-2.16.26.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.26.dist-info/METADATA,sha256=B4rCAdBWrX5ocldHxSS8ijnIvauLJQ_de10bMYy-pto,10473
+atomicshop-2.16.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.26.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.26.dist-info/RECORD,,