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

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -16,7 +16,7 @@ from ..loggingw import loggingw
 from ...script_as_string_processor import ScriptAsStringProcessor
 from ...permissions import permissions
 from ... import filesystem, certificates
-from ...basics import booleans
+from ...basics import booleans, tracebacks
 from ...print_api import print_api
 
 from . import base, creator, get_process, accepter, statistics_csv, ssl_base, sni
@@ -500,6 +500,13 @@ class SocketWrapper:
         listening_sockets: list = [listening_socket_object]
 
         while True:
+            engine_name: str = ''
+            source_ip: str = ''
+            source_hostname: str = ''
+            dest_port: int = 0
+            process_name: str = ''
+            domain_from_engine: str = ''
+
             try:
                 # Using "select.select" which is currently the only API function that works on all
                 # operating system types: Windows / Linux / BSD.
@@ -510,7 +517,6 @@ class SocketWrapper:
 
                 listening_ip, listening_port = listening_socket_object.getsockname()
 
-                domain_from_engine = None
                 # Get the domain to connect on this process in case on no SNI provided.
                 for domain, ip_port_dict in self.engine.domain_target_dict.items():
                     if ip_port_dict['ip'] == listening_ip:
@@ -536,16 +542,27 @@ class SocketWrapper:
 
                 self.logger.info(f"Requested domain setting: {domain_from_engine}")
 
+                engine_name = get_engine_name(domain_from_engine, [self.engine])
+
                 # Wait from any connection on "accept()".
                 # 'client_socket' is socket or ssl socket, 'client_address' is a tuple (ip_address, port).
                 client_socket, client_address, accept_error_message = accepter.accept_connection_with_error(
                     listening_socket_object, domain_from_dns_server=domain_from_engine,
                     print_kwargs={'logger': self.logger})
 
+                source_ip: str = client_address[0]
+                dest_port: int = listening_socket_object.getsockname()[1]
+
+                # Not always there will be a hostname resolved by the IP address, so we will leave it empty if it fails.
+                try:
+                    source_hostname = socket.gethostbyaddr(source_ip)[0]
+                    source_hostname = source_hostname.lower()
+                except socket.herror:
+                    pass
+
                 # This is the earliest stage to ask for process name.
                 # SSH Remote / LOCALHOST script execution to identify process section.
                 # If 'get_process_name' was set to True, then this will be executed.
-                process_name = None
                 if self.get_process_name:
                     # Get the process name from the socket.
                     get_command_instance = get_process.GetCommandLine(
@@ -556,35 +573,13 @@ class SocketWrapper:
                         logger=self.logger)
                     process_name = get_command_instance.get_process_name(print_kwargs={'logger': self.logger})
 
-                source_ip: str = client_address[0]
-                engine_name: str = get_engine_name(domain_from_engine, [self.engine])
-                dest_port: int = listening_socket_object.getsockname()[1]
-
-                # Not always there will be a hostname resolved by the IP address, so we will leave it empty if it fails.
-                try:
-                    source_hostname: str = socket.gethostbyaddr(source_ip)[0]
-                except socket.herror:
-                    source_hostname = ''
-
                 # If 'accept()' function worked well, SSL worked well, then 'client_socket' won't be empty.
                 if client_socket:
                     # Get the protocol type from the socket.
                     is_tls: bool = False
 
                     time.sleep(1)  # Wait a second to gather some data.
-                    try:
-                        tls_properties = ssl_base.is_tls(client_socket)
-                    except ConnectionResetError as e:
-                        self.statistics_writer.write_accept_error(
-                            engine=engine_name,
-                            source_host=source_hostname,
-                            source_ip=source_ip,
-                            error_message=str(e),
-                            dest_port=str(dest_port),
-                            host=domain_from_engine,
-                            process_name=process_name)
-
-                        continue
+                    tls_properties = ssl_base.is_tls(client_socket)
 
                     if tls_properties:
                         is_tls = True
@@ -698,9 +693,22 @@ class SocketWrapper:
                         dest_port=str(dest_port),
                         host=domain_from_engine,
                         process_name=process_name)
+            except ConnectionResetError as e:
+                exception_string: str = tracebacks.get_as_string()
+                full_string: str = f"{str(e)} | {exception_string}"
+                self.statistics_writer.write_accept_error(
+                    engine=engine_name,
+                    source_host=source_hostname,
+                    source_ip=source_ip,
+                    error_message=full_string,
+                    dest_port=str(dest_port),
+                    host=domain_from_engine,
+                    process_name=process_name)
             except Exception as e:
-
-                self.exceptions_logger.write(e)
+                _ = e
+                exception_string: str = tracebacks.get_as_string()
+                full_string: str = f"Engine: [{engine_name}] | {exception_string}"
+                self.exceptions_logger.write(full_string)
 
 
 def before_socket_thread_worker(

{atomicshop-3.3.24.dist-info → atomicshop-3.3.26.dist-info}/METADATA

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

{atomicshop-3.3.24.dist-info → atomicshop-3.3.26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=BNlDCkYh5Y719V4A5KzdBQCz8nL2MOid4wXu4pqzNw8,123
+atomicshop/__init__.py,sha256=4EgJYd49JARUMQEP9YUXR0MGaFjopGdy25l3D73gEiM,123
 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
@@ -308,14 +308,14 @@ atomicshop/wrappers/socketw/sender.py,sha256=aX_K8l_rHjd5AWb8bi5mt8-YTkMYVRDB6Dn
 atomicshop/wrappers/socketw/sni.py,sha256=uj6KKYKmSrzXcKBhVLaHQhYn1wNfIUpdnmcvn21V9iE,18176
 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=YZG15mhldOKeTqGOJ0J5YUrT6ZjDczk3zkmz-qNyRL8,42277
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=GZyDzuc9Snm3qthl9gkGB9_Yb4p_Egp0sMtaivQ2xuo,42654
 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.3.24.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.3.24.dist-info/METADATA,sha256=fb1OsnGbWGATd0fNLjhFrbzs_N-FLryohFjpdsl27QU,9318
-atomicshop-3.3.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-atomicshop-3.3.24.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.3.24.dist-info/RECORD,,
+atomicshop-3.3.26.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.26.dist-info/METADATA,sha256=IvU66yRmy4iNKUf6PLOdThdn4s6XZ7qEHfWO5sH5FE8,9318
+atomicshop-3.3.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.26.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.26.dist-info/RECORD,,