Merge pull request #61 from frikky/dev

Hotfixes to App creator and database location change

.env

@@ -13,4 +13,4 @@ BACKEND_PORT=5001
 FRONTEND_PORT=3001
 FRONTEND_PORT_HTTPS=3443
 OUTER_HOSTNAME=shuffle-backend
-DB_LOCATION=/etc/shuffle
+DB_LOCATION=./shuffle-database

README.md

@@ -10,20 +10,21 @@
 * Cloud: Register at https://shuffler.io/register and get cooking (there are some differences!)
 
 ## Blogposts
-[1. Introducing Shuffle](https://medium.com/security-operation-capybara/introducing-shuffle-an-open-source-soar-platform-part-1-58a529de7d12)
+* [1. Introducing Shuffle](https://medium.com/security-operation-capybara/introducing-shuffle-an-open-source-soar-platform-part-1-58a529de7d12)
-[2. Getting started with Shuffle](https://medium.com/security-operation-capybara/getting-started-with-shuffle-an-open-source-soar-platform-part-2-1d7c67a64244)
+* [2. Getting started with Shuffle](https://medium.com/security-operation-capybara/getting-started-with-shuffle-an-open-source-soar-platform-part-2-1d7c67a64244)
+* [3. Integrating Shuffle with Virustotal and TheHive](https://medium.com/@Frikkylikeme/integrating-shuffle-with-virustotal-and-thehive-open-source-soar-part-3-8e2e0d3396a9)
+
+## Documentation
+[Documentation](https://shuffler.io/docs) can be found on https://shuffler.io/docs/about or in your own instance. Currently lacking: 
+* API documentation 
+* Updates after migrating from SaaS to open source
 
 ## Related repositories
 * Apps: https://github.com/frikky/shuffle-apps
-* Workflows: https://github.com/frikky/shuffle-workflows (empty)
+* Workflows: https://github.com/frikky/shuffle-workflows
-* Security OpenAPI apps: https://github.com/frikky/OpenAPI-security-definitions
+* Security OpenAPI apps: https://github.com/frikky/security-openapis
 * Documentation: https://github.com/frikky/shuffle-docs
 
-## Documentation
-Documentation can be found on https://shuffler.io/docs/about or in your own instance. Currently lacking: 
-* API documentation 
-* Updates after migrating from SaaS to open source
-
 ## Features
 * Simple workflow automation editor 
 * Premade apps for a number of security tools

backend/app_sdk/app_base.py

@@ -73,12 +73,9 @@ class AppBase:
         except requests.exceptions.ConnectionError as e:
             print("Connectionerror: %s" %  e)
             return
-        #self.logger.info("AFTER initial stream result")
-        self.logger.info("THIS IS THE NEW UPDATE")
 
         # Verify whether there are any parameters with ACTION_RESULT required
         # If found, we get the full results list from backend
-        
         fullexecution = {}
         try:
             tmpdata = {
@@ -195,10 +192,9 @@ class AppBase:
             # Regex to find all the things
             if parameter["variant"] == "STATIC_VALUE":
                 data = parameter["value"]
-                self.logger.debug(f"\n\nHandle static data with JSON: {data}\n\n")
-
                 actualitem = re.findall(match, data, re.MULTILINE)
-                self.logger.info("STATIC PARSED: %s" % actualitem)
+                #self.logger.debug(f"\n\nHandle static data with JSON: {data}\n\n")
+                #self.logger.info("STATIC PARSED: %s" % actualitem)
                 if len(actualitem) > 0:
                     for replace in actualitem:
                         try:
@@ -487,7 +483,6 @@ class AppBase:
                                 # With this parameter ready, add it to... a greater list of parameters. Rofl
                                 multi_parameters[parameter["name"]] = resultarray
                             else:
-                                print("Hello, in here?: %s" % value)
                                 params[parameter["name"]] = value
                                 multi_parameters[parameter["name"]] = value 
                         

backend/go-app/codegen.go

@@ -243,7 +243,8 @@ func buildStructure(swagger *openapi3.Swagger, curHash string) (string, error) {
 }
 
 // This function generates the python code that's being used.
-func makePythoncode(swagger *openapi3.Swagger, name, url, method string, parameters, optionalQueries []string) (string, string) {
+// This is really meta when you program it. Handling parameters is hard here.
+func makePythoncode(swagger *openapi3.Swagger, name, url, method string, parameters, optionalQueries, headers []string) (string, string) {
 	method = strings.ToLower(method)
 	queryString := ""
 	queryData := ""
@@ -349,10 +350,33 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		}
 	}
 
+	preparedHeaders := "headers={}"
+	if len(headers) > 0 {
+		preparedHeaders = "headers={"
+		for count, header := range headers {
+			headerSplit := strings.Split(header, "=")
+			added := false
+			if len(headerSplit) == 2 {
+				if strings.Contains(preparedHeaders, headerSplit[0]) {
+					continue
+				}
+
+				preparedHeaders += fmt.Sprintf(`"%s": "%s"`, headerSplit[0], headerSplit[1])
+				added = true
+			}
+
+			if count != len(headers)-1 && added {
+				preparedHeaders += ","
+			}
+		}
+
+		preparedHeaders += "}"
+	}
+
 	// Extra param for url if it's changeable
 	// Extra param for authentication scheme(s)
 	data := fmt.Sprintf(`    async def %s(self%s%s%s%s%s%s):
-        headers={}
+        %s
         url=f"%s%s"
         %s
         %s
@@ -367,6 +391,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		queryString,
 		bodyParameter,
 		verifyParam,
+		preparedHeaders,
 		urlInline,
 		url,
 		verifyWrapper,
@@ -379,8 +404,6 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		verifyAddin,
 	)
 
-	log.Printf("CODE: %s", data)
-
 	//log.Println(data)
 	//log.Println(functionname)
 	return functionname, data
@@ -533,7 +556,11 @@ func generateYaml(swagger *openapi3.Swagger, newmd5 string) (*openapi3.Swagger,
 	// Could just as well be go at this point lol
 	pythonFunctions := []string{}
 	for actualPath, path := range swagger.Paths {
-		// FIXME: Add everything from here:
+		actualPath = strings.Replace(actualPath, " ", "_", -1)
+		actualPath = strings.Replace(actualPath, ".", "", -1)
+		actualPath = strings.Replace(actualPath, ".", "", -1)
+		actualPath = strings.Replace(actualPath, "\\", "", -1)
+
 		// https://godoc.org/github.com/getkin/kin-openapi/openapi3#PathItem
 		if path.Get != nil {
 			action, curCode := handleGet(swagger, api, extraParameters, path, actualPath)
@@ -810,13 +837,26 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 		}
 	}
 
+	headersFound := []string{}
 	if len(path.Connect.Parameters) > 0 {
-		for _, param := range path.Connect.Parameters {
+		for counter, param := range path.Connect.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
+
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Connect.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -843,14 +883,8 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
-				parameters = append(parameters, param.Value.Name)
+				parameters = append(parameters, curParam.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
 			} else if param.Value.In == "query" {
 				//log.Printf("QUERY!: %s", param.Value.Name)
@@ -873,6 +907,12 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 				firstQuery = false
 			}
 
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
+
 		}
 	}
 
@@ -882,7 +922,7 @@ func handleConnect(swagger *openapi3.Swagger, api WorkflowApp, extraParameters [
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "connect", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "connect", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname
@@ -907,8 +947,6 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 	action.Returns.Schema.Type = "string"
 	baseUrl := fmt.Sprintf("%s%s", api.Link, actualPath)
 
-	//log.Println(path.Parameters)
-
 	// Parameters:  []WorkflowAppActionParameter{},
 	// FIXME - add data for POST stuff
 	firstQuery := true
@@ -943,14 +981,26 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		}
 	}
 
+	headersFound := []string{}
 	if len(path.Get.Parameters) > 0 {
-		for _, param := range path.Get.Parameters {
+		for counter, param := range path.Get.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
 
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Get.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -977,14 +1027,8 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
-				parameters = append(parameters, param.Value.Name)
+				parameters = append(parameters, curParam.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
 			} else if param.Value.In == "query" {
 				//log.Printf("QUERY!: %s", param.Value.Name)
@@ -1007,6 +1051,11 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 				}
 				firstQuery = false
 			}
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
 
 		}
 	}
@@ -1017,7 +1066,7 @@ func handleGet(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "get", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "get", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname
@@ -1075,13 +1124,27 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 			})
 		}
 	}
+
+	headersFound := []string{}
 	if len(path.Head.Parameters) > 0 {
-		for _, param := range path.Head.Parameters {
+		for counter, param := range path.Head.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
+
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Head.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -1108,14 +1171,8 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
-				parameters = append(parameters, param.Value.Name)
+				parameters = append(parameters, curParam.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
 			} else if param.Value.In == "query" {
 				//log.Printf("QUERY!: %s", param.Value.Name)
@@ -1138,6 +1195,12 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 				firstQuery = false
 			}
 
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
+
 		}
 	}
 
@@ -1147,7 +1210,7 @@ func handleHead(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "head", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "head", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname
@@ -1205,13 +1268,27 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 			})
 		}
 	}
+
+	headersFound := []string{}
 	if len(path.Delete.Parameters) > 0 {
-		for _, param := range path.Delete.Parameters {
+		for counter, param := range path.Delete.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
+
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Delete.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -1238,14 +1315,8 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
-				parameters = append(parameters, param.Value.Name)
+				parameters = append(parameters, curParam.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
 			} else if param.Value.In == "query" {
 				//log.Printf("QUERY!: %s", param.Value.Name)
@@ -1268,6 +1339,12 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 				firstQuery = false
 			}
 
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
+
 		}
 	}
 
@@ -1277,7 +1354,7 @@ func handleDelete(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "delete", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "delete", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname
@@ -1300,10 +1377,6 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		Parameters:  extraParameters,
 	}
 
-	//if path.Post.RequestBody != nil {
-	//	log.Printf("RequestBody: %#v", path.Post.RequestBody)
-	//}
-
 	action.Returns.Schema.Type = "string"
 	baseUrl := fmt.Sprintf("%s%s", api.Link, actualPath)
 
@@ -1339,14 +1412,26 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		}
 	}
 
+	headersFound := []string{}
 	if len(path.Post.Parameters) > 0 {
-		for _, param := range path.Post.Parameters {
+		for counter, param := range path.Post.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
 
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Post.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -1359,7 +1444,7 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 			if param.Value.Example != nil {
 				curParam.Example = param.Value.Example.(string)
 
-				if param.Value.Name == "body" {
+				if parsedName == "body" {
 					curParam.Value = param.Value.Example.(string)
 				}
 			}
@@ -1373,14 +1458,8 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
-				parameters = append(parameters, param.Value.Name)
+				parameters = append(parameters, curParam.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
 			} else if param.Value.In == "query" {
 				//log.Printf("QUERY!: %s", param.Value.Name)
@@ -1403,6 +1482,11 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 				firstQuery = false
 			}
 
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
 		}
 	}
 
@@ -1412,7 +1496,7 @@ func handlePost(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wo
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "post", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "post", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname
@@ -1470,13 +1554,27 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 			})
 		}
 	}
+
+	headersFound := []string{}
 	if len(path.Patch.Parameters) > 0 {
-		for _, param := range path.Patch.Parameters {
+		for counter, param := range path.Patch.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
+
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Patch.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -1503,14 +1601,8 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
-				parameters = append(parameters, param.Value.Name)
+				parameters = append(parameters, curParam.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
 			} else if param.Value.In == "query" {
 				//log.Printf("QUERY!: %s", param.Value.Name)
@@ -1533,6 +1625,11 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 				firstQuery = false
 			}
 
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
 		}
 	}
 
@@ -1542,7 +1639,7 @@ func handlePatch(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []W
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "patch", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "delete", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname
@@ -1601,13 +1698,26 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		}
 	}
 
+	headersFound := []string{}
 	if len(path.Put.Parameters) > 0 {
-		for _, param := range path.Put.Parameters {
+		for counter, param := range path.Put.Parameters {
-			if param.Value.Schema == nil || param.Value.In == "header" {
+			if param.Value.Schema == nil {
+				continue
+			} else if param.Value.In == "header" {
+				headersFound = append(headersFound, fmt.Sprintf("%s=%s", param.Value.Name, param.Value.Example))
 				continue
 			}
+
+			parsedName := param.Value.Name
+			parsedName = strings.ReplaceAll(parsedName, " ", "_")
+			parsedName = strings.ReplaceAll(parsedName, ",", "_")
+			parsedName = strings.ReplaceAll(parsedName, ".", "_")
+			parsedName = strings.ReplaceAll(parsedName, "|", "_")
+			param.Value.Name = parsedName
+			path.Put.Parameters[counter].Value.Name = parsedName
+
 			curParam := WorkflowAppActionParameter{
-				Name:        param.Value.Name,
+				Name:        parsedName,
 				Description: param.Value.Description,
 				Multiline:   false,
 				Required:    param.Value.Required,
@@ -1634,12 +1744,6 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 				}
 			}
 
-			if param.Value.Required {
-				action.Parameters = append(action.Parameters, curParam)
-			} else {
-				optionalParameters = append(optionalParameters, curParam)
-			}
-
 			if param.Value.In == "path" {
 				parameters = append(parameters, param.Value.Name)
 				//baseUrl = fmt.Sprintf("%s%s", baseUrl)
@@ -1664,6 +1768,12 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 				firstQuery = false
 			}
 
+			if param.Value.Required {
+				action.Parameters = append(action.Parameters, curParam)
+			} else {
+				optionalParameters = append(optionalParameters, curParam)
+			}
+
 		}
 	}
 
@@ -1673,7 +1783,7 @@ func handlePut(swagger *openapi3.Swagger, api WorkflowApp, extraParameters []Wor
 		action.Parameters = append(action.Parameters, optionalParam)
 	}
 
-	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "put", parameters, optionalQueries)
+	functionname, curCode := makePythoncode(swagger, functionName, baseUrl, "delete", parameters, optionalQueries, headersFound)
 
 	if len(functionname) > 0 {
 		action.Name = functionname

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     depends_on:
       - backend
   backend:
-    #build: ./backend
+    build: ./backend
     image: frikky/shuffle:backend
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}

frontend/src/AngularWorkflow.js

@@ -62,8 +62,6 @@ import cxtmenu from 'cytoscape-cxtmenu';
 import { w3cwebsocket as W3CWebSocket } from "websocket";
 import { useAlert } from "react-alert";
 
-const hoverColor = "#f85a3e"
-const hoverOutColor = "#e8eaf6"
 const surfaceColor = "#27292D"
 const inputColor = "#383B40"
 
@@ -1142,7 +1140,6 @@ const AngularWorkflow = (props) => {
 	}
 
 	const onNodeHover = (event) => {
-		//event.target.style("border-width", "5px")
 		event.target.animate({
 			style: {
 				"border-width": "5px",
@@ -1156,24 +1153,22 @@ const AngularWorkflow = (props) => {
 	}
 
 	const onEdgeHoverOut = (event) => {
-		//event.target.removeStyle()
+		event.target.removeStyle()
 	}
 
 	// This is here to have a proper transition for lines
 	const onEdgeHover = (event) => {
-
+		const sourcecolor = cy.getElementById(event.target.data("source")).style("border-color")
-		//console.log(event.target.data())
+		const targetcolor = cy.getElementById(event.target.data("target")).style("border-color")
-		//const sourcecolor = cy.getElementById(event.target.data("source")).style("border-color")
+		event.target.animate({
-		//const targetcolor = cy.getElementById(event.target.data("target")).style("border-color")
+			style: {
-		//event.target.animate({
+				"line-fill": "linear-gradient",
-		//	style: {
+				'target-arrow-color': targetcolor,
-		//		"line-fill": "linear-gradient",
+				"line-gradient-stop-colors": [sourcecolor, targetcolor],
-		//		'target-arrow-color': targetcolor,
+				"line-gradient-stop-positions": [0, 1],
-		//		"line-gradient-stop-colors": [sourcecolor, targetcolor],
+			},
-		//		"line-gradient-stop-positions": [0, 1],
+			duration: 0,
-		//	},
+		})
-		//	duration: 0,
-		//})
 	}
 
 
@@ -2286,6 +2281,7 @@ const AngularWorkflow = (props) => {
 								rows="5"
 								color="primary"
 								defaultValue={data.value}
+								type={placeholder.includes("***") ? "password" : "text"}
 								placeholder={placeholder}
 								onChange={(event) => {
 									changeActionParameter(event, count)
@@ -2416,7 +2412,7 @@ const AngularWorkflow = (props) => {
 							<div style={{marginTop: "20px", marginBottom: "7px", display: "flex"}}>
 								<div style={{width: "17px", height: "17px", borderRadius: 17 / 2, backgroundColor: itemColor, marginRight: "10px"}}/>
 								<div style={{flex: "10"}}> 
-									<b>{data.name}: </b> 
+									<b>{data.name} </b> 
 								</div>
 								<Tooltip color="primary" title="Static data" placement="top">
 									<div style={{cursor: "pointer", color: staticcolor}} onClick={(e) => {
@@ -2502,6 +2498,13 @@ const AngularWorkflow = (props) => {
 		//setStartNode(selectedAction.id)
 	}
 
+	function sortByKey(array, key) {
+	  return array.sort(function(a, b) {
+			var x = a[key]; var y = b[key]
+			return ((x < y) ? -1 : ((x > y) ? 1 : 0))
+		})
+	}
+
 	const appApiView = Object.getOwnPropertyNames(selectedAction).length > 0 && Object.getOwnPropertyNames(selectedApp).length > 0 ? 
 		<div style={appApiViewStyle}>
 			<div style={{display: "flex", minHeight: 40, marginBottom: 30}}>
@@ -2583,7 +2586,7 @@ const AngularWorkflow = (props) => {
 			: null*/}
 			<Divider style={{marginTop: "20px", height: "1px", width: "100%", backgroundColor: "rgb(91, 96, 100)"}}/>
 			<div style={{flex: "6", marginTop: "20px"}}>
-				<div>
+				<div style={{marginBottom: 5}}>
 					<b>Actions</b>
 				</div>
 				<Select
@@ -2598,7 +2601,7 @@ const AngularWorkflow = (props) => {
 						}
 					}}
 				>
-					{selectedApp.actions.map(data => {
+					{sortByKey(selectedApp.actions, "label").map(data => {
 						var newActionname = data.name
 						if (data.label !== undefined && data.label !== null && data.label.length > 0) {
 							newActionname = data.label
@@ -2610,13 +2613,17 @@ const AngularWorkflow = (props) => {
 						newActionname = newActionname.replace("_", " ")
 						newActionname = newActionname.charAt(0).toUpperCase()+newActionname.substring(1)
 						return (
-						<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data.name}>
+						<MenuItem style={{maxWidth: 400, overflowX: "hidden", backgroundColor: inputColor, color: "white"}} value={data.name}>
 							{newActionname}
 
 						</MenuItem>
 						)
 					})}
 				</Select>
+				{selectedAction.description !== undefined && selectedAction.description.length > 0 ?
+				<div style={{marginTop: 10, marginBottom: 10, maxHeight: 60, overflow: "hidden"}}>
+					{selectedAction.description}
+				</div> : null}
 				<div style={{marginTop: "10px", borderColor: "white", borderWidth: "2px", marginBottom: 200}}>
 						<AppActionArguments key={selectedAction.id} selectedAction={selectedAction} />
 
@@ -4541,6 +4548,9 @@ const AngularWorkflow = (props) => {
 					boxSelectionEnabled={true}
 					autounselectify={false}
 					cy={(incy) => {
+						// FIXME: There's something specific loading when
+						// you do the first hover of a node. Why is this different?
+						console.log("CY: ", incy)
 						setCy(incy)
 					}}
 				/>

frontend/src/AppCreator.js

@@ -614,12 +614,25 @@ const AppCreator = (props) => {
 				const headersSplit = item.headers.split("\n")
 				for (var key in headersSplit) {
 					const header = headersSplit[key]
+					console.log("HEADER: ", header)
 					var key = ""
 					var value = ""
-					if (header.length > 0 && header.includes("=")) {
+					if (header.length > 0 && header.includes("= ")) {
+						const headersplit = header.split("= ")
+						key = headersplit[0]	
+						value = headersplit[1]	
+					} else if (header.length > 0 && header.includes("=")) {
 						const headersplit = header.split("=")
 						key = headersplit[0]	
 						value = headersplit[1]	
+					} else if (header.length > 0 && header.includes(": ")) {
+						const headersplit = header.split(": ")
+						key = headersplit[0]	
+						value = headersplit[1]	
+					} else if (header.length > 0 && header.includes(":")) {
+						const headersplit = header.split(":")
+						key = headersplit[0]	
+						value = headersplit[1]	
 					} else {
 						continue
 					}
@@ -1007,7 +1020,7 @@ const AppCreator = (props) => {
 		// Url verification
 		if (currentAction.url.length === 0) {
 			errormessage.push("URL path can't be empty.")
-		} else if (!currentAction.url.startsWith("/")) {
+		} else if (!currentAction.url.startsWith("/") && baseUrl.length > 0) {
 			errormessage.push("URL must start with /")
 		}
 
@@ -1273,6 +1286,10 @@ const AppCreator = (props) => {
 											continue
 										}
 
+										if (key === "Authorization" && authenticationOption === "Bearer auth") {
+											continue
+										} 
+
 										headers += key+"="+value+"\n"
 									}
 
@@ -1284,33 +1301,37 @@ const AppCreator = (props) => {
 								}
 
 								// Parse URL
-								parsedurl = request.url
+								if (request.url !== undefined) {
+									parsedurl = request.url
+								}
 							}
 
-							if (parsedurl.includes("<") && parsedurl.includes(">")) {
+							if (parsedurl !== undefined) {
-								parsedurl = parsedurl.split("<").join("{")
+								if (parsedurl.includes("<") && parsedurl.includes(">")) {
-								parsedurl = parsedurl.split(">").join("}")
+									parsedurl = parsedurl.split("<").join("{")
-							}
+									parsedurl = parsedurl.split(">").join("}")
-
-							if (parsedurl.startsWith("http") || parsedurl.startsWith("ftp")) {
-								if (parsedurl !== undefined && parsedurl.includes(parameterName)) {
-									// Remove <> etc.
-									// 
-									
-									console.log("IT HAS THE PARAM NAME!")
-									const newurl = new URL(encodeURI(parsedurl))
-									newurl.searchParams.delete(parameterName)
-									parsedurl = decodeURI(newurl.href)
 								}
 
-								// Remove the base URL itself
+								if (parsedurl.startsWith("http") || parsedurl.startsWith("ftp")) {
-								if (parsedurl !== undefined && baseUrl !== undefined && baseUrl.length > 0 && parsedurl.includes(baseUrl)) {
+									if (parsedurl !== undefined && parsedurl.includes(parameterName)) {
-									parsedurl = parsedurl.replace(baseUrl, "")
+										// Remove <> etc.
-								}
+										// 
+										
+										console.log("IT HAS THE PARAM NAME!")
+										const newurl = new URL(encodeURI(parsedurl))
+										newurl.searchParams.delete(parameterName)
+										parsedurl = decodeURI(newurl.href)
+									}
 
-								// Check URL query && headers 
+									// Remove the base URL itself
-								setActionField("url", parsedurl)
+									if (parsedurl !== undefined && baseUrl !== undefined && baseUrl.length > 0 && parsedurl.includes(baseUrl)) {
-								setUrlPath(parsedurl)
+										parsedurl = parsedurl.replace(baseUrl, "")
+									}
+
+									// Check URL query && headers 
+									setActionField("url", parsedurl)
+									setUrlPath(parsedurl)
+								}
 							}
 
 							//console.log("URL: ", request.url)

frontend/src/Docs.js

@@ -58,8 +58,6 @@ const Docs = (props) => {
 
 		// Continue this, and find the h2 with the data in it lol
 		if (window.location.hash.length > 0) {
-			console.log("HELLO")
-
 			var parent = document.getElementById("markdown_wrapper")
 			if (parent !== null) {
 				var elements = parent.getElementsByTagName('h2')
@@ -166,6 +164,7 @@ const Docs = (props) => {
 		flex: "1",
 		maxWidth: 750,
 		overflow: "hidden",
+		paddingBottom: 200, 
 	}
 
 	function OuterLink(props) {
@@ -180,15 +179,20 @@ const Docs = (props) => {
 	}
 
 	function CodeHandler(props) {
-		return <code style={{padding: 5, backgroundColor: inputColor}}>{props.value}</code>
+		return (
+			<pre style={{padding: 10, minWidth: "50%", maxWidth: "100%", backgroundColor: inputColor}}>
+				<code>
+					{props.value}
+				</code>
+			</pre>
+		)
 	}
 
 	function Heading(props) {
 		const element = React.createElement(`h${props.level}`, {style: {marginTop: 25}}, props.children)
-		console.log(props)
 		return (
 			<span>
-				<Divider style={{width: "90%", marginTop: 25, backgroundColor: inputColor}} />
+				{props.level !== 1 ? <Divider style={{width: "90%", marginTop: 25, backgroundColor: inputColor}} /> : null}
 				{element}
 			</span>
 		)
@@ -208,11 +212,6 @@ const Docs = (props) => {
 		<div style={Body}>
 			<div style={SideBar}>
 				<ul style={{listStyle: "none", paddingLeft: "0"}}>
-					<li style={{marginTop: "10px"}}>
-						<a style={hrefStyle} href="/">
-							<h2>Home</h2>
-						</a>
-					</li>
 					{list.map(item => {
 						const path = "/docs/"+item
 						const newname = item.charAt(0).toUpperCase()+item.substring(1).split("_").join(" ")

functions/onprem/orborus/orborus.go

@@ -106,9 +106,9 @@ func deployWorker(cli *dockerclient.Client, image string, identifier string, env
 
 	err = cli.ContainerStart(context.Background(), cont.ID, types.ContainerStartOptions{})
 	if err != nil {
-		log.Printf("Failed to start container: %s", err)
+		log.Printf("Failed to start container in environment %s: %s", environment, err)
 	} else {
-		log.Printf("Container %s is created", cont.ID)
+		log.Printf("Container %s was created under environment %s", cont.ID, environment)
 	}
 	return nil
 }
@@ -401,7 +401,7 @@ func main() {
 			//log.Println(string(body))
 			//log.Println(resultResp)
 			if len(toBeRemoved.Data) == len(executionRequests.Data) {
-				log.Println("Should remove ALL!")
+				//log.Println("Should remove ALL!")
 			} else {
 				log.Printf("NOT IMPLEMENTED: Should remove %d workflows from backend because they're executed!", len(toBeRemoved.Data))
 			}