Fixed random exits from python code

Author: frikky

shuffle-tools/1.2.0/requirements.txt

@@ -1,10 +1,10 @@
-ioc_finder==7.2.1
-py7zr==0.11.3
-rarfile==4.0
-pyminizip==0.2.4
-requests==2.25.1
-xmltodict==0.11.0
+ioc_finder==7.3.0
+py7zr==0.22.0
+rarfile==4.2
+pyminizip==0.2.6
+requests==2.32.3
+xmltodict==0.14.2
 json2xml==5.0.5
 ipaddress==1.0.23
-google.auth==1.23.0
-paramiko==3.1.0
+google.auth==2.37.0
+paramiko==3.5.0

shuffle-tools/1.2.0/src/app.py

@@ -1,9 +1,12 @@
+import os
+import sys
+import builtins
+
 import hmac
 import datetime
 import json
 import time
 import markupsafe
-import os
 import re
 import subprocess
 import tempfile
@@ -41,6 +44,12 @@
 from walkoff_app_sdk.app_base import AppBase
 #from shuffle_sdk import AppBase
 
+# Override exit(), sys.exit, and os._exit 
+# sys.exit() can be caught, meaning we can have a custom handler for it
+builtins.exit = sys.exit
+os.exit = sys.exit
+os._exit = sys.exit
+
 class Tools(AppBase):
     __version__ = "1.2.0"
     app_name = (
@@ -573,7 +582,6 @@ def execute_python(self, code):
                     "message": f"Filename needs to contain .py",
                 }
 
-
         # Write the code to a file
         # 1. Take the data into a file
         # 2. Subprocess execute file?
@@ -594,7 +602,27 @@ def custom_print(*args, **kwargs):
 
             globals_copy["self"] = self
 
-            exec(code, globals_copy)
+            try:
+                exec(code, globals_copy)
+            except SystemExit as e:
+                # Same as a return
+                pass
+            except SyntaxError as e:
+                # Special handler for return usage. Makes return act as 
+                # an exit()
+                if "'return' outside function" in str(e):
+                    return {
+                        "success": False,
+                        "message": f"Instead of using 'return' without a function, use 'exit()' to return when not inside a function. Raw Syntax error: {e}",
+                    }
+                else:
+                    return {
+                        "success": False,
+                        "message": f"Syntax Error: {e}",
+                    }
+
+            # this doesn't work to capture top-level returns
+            # Reason: SyntaxError makes it crash BEFORE it reaches the return
 
             s = f.getvalue()
             f.close() # why: https://www.youtube.com/watch?v=6SA6S9Ca5-U
@@ -623,7 +651,7 @@ def custom_print(*args, **kwargs):
         except Exception as e:
             return {
                 "success": False,
-                "message": f"exception: {e}",
+                "message": f"Exception: {e}",
             }
 
     def execute_bash(self, code, shuffle_input):