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

atomicshop/mitm/mitm_main.py

@@ -502,6 +502,8 @@ def mitm_server(config_file_path: str, script_version: str):
                 exceptions_logger_queue=EXCEPTIONS_CSV_LOGGER_QUEUE,
                 forwarding_dns_service_ipv4_list___only_for_localhost=[config_static.DNSServer.forwarding_dns_service_ipv4],
                 skip_extension_id_list=config_static.SkipExtensions.SKIP_EXTENSION_ID_LIST,
+                enable_sslkeylogfile_env_to_client_ssl_context=config_static.Certificates.enable_sslkeylogfile_env_to_client_ssl_context,
+                sslkeylog_file_path=config_static.Certificates.sslkeylog_file_path,
                 print_kwargs=dict(stdout=False)
             )
 

atomicshop/wrappers/socketw/certificator.py

@@ -30,7 +30,9 @@ class Certificator:
             custom_private_key_path: str,
             forwarding_dns_service_ipv4_list___only_for_localhost: list,
             skip_extension_id_list: list,
-            tls: bool
+            tls: bool,
+            enable_sslkeylogfile_env_to_client_ssl_context: bool,
+            sslkeylog_file_path: str
     ):
         self.ca_certificate_name = ca_certificate_name
         self.ca_certificate_filepath = ca_certificate_filepath
@@ -49,6 +51,9 @@ class Certificator:
             forwarding_dns_service_ipv4_list___only_for_localhost)
         self.skip_extension_id_list = skip_extension_id_list
         self.tls = tls
+        self.enable_sslkeylogfile_env_to_client_ssl_context: bool = (
+            enable_sslkeylogfile_env_to_client_ssl_context)
+        self.sslkeylog_file_path: str = sslkeylog_file_path
 
         # noinspection PyTypeChecker
         self.certauth_wrapper: CertAuthWrapper = None
@@ -221,5 +226,10 @@ class Certificator:
 
         # You need to build new context and exchange the context that being inherited from the main socket,
         # or else the context will receive previous certificate each time.
-        sni_received_parameters.ssl_socket.context = \
-            creator.create_server_ssl_context___load_certificate_and_key(sni_server_certificate_file_path, None)
+        sni_received_parameters.ssl_socket.context = (
+            creator.create_server_ssl_context___load_certificate_and_key(
+                certificate_file_path=sni_server_certificate_file_path, key_file_path=None,
+                enable_sslkeylogfile_env_to_client_ssl_context=self.enable_sslkeylogfile_env_to_client_ssl_context,
+                sslkeylog_file_path=self.sslkeylog_file_path
+            )
+        )

atomicshop/wrappers/socketw/creator.py

@@ -25,7 +25,15 @@ def add_reusable_address_option(socket_instance):
     socket_instance.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 
 
-def create_ssl_context_for_server(allow_legacy=False) -> ssl.SSLContext:
+def create_ssl_context_for_server(
+        enable_sslkeylogfile_env_to_client_ssl_context: bool = False,
+        sslkeylog_file_path: str = None,
+        allow_legacy: bool = False
+) -> ssl.SSLContext:
+    """
+    This function creates the SSL context for the server.
+    Meaning that your script will act like a server, and the client will connect to it.
+    """
     # Creating context with SSL certificate and the private key before the socket
     # https://docs.python.org/3/library/ssl.html
     # Creating context for SSL wrapper, specifying "PROTOCOL_TLS_SERVER" will pick the best TLS version protocol for
@@ -48,6 +56,14 @@ def create_ssl_context_for_server(allow_legacy=False) -> ssl.SSLContext:
     ssl_context.verify_mode = ssl.CERT_NONE
     ssl_context.check_hostname = False
 
+    if enable_sslkeylogfile_env_to_client_ssl_context:
+        if sslkeylog_file_path is None:
+            sslkeylog_file_path = os.environ.get('SSLKEYLOGFILE')
+
+        if not os.path.exists(sslkeylog_file_path):
+            open(sslkeylog_file_path, "a").close()
+            ssl_context.keylog_filename = sslkeylog_file_path
+
     # If you must support old clients that only offer TLS_RSA_* suites under OpenSSL 3:
     if allow_legacy:
         # This enables RSA key exchange and other legacy bits at security level 1
@@ -64,6 +80,7 @@ def create_ssl_context_for_client(
 ) -> ssl.SSLContext:
     """
     This function creates the SSL context for the client.
+    This means that your script will act like a client, and will connect to a server.
     The SSL context is created with the "PROTOCOL_TLS_CLIENT" protocol.
 
     :param enable_sslkeylogfile_env_to_client_ssl_context: boolean, enables the SSLKEYLOGFILE environment variable
@@ -83,9 +100,9 @@ def create_ssl_context_for_client(
         if sslkeylog_file_path is None:
             sslkeylog_file_path = os.environ.get('SSLKEYLOGFILE')
 
-        # This will create the file if it doesn't exist
-        open(sslkeylog_file_path, "a").close()
-        ssl_context.keylog_filename = sslkeylog_file_path
+        if not os.path.exists(sslkeylog_file_path):
+            open(sslkeylog_file_path, "a").close()
+            ssl_context.keylog_filename = sslkeylog_file_path
 
     current_ciphers = 'AES256-GCM-SHA384:' + ssl._DEFAULT_CIPHERS
     ssl_context.set_ciphers(current_ciphers)
@@ -191,10 +208,14 @@ def copy_server_ctx_settings(src: ssl.SSLContext, dst: ssl.SSLContext) -> None:
 def create_server_ssl_context___load_certificate_and_key(
         certificate_file_path: str,
         key_file_path: str | None,
-        inherit_from: ssl.SSLContext | None = None
+        inherit_from: ssl.SSLContext | None = None,
+        enable_sslkeylogfile_env_to_client_ssl_context: bool = False,
+        sslkeylog_file_path: str = None,
 ) -> ssl.SSLContext:
     # Create and set ssl context for server.
-    ssl_context: ssl.SSLContext = create_ssl_context_for_server(True)
+    ssl_context: ssl.SSLContext = create_ssl_context_for_server(
+        allow_legacy=True, enable_sslkeylogfile_env_to_client_ssl_context=enable_sslkeylogfile_env_to_client_ssl_context,
+        sslkeylog_file_path=sslkeylog_file_path)
 
     # If you replaced contexts during SNI, copy policy from the old one
     if inherit_from is not None:

atomicshop/wrappers/socketw/sni.py

@@ -47,7 +47,9 @@ class SNISetup:
             tls: bool,
             domain_from_dns_server: str = None,
             skip_extension_id_list: list = None,
-            exceptions_logger: loggingw.ExceptionCsvLogger = None
+            exceptions_logger: loggingw.ExceptionCsvLogger = None,
+            enable_sslkeylogfile_env_to_client_ssl_context: bool = False,
+            sslkeylog_file_path: str = None
     ):
         self.ca_certificate_name = ca_certificate_name
         self.ca_certificate_filepath = ca_certificate_filepath
@@ -74,6 +76,8 @@ class SNISetup:
         self.tls = tls
         self.exceptions_logger = exceptions_logger
         self.certificator_instance = None
+        self.enable_sslkeylogfile_env_to_client_ssl_context: bool = enable_sslkeylogfile_env_to_client_ssl_context
+        self.sslkeylog_file_path: str = sslkeylog_file_path
 
     def wrap_socket_with_ssl_context_server_sni_extended(
             self,
@@ -82,7 +86,7 @@ class SNISetup:
     ):
 
         # Create SSL Socket to wrap the raw socket with.
-        ssl_context: ssl.SSLContext = creator.create_ssl_context_for_server(True)
+        ssl_context: ssl.SSLContext = creator.create_ssl_context_for_server(allow_legacy=True)
 
         self.certificator_instance = certificator.Certificator(
             ca_certificate_name=self.ca_certificate_name,
@@ -101,7 +105,9 @@ class SNISetup:
             forwarding_dns_service_ipv4_list___only_for_localhost=(
                 self.forwarding_dns_service_ipv4_list___only_for_localhost),
             skip_extension_id_list=self.skip_extension_id_list,
-            tls=self.tls
+            tls=self.tls,
+            enable_sslkeylogfile_env_to_client_ssl_context=self.enable_sslkeylogfile_env_to_client_ssl_context,
+            sslkeylog_file_path=self.sslkeylog_file_path
         )
 
         # Add SNI callback function to the SSL context.
@@ -160,7 +166,10 @@ class SNISetup:
                 certificator_instance=self.certificator_instance,
                 domain_from_dns_server=self.domain_from_dns_server,
                 default_certificate_domain_list=self.default_certificate_domain_list,
-                exceptions_logger=self.exceptions_logger            )
+                exceptions_logger=self.exceptions_logger,
+                enable_sslkeylogfile_env_to_client_ssl_context=(
+                    self.certificator_instance.enable_sslkeylogfile_env_to_client_ssl_context),
+                sslkeylog_file_path=self.certificator_instance.sslkeylog_file_path)
             ssl_context.set_servername_callback(
                 sni_handler_instance.setup_sni_callback(print_kwargs=print_kwargs))
 
@@ -178,7 +187,9 @@ class SNIHandler:
             certificator_instance: certificator.Certificator,
             domain_from_dns_server: str,
             default_certificate_domain_list: list,
-            exceptions_logger: loggingw.ExceptionCsvLogger
+            exceptions_logger: loggingw.ExceptionCsvLogger,
+            enable_sslkeylogfile_env_to_client_ssl_context: bool,
+            sslkeylog_file_path: str
     ):
         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
@@ -187,6 +198,8 @@ class SNIHandler:
         self.domain_from_dns_server: str = domain_from_dns_server
         self.default_certificate_domain_list = default_certificate_domain_list
         self.exceptions_logger = exceptions_logger
+        self.enable_sslkeylogfile_env_to_client_ssl_context: bool = enable_sslkeylogfile_env_to_client_ssl_context
+        self.sslkeylog_file_path: str = sslkeylog_file_path
 
         # noinspection PyTypeChecker
         self.sni_received_parameters: SNIReceivedParameters = None
@@ -325,7 +338,9 @@ class SNIHandler:
                     creator.create_server_ssl_context___load_certificate_and_key(
                         default_server_certificate_path,
                         None,
-                        inherit_from=self.sni_received_parameters.ssl_socket.context
+                        inherit_from=self.sni_received_parameters.ssl_socket.context,
+                        enable_sslkeylogfile_env_to_client_ssl_context=self.enable_sslkeylogfile_env_to_client_ssl_context,
+                        sslkeylog_file_path=self.sslkeylog_file_path
                     )
                 )
             else:

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -1,6 +1,5 @@
 import multiprocessing
 import threading
-import time
 
 import select
 from typing import Literal, Union, Callable, Any
@@ -80,6 +79,8 @@ class SocketWrapper:
             statistics_logger_queue: multiprocessing.Queue = None,
             exceptions_logger_name: str = 'SocketWrapperExceptions',
             exceptions_logger_queue: multiprocessing.Queue = None,
+            enable_sslkeylogfile_env_to_client_ssl_context: bool = False,
+            sslkeylog_file_path: str = None,
             print_kwargs: dict = None,
     ):
         """
@@ -173,6 +174,12 @@ class SocketWrapper:
         :param exceptions_logger_name: string, name of the logger that will be used to log exceptions.
         :param exceptions_logger_queue: multiprocessing.Queue, queue that will be used to log exceptions in
             multiprocessing. You need to start the logger listener in the main process to handle the queue.
+        :param enable_sslkeylogfile_env_to_client_ssl_context: boolean, if True, each client SSL context
+            that will be created by the SocketWrapper will have save the SSL handshake keys to the file
+            defined in 'sslkeylog_file_path' parameter.
+        :param sslkeylog_file_path: string, path to file where SSL handshake keys will be saved.
+            If not provided and 'enable_sslkeylogfile_env_to_client_ssl_context' is True, then
+            the environment variable 'SSLKEYLOGFILE' will be used.
         :param print_kwargs: dict, additional arguments to pass to the print function.
         """
 
@@ -208,6 +215,9 @@ class SocketWrapper:
         self.ssh_script_to_execute = ssh_script_to_execute
         self.forwarding_dns_service_ipv4_list___only_for_localhost = (
             forwarding_dns_service_ipv4_list___only_for_localhost)
+        self.enable_sslkeylogfile_env_to_client_ssl_context: bool = (
+            enable_sslkeylogfile_env_to_client_ssl_context)
+        self.sslkeylog_file_path: str = sslkeylog_file_path
         self.print_kwargs: dict = print_kwargs
 
         self.socket_object = None
@@ -616,7 +626,9 @@ class SocketWrapper:
                             forwarding_dns_service_ipv4_list___only_for_localhost=(
                                 self.forwarding_dns_service_ipv4_list___only_for_localhost),
                             tls=is_tls,
-                            exceptions_logger=self.exceptions_logger
+                            exceptions_logger=self.exceptions_logger,
+                            enable_sslkeylogfile_env_to_client_ssl_context=self.enable_sslkeylogfile_env_to_client_ssl_context,
+                            sslkeylog_file_path=self.sslkeylog_file_path
                         )
 
                         ssl_client_socket, accept_error_message = \

{atomicshop-3.4.0.dist-info → atomicshop-3.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atomicshop
-Version: 3.4.0
+Version: 3.4.1
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License-Expression: MIT

{atomicshop-3.4.0.dist-info → atomicshop-3.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=ixOmnAbr1hvPV-ANWmylWbdUrobDsVq3iPHZfp7dYM4,122
+atomicshop/__init__.py,sha256=2_vm_IGYQueXrDSwBdgjXn7kHxyeKqTdQmDo1JOD4_0,122
 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
@@ -130,7 +130,7 @@ atomicshop/mitm/connection_thread_worker.py,sha256=NPHizpPJOaYjP05EEGxEOOKHhgbe4
 atomicshop/mitm/import_config.py,sha256=7aLfKqflc3ZnzKc2_Y4T0eenzQpKG94M0r-PaVwF99M,18881
 atomicshop/mitm/initialize_engines.py,sha256=qzz5jzh_lKC03bI1w5ebngVXo1K-RV3poAyW-nObyqo,11042
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
-atomicshop/mitm/mitm_main.py,sha256=vjdK18ix3oH3thTgCi5qlAL13Bw_PgHaLGH2D9xic8w,40229
+atomicshop/mitm/mitm_main.py,sha256=i0YcLDKAYH1aUS_Rf7IbwXiSQzndsdOY_JuYTvTiTN8,40453
 atomicshop/mitm/recs_files.py,sha256=tv8XFhYZMkBv4DauvpiAdPgvSo0Bcm1CghnmwO7dx8M,5018
 atomicshop/mitm/shared_functions.py,sha256=0lzeyINd44sVEfFbahJxQmz6KAMWbYrW5ou3UYfItvw,1777
 atomicshop/mitm/statistic_analyzer.py,sha256=EC9g21ocOsFzNfntV-nZHSGtrS1-Kxb0QDSGWS5FuNA,28942
@@ -298,24 +298,24 @@ atomicshop/wrappers/pywin32w/wmis/wmi_helpers.py,sha256=Ng5pbWeQBNcPqfFuxHEIdkIU
 atomicshop/wrappers/socketw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/socketw/accepter.py,sha256=4I9ORugRDvwaqSzm_gWSjZnRwQGY8hDTlCdsYHwH_ZE,2377
 atomicshop/wrappers/socketw/base.py,sha256=EcosGkD8VzgBY3GeIHDSG29ThQfXwg3-GQPmBTAqTdw,3048
-atomicshop/wrappers/socketw/certificator.py,sha256=mtWPJ_ew3OSwt0-1W4jaoco1VIY4NRCrMv3mDUxb_Cc,12418
-atomicshop/wrappers/socketw/creator.py,sha256=hHq8frKQtqZ1-Xfdm2kAsxqtsLFxXKDNwgGKdVKV6yg,16192
+atomicshop/wrappers/socketw/certificator.py,sha256=mA78HXg6j_WKQ7D26Ue66QKA9y1Iu-EWsnc6cI6RC8w,12976
+atomicshop/wrappers/socketw/creator.py,sha256=-Xnc59CLHfBEmncwjIhyHBG-p07uNeSxTzr2S1LW7a4,17200
 atomicshop/wrappers/socketw/dns_server.py,sha256=UHq1a3NVdOrclEOOQIe-wNtIgbF8DFeNXsobvtoM1U8,55961
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=_p98OdOaKYSMqJ23pHLXBUA7NkbVmpgqcSJAdWr6wwc,7560
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=9B3MvcDqr4C3x2fsnjG5SQognd1wRqsBgikxZa0wXG8,8243
 atomicshop/wrappers/socketw/sender.py,sha256=5ecHUlz4Sxt4oWevBFfy33jQLRXmmVLOF34njfvSbxY,4801
-atomicshop/wrappers/socketw/sni.py,sha256=uj6KKYKmSrzXcKBhVLaHQhYn1wNfIUpdnmcvn21V9iE,18176
+atomicshop/wrappers/socketw/sni.py,sha256=XlTmNIdJYjW_hkF9eCXu7GdhSJYJvKDmTiPrLV1-TdQ,19374
 atomicshop/wrappers/socketw/socket_client.py,sha256=WWIiCxUX9irN9aWzJ6-1xrXNB_iv_diq3ha1yrWsNGU,22671
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
-atomicshop/wrappers/socketw/socket_wrapper.py,sha256=abvs3Jb7PZ6H5il0Yto6gCLkwY5tD40f0GYOzZVb8ng,42581
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=KdwZvATt7iEC2R0to9jcE0kBtG1cjcZwmF_cMn5fFms,43616
 atomicshop/wrappers/socketw/ssl_base.py,sha256=62-hPm7zla1rh3m_WvDnXqKH-sDUTdiRptD8STCkgdk,2313
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=_gA8bMX6Sw_UCXKi2y9wNAwlqifgExgDGfQIa9pFxQA,5543
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.4.0.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.4.0.dist-info/METADATA,sha256=7L3q8e0dAu6OukGb_M71h6kx-aLtHEr7E710wUkSUpI,9317
-atomicshop-3.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.4.0.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.4.0.dist-info/RECORD,,
+atomicshop-3.4.1.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.4.1.dist-info/METADATA,sha256=H6vq6tDZmmoszao5uweXIMSDyVq0QhP4_-cJ4Ow_PDk,9317
+atomicshop-3.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.4.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.4.1.dist-info/RECORD,,