Skip to content

Commit

Permalink
Fixed item problem with parse-ioc
Browse files Browse the repository at this point in the history
  • Loading branch information
@frikky
frikky committed Jun 26, 2024
1 parent d919784 commit 2cae4b4
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 20 deletions.
52 changes: 32 additions & 20 deletions shuffle-subflow/1.1.0/src/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
"User-Agent": "Shuffle Userinput 1.1.0",
}


result = {
"success": True,
"source": "userinput",
Expand All @@ -40,6 +41,11 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
"ip": "",
"user": "",
"note": "",
},
"links": {
"frontend_no_answer": "",
"api_continue": "",
"api_abort": "",
}
}

Expand All @@ -50,26 +56,32 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
if len(str(backend_url)) > 0:
url = backend_url

print("Found backend url: %s" % url)
#print("AUTH: %s" % self.full_execution["authorization"])
#if len(information):
# print("Should run arg: %s", information)
frontend_url = url
if ":5001" in frontend_url:
print("Should change port to 3001.")
if "appspot.com" in frontend_url:
frontend_url = "https://shuffler.io"
if "run.app" in frontend_url:
frontend_url = "https://shuffler.io"
if "ngrok" in frontend_url:
frontend_url = ""

explore_path = "%s/workflows/%s/run?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/workflows/%s/run?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/workflows/%s/run?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
result["links"]["frontend_abort"] = frontend_abort_url
result["links"]["api_continue"] = api_continue_url
result["links"]["api_abort"] = api_abort_url

print("Found backend url: %s" % url)
if len(subflow) > 0:
#print("Should run subflow: %s", subflow)

# Missing startnode (user input trigger)
#print("Subflows to run from userinput: ", subflows)

subflows = subflow.split(",")
frontend_url = url
if ":5001" in frontend_url:
print("Should change port to 3001.")
if "appspot.com" in frontend_url:
frontend_url = "https://shuffler.io"
if "run.app" in frontend_url:
frontend_url = "https://shuffler.io"

for item in subflows:
# In case of URL being passed, and not just ID
if "/" in item:
Expand All @@ -80,10 +92,10 @@ def run_userinput(self, user_apikey, sms="", email="", subflow="", information="
argument = json.dumps({
"information": information,
"parent_workflow": self.full_execution["workflow"]["id"],
"frontend_continue": "%s/workflows/%s/run?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": "%s/workflows/%s/run?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": "%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": "%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),
"frontend_continue": frontend_continue_url,
"frontend_abort": frontend_abort_url,
"api_continue": api_continue_url,
"api_abort": api_abort_url,
})

ret = self.run_subflow(user_apikey, item, argument, source_workflow=self.full_execution["workflow"]["id"], source_execution=self.full_execution["execution_id"], source_auth=self.full_execution["authorization"], startnode=startnode, backend_url=backend_url, source_node=source_node)
Expand Down
2 changes: 2 additions & 0 deletions shuffle-tools/1.2.0/src/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2480,6 +2480,8 @@ def parse_ioc(self, input_string, input_type="all"):
else:
input_type = input_type.split(",")
for i in range(len(input_type)):
item = input_type[i]

item = item.strip()
if not item.endswith("s"):
item = "%ss" % item
Expand Down

0 comments on commit 2cae4b4

Please sign in to comment.