Merge pull request #316 from vzamanillo/workflow-results

Fix for return workflow results
projectdiscovery · Sep 19, 2020 · f00d38e · f00d38e
2 parents 57fa83c + 407a89a
commit f00d38e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/internal/runner/processor.go b/internal/runner/processor.go
@@ -118,12 +118,14 @@ func (r *Runner) processTemplateWithList(ctx context.Context, p progress.IProgre
 }
 
 // ProcessWorkflowWithList coming from stdin or list of targets
-func (r *Runner) processWorkflowWithList(p progress.IProgress, workflow *workflows.Workflow) {
+func (r *Runner) processWorkflowWithList(p progress.IProgress, workflow *workflows.Workflow) bool {
+	result := false
+
 	workflowTemplatesList, err := r.preloadWorkflowTemplates(p, workflow)
 	if err != nil {
 		gologger.Warningf("Could not preload templates for workflow %s: %s\n", workflow.ID, err)
 
-		return
+		return result
 	}
 
 	logicBytes := []byte(workflow.Logic)
@@ -143,25 +145,39 @@ func (r *Runner) processWorkflowWithList(p progress.IProgress, workflow *workflo
 			script := tengo.NewScript(logicBytes)
 			script.SetImports(stdlib.GetModuleMap(stdlib.AllModuleNames()...))
 
+			variables := make(map[string]*workflows.NucleiVar)
+
 			for _, workflowTemplate := range *workflowTemplatesList {
-				err := script.Add(workflowTemplate.Name, &workflows.NucleiVar{Templates: workflowTemplate.Templates, URL: targetURL})
+				name := workflowTemplate.Name
+				variable := &workflows.NucleiVar{Templates: workflowTemplate.Templates, URL: targetURL}
+				err := script.Add(name, variable)
 				if err != nil {
 					gologger.Errorf("Could not initialize script for workflow '%s': %s\n", workflow.ID, err)
 
 					continue
 				}
+				variables[name] = variable
 			}
 
 			_, err := script.RunContext(context.Background())
 			if err != nil {
 				gologger.Errorf("Could not execute workflow '%s': %s\n", workflow.ID, err)
 			}
 
+			for _, variable := range variables {
+				result = variable.IsFalsy()
+				if result {
+					break
+				}
+			}
+
 			<-r.limiter
 		}(targetURL)
 	}
 
 	wg.Wait()
+
+	return result
 }
 
 func (r *Runner) preloadWorkflowTemplates(p progress.IProgress, workflow *workflows.Workflow) (*[]workflowTemplates, error) {

diff --git a/internal/runner/runner.go b/internal/runner/runner.go
@@ -254,8 +254,7 @@ func (r *Runner) RunEnumeration() {
 						results.Or(r.processTemplateWithList(ctx, p, tt, request))
 					}
 				case *workflows.Workflow:
-					workflow := template.(*workflows.Workflow)
-					r.processWorkflowWithList(p, workflow)
+					results.Or(r.processWorkflowWithList(p, template.(*workflows.Workflow)))
 				}
 			}(t)
 		}