improving workflows

pkg/templates/compile.go

@@ -119,6 +119,7 @@ func (template *Template) parseSelfContainedRequests() {
 }
 
 // Requests returns the total request count for the template
+// this does not include workflows
 func (template *Template) Requests() int {
 	return len(template.RequestsDNS) +
 		len(template.RequestsHTTP) +
@@ -342,6 +343,10 @@ func parseTemplate(data []byte, options protocols.ExecutorOptions) (*Template, e
 		return nil, errors.New("no template author field provided")
 	}
 
+	if len(template.Workflows) > 0 && template.Requests() > 0 {
+		return nil, errors.New("workflows cannot have other protocols")
+	}
+
 	// use default unknown severity
 	if len(template.Workflows) == 0 {
 		if template.Info.SeverityHolder.Severity == severity.Undefined {

pkg/templates/compile_test.go

@@ -197,3 +197,12 @@ func Test_WrongTemplate(t *testing.T) {
 	require.Nil(t, got, "could not parse template")
 	require.ErrorContains(t, err, "no requests defined ")
 }
+
+func TestWrongWorkflow(t *testing.T) {
+	setup()
+
+	filePath := "tests/workflow-invalid.yaml"
+	got, err := templates.Parse(filePath, nil, executerOpts)
+	require.Nil(t, got, "could not parse template")
+	require.ErrorContains(t, err, "workflows cannot have other protocols")
+}

pkg/templates/templates.go

@@ -177,8 +177,6 @@ func (template *Template) Type() types.ProtocolType {
 		return types.HeadlessProtocol
 	case len(template.RequestsNetwork) > 0:
 		return types.NetworkProtocol
-	case len(template.Workflow.Workflows) > 0:
-		return types.WorkflowProtocol
 	case len(template.RequestsSSL) > 0:
 		return types.SSLProtocol
 	case len(template.RequestsWebsocket) > 0:
@@ -189,6 +187,8 @@ func (template *Template) Type() types.ProtocolType {
 		return types.CodeProtocol
 	case len(template.RequestsJavascript) > 0:
 		return types.JavascriptProtocol
+	case len(template.Workflow.Workflows) > 0:
+		return types.WorkflowProtocol
 	default:
 		return types.InvalidProtocol
 	}

pkg/templates/tests/workflow-invalid.yaml

@@ -0,0 +1,18 @@
+id: workflow-example
+
+info:
+  name: Test Invalid Workflow Template
+  author: pdteam
+  severity: info
+
+http:
+  - raw:
+      - |
+        POST /re HTTP/1.1
+        Host: {{Hostname}}
+
+        {{code_response}}
+
+workflows:
+  - template: tests/match-1.yaml
+  - template: tests/match-1.yaml