From c4ed881b46c9328310c568c1874a219b1c496004 Mon Sep 17 00:00:00 2001 From: frikky Date: Thu, 17 Sep 2020 19:45:08 +0200 Subject: [PATCH] #152: Fixed null pointer issue when apps are not installed --- backend/app_sdk/app_base.py | 2 +- backend/go-app/codegen.go | 9 ++++----- backend/go-app/walkoff.go | 1 + frontend/src/views/Workflows.jsx | 32 +++++++++++++++++--------------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 3a73ce47..39b9bdf5 100644 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -460,7 +460,7 @@ class AppBase: baseresult = "" actionname_lower = actionname.lower() try: - if actionname_lower == "exec" || actionname_lower == "webhook" || actionname_lower == "schedule" || actionname_lower == "userinput" || actionname_lower == "email_trigger" || actionname_lower == "trigger": + if actionname_lower == "exec" or actionname_lower == "webhook" or actionname_lower == "schedule" or actionname_lower == "userinput" or actionname_lower == "email_trigger" or actionname_lower == "trigger": baseresult = execution_data["execution_argument"] else: for result in execution_data["results"]: diff --git a/backend/go-app/codegen.go b/backend/go-app/codegen.go index a5898e5d..69fb792f 100644 --- a/backend/go-app/codegen.go +++ b/backend/go-app/codegen.go @@ -404,11 +404,10 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet bodyAddin, verifyAddin, ) - - if strings.Contains(functionname, "get_returns_the_vuln") { - log.Println(data) - log.Printf("Queries: %s", queryString) - } + //if strings.Contains(functionname, "get_returns_the_vuln") { + // log.Println(data) + // log.Printf("Queries: %s", queryString) + //} //log.Printf(data) return functionname, data diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index 2d80874e..d561e9de 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -1916,6 +1916,7 @@ func abortExecution(resp http.ResponseWriter, request *http.Request) { return } + // FIXME: Check the execution if this fails. user, err := handleApiAuthentication(resp, request) if err != nil { log.Printf("Api authentication failed in abort workflow: %s", err) diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx index 8542790d..72799852 100644 --- a/frontend/src/views/Workflows.jsx +++ b/frontend/src/views/Workflows.jsx @@ -542,22 +542,24 @@ const Workflows = (props) => { - - - - + {data.actions !== undefined && data.actions !== null ? + + + + - {webhooks > 0 ? - - {data.title} - - : null} - {schedules > 0 ? - - {data.title} - - : null} - + {webhooks > 0 ? + + {data.title} + + : null} + {schedules > 0 ? + + {data.title} + + : null} + + : null} ) }