Merge branch 'Shuffle:master' into newapp

yashsinghcodes · web-flow · commit b2534fa685f1 · 2025-06-11T23:39:12.000+05:30
diff --git a/active-directory/1.0.0/requirements.txt b/active-directory/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 ldap3==2.9.1
-requests==2.32.2
+requests==2.32.4
diff --git a/archive-org/1.0.0/requirements.txt b/archive-org/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 savepagenow==1.1.1
diff --git a/archive-today/1.0.0/requirements.txt b/archive-today/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 archiveis==0.0.9
diff --git a/aws-cloudwatch/1.0.0/requirements.txt b/aws-cloudwatch/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 boto3==1.20.20
-requests==2.32.2
+requests==2.32.4
diff --git a/aws-dynamodb/1.0.0/requirements.txt b/aws-dynamodb/1.0.0/requirements.txt
@@ -1,3 +1,3 @@
 boto3==1.16.59
 bson==0.5.10
-requests==2.32.2
+requests==2.32.4
diff --git a/aws-guardduty/1.0.0/requirements.txt b/aws-guardduty/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 boto3==1.16.59
-requests==2.32.2
+requests==2.32.4
diff --git a/aws-iam/1.0.0/requirements.txt b/aws-iam/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 boto3==1.16.59
-requests==2.32.2
+requests==2.32.4
diff --git a/aws-lambda/1.0.0/requirements.txt b/aws-lambda/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 boto3==1.16.59
-requests==2.32.2
+requests==2.32.4
diff --git a/aws-securityhub/1.0.0/requirements.txt b/aws-securityhub/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 boto3==1.16.59
-requests==2.32.2
+requests==2.32.4
diff --git a/aws-ses/1.0.0/requirements.txt b/aws-ses/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 boto3==1.16.59
diff --git a/breachsense/1.0.0/requirements.txt b/breachsense/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/checkpoint/1.0.0/requirements.txt b/checkpoint/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/databasemanager/1.0.0/requirements.txt b/databasemanager/1.0.0/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.2
+requests==2.32.4
 mysql-connector-python==9.1.0
 
diff --git a/email/1.1.0/requirements.txt b/email/1.1.0/requirements.txt
@@ -1,6 +1,6 @@
-requests==2.32.2
+requests==2.32.4
 glom==20.11.0
-requests==2.32.2
+requests==2.32.4
 eml-parser==1.17.0
 msg-parser==1.2.0
 mail-parser==3.15.0
diff --git a/email/1.2.0/requirements.txt b/email/1.2.0/requirements.txt
@@ -1,4 +1,4 @@
-requests==2.32.2
+requests==2.32.4
 glom==20.11.0
 eml-parser==1.17.5
 msg-parser==1.2.0
diff --git a/gitguardian/1.0.0/requirements.txt b/gitguardian/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 pygitguardian==1.1.2
diff --git a/google-chat/1.0.0/requirements.txt b/google-chat/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/gpg-tools/1.0.0/requirements.txt b/gpg-tools/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 python-gnupg==0.4.6
-requests==2.32.2
+requests==2.32.4
diff --git a/gpg-tools/1.1.0/requirements.txt b/gpg-tools/1.1.0/requirements.txt
@@ -1,2 +1,2 @@
 python-gnupg==0.4.6
-requests==2.32.2
+requests==2.32.4
diff --git a/gws/1.0.0/requirements.txt b/gws/1.0.0/requirements.txt
@@ -1,4 +1,4 @@
-requests==2.32.2
+requests==2.32.4
 google-auth==1.28.0
 google-auth-oauthlib==0.4.3
 google-auth-httplib2==0.0.4
diff --git a/harfanglab-edr/1.0.0/requirements.txt b/harfanglab-edr/1.0.0/requirements.txt
@@ -1,4 +1,4 @@
-requests==2.32.2
+requests==2.32.4
 python-dateutil==2.8.2
 DateTime==4.7
 Markdown==3.4.1
diff --git a/http/1.0.0/requirements.txt b/http/1.0.0/requirements.txt
@@ -1,2 +1,3 @@
 uncurl==0.0.10
-requests==2.32.2
+requests==2.32.2
+shuffle-sdk==0.0.26
diff --git a/http/1.0.0/src/app.py b/http/1.0.0/src/app.py
@@ -8,7 +8,7 @@
 import requests
 import subprocess
 
-from walkoff_app_sdk.app_base import AppBase
+from shuffle_sdk import AppBase 
 
 class HTTP(AppBase):
     __version__ = "1.0.0"
diff --git a/http/1.1.0/requirements.txt b/http/1.1.0/requirements.txt
@@ -1,2 +1,2 @@
 uncurl==0.0.10
-requests==2.32.2
+requests==2.32.4
diff --git a/http/1.2.0/requirements.txt b/http/1.2.0/requirements.txt
@@ -1,2 +1,2 @@
 uncurl==0.0.10
-requests==2.32.2
+requests==2.32.4
diff --git a/mysql/1.0.0/requirements.txt b/mysql/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 mysql-connector-python==9.1.0
diff --git a/netcraft/1.0.0/requirements.txt b/netcraft/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/outlook-exchange/1.0.0/requirements.txt b/outlook-exchange/1.0.0/requirements.txt
@@ -2,4 +2,4 @@ cryptography==44.0.1
 exchangelib==3.3.2
 eml_parser==1.14.4
 glom==20.11.0
-requests==2.32.2
+requests==2.32.4
diff --git a/rss/1.0.0/requirements.txt b/rss/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 feedparser==6.0.8
-requests==2.32.2
+requests==2.32.4
diff --git a/secureworks/1.0.0/requirements.txt b/secureworks/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/shuffle-ai/1.0.0/src/app.py b/shuffle-ai/1.0.0/src/app.py
@@ -456,8 +456,6 @@ def run_schemaless(self, category, action, app_name="", fields=""):
         if app_name:
             data["app_name"] = app_name
 
-        self.logger.info(f"\n\nFIELDS MAPPED\n\n: {fields}")
-
         if fields:
             if isinstance(fields, list):
                 data["fields"] = fields
@@ -522,7 +520,12 @@ def run_schemaless(self, category, action, app_name="", fields=""):
             self.logger.info("[ERROR] Failed to get response headers (category action url debug mapping): %s" % e)
 
         try: 
-            return request.json()
+            data = request.json()
+
+            #if "success" in data and "result" in data and "errors" in data:
+            #    return data["result"]
+
+            return data
         except:
             return request.text
 
diff --git a/shuffle-subflow/1.0.0/requirements.txt b/shuffle-subflow/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/shuffle-subflow/1.1.0/requirements.txt b/shuffle-subflow/1.1.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/shuffle-subflow/1.1.0/src/app.py b/shuffle-subflow/1.1.0/src/app.py
@@ -68,11 +68,16 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
         if "shuffle-backend" in frontend_url:
             frontend_url = ""
 
+        api_continue_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=true&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
+        api_abort_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=false&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
+
+        # Remove subdomain before .shuffler.io so that https://*.shuffler.io -> https://shuffler.io
+        if ".shuffler.io" in frontend_url:
+            frontend_url = "https://shuffler.io"
+
         explore_path = "%s/forms/%s?authorization=%s&reference_execution=%s&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
         frontend_continue_url = "%s/forms/%s?authorization=%s&reference_execution=%s&answer=true&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
         frontend_abort_url = "%s/forms/%s?authorization=%s&reference_execution=%s&answer=false&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
-        api_continue_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=true&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
-        api_abort_url = "%s/api/v1/workflows/%s/execute?authorization=%s&reference_execution=%s&answer=false&source_node=%s" % (frontend_url, self.full_execution["workflow"]["id"], self.full_execution["authorization"], self.full_execution["execution_id"], source_node)
 
         result["links"]["frontend_no_answer"] = explore_path
         result["links"]["frontend_continue"] = frontend_continue_url
diff --git a/shuffle-tools/1.0.0/requirements.txt b/shuffle-tools/1.0.0/requirements.txt
@@ -2,7 +2,7 @@ ioc_finder==6.0.1
 py7zr==0.20.2
 rarfile==4.0
 pyminizip==0.2.6
-requests==2.32.2
+requests==2.32.4
 xmltodict==0.11.0
 json2xml==5.0.5
 ipaddress==1.0.23
diff --git a/shuffle-tools/1.1.0/requirements.txt b/shuffle-tools/1.1.0/requirements.txt
@@ -2,7 +2,7 @@ ioc_finder==6.0.1
 py7zr==0.20.2
 rarfile==4.0
 pyminizip==0.2.6
-requests==2.32.3
+requests==2.32.4
 xmltodict==0.11.0
 json2xml==5.0.5
 ipaddress==1.0.23
diff --git a/shuffle-tools/1.2.0/requirements.txt b/shuffle-tools/1.2.0/requirements.txt
@@ -2,7 +2,7 @@ ioc_finder==7.3.0
 py7zr==0.22.0
 rarfile==4.2
 pyminizip==0.2.6
-requests==2.32.3
+requests==2.32.4
 xmltodict==0.14.2
 json2xml==5.0.5
 ipaddress==1.0.23
diff --git a/siemonster/1.0.0/requirements.txt b/siemonster/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/sigma/1.0.0/requirements.txt b/sigma/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 sigmatools==0.20
diff --git a/snort3/1.0.0/requirements.txt b/snort3/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 # No extra requirements needed
-requests==2.32.2
+requests==2.32.4
diff --git a/sooty/1.0.0/requirements.txt b/sooty/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.2
+requests==2.32.4
 ipwhois==1.2.0
diff --git a/twilio/1.9.0/requirements.txt b/twilio/1.9.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/DuoSecurity/1.0.0/requirements.txt b/unsupported/DuoSecurity/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/ad-ldap/1.0.0/requirements.txt b/unsupported/ad-ldap/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 ldap3==2.9.1
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/cylance/1.0.0/requirements.txt b/unsupported/cylance/1.0.0/requirements.txt
@@ -1,3 +1,3 @@
 cryptography==44.0.1
-requests==2.32.2
+requests==2.32.4
 PyJWT==2.4.0
diff --git a/unsupported/email-analyzer/1.0.0/requirements.txt b/unsupported/email-analyzer/1.0.0/requirements.txt
@@ -1,4 +1,4 @@
-requests==2.32.2
+requests==2.32.4
 eml-parser==1.14.7
 msg-parser==1.2.0
 mail-parser==3.15.0
diff --git a/unsupported/hoxhunt/1.0.0/requirements.txt b/unsupported/hoxhunt/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/lastline/1.0.0/requirements.txt b/unsupported/lastline/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-compliance/1.0.0/requirements.txt b/unsupported/microsoft-compliance/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-identity-and-access/1.0.0/requirements.txt b/unsupported/microsoft-identity-and-access/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-intune/1.0.0/requirements.txt b/unsupported/microsoft-intune/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-security-and-compliance/1.0.0/requirements.txt b/unsupported/microsoft-security-and-compliance/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-security-oauth2/1.0.0/requirements.txt b/unsupported/microsoft-security-oauth2/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-teams-system-access/1.0.0/requirements.txt b/unsupported/microsoft-teams-system-access/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/microsoft-teams/1.0.0/requirements.txt b/unsupported/microsoft-teams/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/misp/1.0.0/requirements.txt b/unsupported/misp/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/nlp/1.0.0/requirements.txt b/unsupported/nlp/1.0.0/requirements.txt
@@ -1,4 +1,4 @@
 cyberspacy==1.1.1
 tika==1.24
-requests==2.32.2
+requests==2.32.4
 spacy==2.3.5
diff --git a/unsupported/office365mgmt/1.0.0/requirements.txt b/unsupported/office365mgmt/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 # No extra requirements needed
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/passivetotal/1.0.0/requirements.txt b/unsupported/passivetotal/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/recordedfuture/1.0.0/requirements.txt b/unsupported/recordedfuture/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/servicenow/1.0.0/requirements.txt b/unsupported/servicenow/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/shuffle-subflow/1.0.0/requirements.txt b/unsupported/shuffle-subflow/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/splunk/1.0.0/requirements.txt b/unsupported/splunk/1.0.0/requirements.txt
@@ -1,2 +1,2 @@
 python-magic==0.4.18
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/testing/1.0.0/requirements.txt b/unsupported/testing/1.0.0/requirements.txt
@@ -1 +1 @@
-requests==2.32.2
+requests==2.32.4
diff --git a/unsupported/thehive/1.0.0/requirements.txt b/unsupported/thehive/1.0.0/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.2
+requests==2.32.4
 thehive4py==1.8.1
 python-magic==0.4.18
diff --git a/unsupported/thehive/1.1.0/requirements.txt b/unsupported/thehive/1.1.0/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.2
+requests==2.32.4
 thehive4py==1.8.1
 python-magic==0.4.18
diff --git a/unsupported/thehive/1.1.1/requirements.txt b/unsupported/thehive/1.1.1/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.2
+requests==2.32.4
 thehive4py==1.8.1
 python-magic==0.4.18
diff --git a/unsupported/thehive/1.1.2/requirements.txt b/unsupported/thehive/1.1.2/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.2
+requests==2.32.4
 thehive4py==1.8.1
 python-magic==0.4.18
diff --git a/unsupported/thehive/1.1.3/requirements.txt b/unsupported/thehive/1.1.3/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.2
+requests==2.32.4
 thehive4py==1.8.1
 python-magic==0.4.18
diff --git a/unsupported/twitter/1.0.0/requirements.txt b/unsupported/twitter/1.0.0/requirements.txt
diff --git a/unsupported/vulndb/1.0.0/requirements.txt b/unsupported/vulndb/1.0.0/requirements.txt
diff --git a/yara/1.0.0/requirements.txt b/yara/1.0.0/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`ldap3==2.9.1`
`2`		`-requests==2.32.2`
	`2`	`+requests==2.32.4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`boto3==1.20.20`
`2`		`-requests==2.32.2`
	`2`	`+requests==2.32.4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`boto3==1.16.59`
`2`		`-requests==2.32.2`
	`2`	`+requests==2.32.4`