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

atomicshop/mitm/mitm_main.py

@@ -5,6 +5,7 @@ import datetime
 import os
 import sys
 import logging
+import signal
 
 import atomicshop   # Importing atomicshop package to get the version of the package.
 
@@ -95,6 +96,10 @@ except win_console.NotWindowsConsoleError:
     pass
 
 
+def _graceful_shutdown(signum, frame):
+    exit_cleanup()
+
+
 def exit_cleanup():
     if config_static.ENGINES_LIST[0].is_localhost:
         if permissions.is_admin() and IS_SET_DNS_GATEWAY:
@@ -768,6 +773,8 @@ def _loop_at_midnight_recs_archive(network_logger_name):
 
 
 def mitm_server_main(config_file_path: str, script_version: str):
+    signal.signal(signal.SIGINT, _graceful_shutdown)
+
     try:
         # Main function should return integer with error code, 0 is successful.
         return mitm_server(config_file_path, script_version)

atomicshop/ssh_remote.py

@@ -1,6 +1,5 @@
 import sys
 import base64
-import socket
 import logging
 from pathlib import Path
 
@@ -138,43 +137,6 @@ class SSHRemote:
     def close(self):
         self.ssh_client.close()
 
-    def exec_command_with_error_handling(self, script_string: str):
-        # Defining variables.
-        stdin = None
-        stdout = None
-        stderr = None
-        result_exception = None
-
-        # Don't put debugging break point over the next line in PyCharm. For some reason it gets stuck.
-        # Put the point right after that.
-        try:
-            stdin, stdout, stderr = self.ssh_client.exec_command(command=script_string, timeout=30)
-        except AttributeError as function_exception_object:
-            if function_exception_object.name == "open_session":
-                result_exception = "'SSHRemote().connect' wasn't executed."
-                print_api(result_exception, logger=self.logger, logger_method='error', traceback_string=True)
-
-                # Since getting Process name is not the main feature of the server, we can pass the exception
-                pass
-            else:
-                result_exception = f"Couldn't execute script over SSH. Unknown yet exception with 'AttributeError' " \
-                                   f"and name: {function_exception_object.name}"
-                print_api(result_exception, logger=self.logger, logger_method='error', traceback_string=True)
-                # Since getting Process name is not the main feature of the server, we can pass the exception
-                pass
-        except socket.error:
-            result_exception = "Couldn't execute script over SSH. SSH socket closed."
-            print_api(result_exception, logger=self.logger, logger_method='error', traceback_string=True)
-            # Since getting Process name is not the main feature of the server, we can pass the exception
-            pass
-        except Exception:
-            result_exception = "Couldn't execute script over SSH. Unknown yet exception."
-            print_api(result_exception, logger=self.logger, logger_method='error', traceback_string=True)
-            # Since getting Process name is not the main feature of the server, we can pass the exception
-            pass
-
-        return stdin, stdout, stderr, result_exception
-
     @staticmethod
     def check_console_output_for_errors(console_output_string: str):
         # Defining variables.
@@ -192,52 +154,33 @@ class SSHRemote:
 
         return function_result
 
-    def remote_execution(self, script_string: str):
-        # Defining variables.
-        output_lines = None
-        function_error = None
-        stdin = None
-        stdout = None
-        stderr = None
-        exec_exception = None
+    def remote_execution(self, script_string: str) -> tuple[str, str]:
+        output_result: str = str()
+        error_result: str = str()
 
         # Execute the command over SSH remotely.
-        stdin, stdout, stderr, exec_exception = self.exec_command_with_error_handling(script_string)
-        # If exception was returned from execution.
-        if exec_exception:
-            self.logger.info("Trying to reconnect over SSH.")
-            # Close existing SSH Connection.
-            self.close()
-            # And connect again.
-            self.connect()
-            self.logger.info("Reconnected. Trying to send the command one more time.")
-            # Try to execute the command over SSH remotely again.
-            stdin, stdout, stderr, exec_exception = self.exec_command_with_error_handling(script_string)
-            # If there was an exception again.
-            if exec_exception:
-                # Populate the function_error variable that will be returned outside.
-                function_error = exec_exception
-
-        # If there was no exception executing the remote command.
-        if not function_error:
-            # Reading the buffer of stdout.
-            output_lines = stdout.readlines()
-            # Reading the buffer of stderr.
-            function_error = stderr.readlines()
-
-            # Joining error lines list to string if not empty.
-            if function_error:
-                function_error = ''.join(function_error)
-            # Else, joining output lines to string.
-            else:
-                output_lines = ''.join(output_lines)
-
-            # Since they're "file-like" objects we need to close them after we finished using.
-            stdin.close()
-            stdout.close()
-            stderr.close()
-
-        return output_lines, function_error
+        # Don't put debugging break point over the next line in PyCharm. For some reason it gets stuck.
+        # Put the point right after that.
+        stdin, stdout, stderr = self.ssh_client.exec_command(command=script_string, timeout=30)
+
+        # Reading the buffer of stdout.
+        output_lines: list = stdout.readlines()
+        # Reading the buffer of stderr.
+        error_lines: list = stderr.readlines()
+
+        # Joining error lines list to string if not empty.
+        if error_lines:
+            error_result: str = ''.join(error_lines)
+        # Else, joining output lines to string.
+        else:
+            output_result = ''.join(output_lines)
+
+        # Since they're "file-like" objects we need to close them after we finished using.
+        stdin.close()
+        stdout.close()
+        stderr.close()
+
+        return output_result, error_result
 
     def remote_execution_python(self, script_string: str):
         """
@@ -277,8 +220,7 @@ class SSHRemote:
         :return: SSH console output, Error output
         """
         # Defining variables.
-        function_return = None
-        function_error = None
+        error_result: str | None = None
 
         encoded_base64_string = base64.b64encode(script_string.encode('ascii'))
         command_string: str = fr'python -c "import base64;exec(base64.b64decode({encoded_base64_string}))"'
@@ -295,14 +237,13 @@ class SSHRemote:
             # If the message is known and didn't return empty.
             if console_check:
                 # 'execution_error' variable will be that full error.
-                function_error = console_check
+                error_result = console_check
 
-        return remote_output, function_error
+        return remote_output, error_result
 
     def connect_get_client_commandline(self, script_string):
         # Defining locals.
-        execution_output = None
-        execution_error = None
+        execution_output: str | None = None
 
         # Making actual SSH Connection to the computer.
         execution_error = self.connect()
@@ -316,13 +257,7 @@ class SSHRemote:
         if not execution_error:
             self.logger.info("Executing SSH command to acquire the calling process.")
 
-            try:
-                execution_output, execution_error = self.remote_execution_python(script_string)
-            # Basically we don't care much about SSH exceptions. Just log them and pass to record.
-            except Exception as function_exception_object:
-                execution_error = function_exception_object
-                print_api(execution_error, logger=self.logger, logger_method='error', traceback_string=True)
-                pass
+            execution_output, execution_error = self.remote_execution_python(script_string)
 
             # Closing SSH connection at this stage.
             self.close()

atomicshop/wrappers/socketw/socket_wrapper.py

@@ -578,7 +578,6 @@ class SocketWrapper:
                     # Get the protocol type from the socket.
                     is_tls: bool = False
 
-                    time.sleep(1)  # Wait a second to gather some data.
                     tls_properties = ssl_base.is_tls(client_socket)
 
                     if tls_properties:

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

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

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

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=4EgJYd49JARUMQEP9YUXR0MGaFjopGdy25l3D73gEiM,123
+atomicshop/__init__.py,sha256=7_vQ7ANOGXMGTntv4aMk8d8oVSTFzWJBQnvcLQHYyFw,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
@@ -37,7 +37,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=-Xr8VMRJ2WpxdEG8HT2kFKKsb9GhSVVOJvUm948h1PE,15917
+atomicshop/ssh_remote.py,sha256=6LUrFW-ZFMfQ52TmUxMVGcrVmMM3uqKaGKOY3lnEgFA,12480
 atomicshop/sys_functions.py,sha256=MTBxRve5bh58SPvhX3gMiGqHlSBuI_rdNN1NnnBBWqI,906
 atomicshop/system_resource_monitor.py,sha256=yHdBU4mAVqoVS0Nn_SM_H42i4PgsgXDaXaMxfnL5CgA,14588
 atomicshop/system_resources.py,sha256=iKUvVSaXR47inmr3cTYsgNfclT38dRia2oupnlhIpK4,9290
@@ -130,7 +130,7 @@ atomicshop/mitm/connection_thread_worker.py,sha256=zPgDoIrZw6iIfjt_vwAYBanjOz23D
 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=u9q4BYIhScw9W9M7AS4h217gKQXkuppOFxvprEBVPGE,39366
+atomicshop/mitm/mitm_main.py,sha256=C1lZr5-1yRUCtPgs8mBnt_bD7W1fNOweI45OpmlSOII,39501
 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
@@ -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=GZyDzuc9Snm3qthl9gkGB9_Yb4p_Egp0sMtaivQ2xuo,42654
+atomicshop/wrappers/socketw/socket_wrapper.py,sha256=abvs3Jb7PZ6H5il0Yto6gCLkwY5tD40f0GYOzZVb8ng,42581
 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.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,,
+atomicshop-3.3.28.dist-info/licenses/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.3.28.dist-info/METADATA,sha256=mpQNhoVSvg9_AcIj-Qot4Kpvk_LrNOXujfo9ctQbzbA,9318
+atomicshop-3.3.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+atomicshop-3.3.28.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.3.28.dist-info/RECORD,,