Add severity to executable tags

projectdiscovery · Mar 13, 2021 · d8bb580 · d8bb580
1 parent f6fc4e5
commit d8bb580
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/v2/internal/runner/templates.go b/v2/internal/runner/templates.go
@@ -47,7 +47,7 @@ func (r *Runner) getParsedTemplatesFor(templatePaths, severities []string, workf
 			parsedTemplates[t.ID] = t
 			gologger.Info().Msgf("%s\n", r.templateLogMsg(t.ID, types.ToString(t.Info["name"]), types.ToString(t.Info["author"]), sev))
 		} else {
-			gologger.Error().Msgf("Excluding template %s due to severity filter (%s not in [%s])", t.ID, sev, severities)
+			gologger.Warning().Msgf("Excluding template %s due to severity filter (%s not in [%s])", t.ID, sev, severities)
 		}
 	}
 	return parsedTemplates, workflowCount

diff --git a/v2/pkg/templates/compile.go b/v2/pkg/templates/compile.go
@@ -50,7 +50,7 @@ func Parse(filePath string, options protocols.ExecuterOptions) (*Template, error
 		if !ok {
 			return nil, nil
 		}
-		if err := matchTemplateWithTags(types.ToString(templateTags), options.Options); err != nil {
+		if err := matchTemplateWithTags(types.ToString(templateTags), types.ToString(template.Info["severity"]), options.Options); err != nil {
 			return nil, nil
 		}
 	}
@@ -200,8 +200,11 @@ func (t *Template) parseWorkflowTemplate(workflow *workflows.WorkflowTemplate, o
 }
 
 // matchTemplateWithTags matches if the template matches a tag
-func matchTemplateWithTags(tags string, options *types.Options) error {
+func matchTemplateWithTags(tags, severity string, options *types.Options) error {
 	actualTags := strings.Split(tags, ",")
+	if severity != "" {
+		actualTags = append(actualTags, severity) // also add severity to tag
+	}
 
 	matched := false
 mainLoop:

diff --git a/v2/pkg/templates/compile_test.go b/v2/pkg/templates/compile_test.go
@@ -8,25 +8,30 @@ import (
 )
 
 func TestMatchTemplateWithTags(t *testing.T) {
-	err := matchTemplateWithTags("php,linux,symfony", &types.Options{Tags: []string{"php"}})
+	err := matchTemplateWithTags("php,linux,symfony", "", &types.Options{Tags: []string{"php"}})
 	require.Nil(t, err, "could not get php tag from input slice")
 
-	err = matchTemplateWithTags("lang:php,os:linux,cms:symfony", &types.Options{Tags: []string{"cms:symfony"}})
+	err = matchTemplateWithTags("lang:php,os:linux,cms:symfony", "", &types.Options{Tags: []string{"cms:symfony"}})
 	require.Nil(t, err, "could not get php tag from input key value")
 
-	err = matchTemplateWithTags("lang:php,os:linux,symfony", &types.Options{Tags: []string{"cms:symfony"}})
+	err = matchTemplateWithTags("lang:php,os:linux,symfony", "", &types.Options{Tags: []string{"cms:symfony"}})
 	require.NotNil(t, err, "could get key value tag from input key value")
 
-	err = matchTemplateWithTags("lang:php,os:linux,cms:jira", &types.Options{Tags: []string{"cms:symfony"}})
+	err = matchTemplateWithTags("lang:php,os:linux,cms:jira", "", &types.Options{Tags: []string{"cms:symfony"}})
 	require.NotNil(t, err, "could get key value tag from input key value")
 
 	t.Run("space", func(t *testing.T) {
-		err = matchTemplateWithTags("lang:php, os:linux, cms:symfony", &types.Options{Tags: []string{"cms:symfony"}})
+		err = matchTemplateWithTags("lang:php, os:linux, cms:symfony", "", &types.Options{Tags: []string{"cms:symfony"}})
 		require.Nil(t, err, "could get key value tag from input key value with space")
 	})
 
 	t.Run("comma-tags", func(t *testing.T) {
-		err = matchTemplateWithTags("lang:php,os:linux,cms:symfony", &types.Options{Tags: []string{"test,cms:symfony"}})
+		err = matchTemplateWithTags("lang:php,os:linux,cms:symfony", "", &types.Options{Tags: []string{"test,cms:symfony"}})
 		require.Nil(t, err, "could get key value tag from input key value with comma")
 	})
+
+	t.Run("severity", func(t *testing.T) {
+		err = matchTemplateWithTags("lang:php,os:linux,cms:symfony", "low", &types.Options{Tags: []string{"low"}})
+		require.Nil(t, err, "could get key value tag for severity")
+	})
 }