Merge pull request #60 from coreruleset/test/double-colon-test

test: colon in collection arguments

Author: Agustindeleon

g4/SecLangParser.g4

@@ -29,8 +29,8 @@ stmt:
     | comment? rule_script_directive file_path actions?
     | comment? rule_script_directive QUOTE file_path QUOTE actions?
     | comment? remove_rule_by_id remove_rule_by_id_values+
-    | comment? string_remove_rules values
-    | comment? string_remove_rules QUOTE values QUOTE
+    | comment? string_remove_rules string_remove_rules_values
+    | comment? string_remove_rules QUOTE string_remove_rules_values QUOTE
     | comment? update_target_rules update_target_rules_values update_variables
     | comment? update_target_rules QUOTE update_target_rules_values QUOTE update_variables
     | comment? update_target_rules update_target_rules_values update_variables PIPE new_target
@@ -151,6 +151,12 @@ string_remove_rules:
     | CONFIG_SEC_RULE_REMOVE_BY_TAG # remove_rule_by_tag
     ;
 
+string_remove_rules_values:
+    STRING
+    | VARIABLE_NAME
+    | COMMA_SEPARATED_STRING
+    ;
+
 update_target_rules:
     CONFIG_SEC_RULE_UPDATE_TARGET_BY_ID # update_target_by_id
     | CONFIG_SEC_RULE_UPDATE_TARGET_BY_MSG # update_target_by_msg
@@ -232,9 +238,8 @@ values:
     ;
 
 action_ctl_target_value:
-    (INT | IDENT | SINGLE_QUOTE string_literal SINGLE_QUOTE | VARIABLE_NAME) SEMI variable_enum
-    | (INT | IDENT | SINGLE_QUOTE string_literal SINGLE_QUOTE | VARIABLE_NAME) SEMI collection_enum (COLON collection_value)?
-
+    (ctl_id | SINGLE_QUOTE string_literal SINGLE_QUOTE | VARIABLE_NAME) SEMI variable_enum
+    | (ctl_id | SINGLE_QUOTE string_literal SINGLE_QUOTE | VARIABLE_NAME) SEMI collection_enum (COLON collection_value)?
     ;
 
 update_target_rules_values:
@@ -493,4 +498,9 @@ assignment:
 
 var_assignment:
     VAR_ASSIGNMENT
+    ;
+
+ctl_id:
+    INT
+    | IDENT
     ;

listener.go

@@ -28,7 +28,7 @@ type ParserResult struct {
 	rangeEndEvents        []int
 	setvarCollections     []string
 	setvarNames           []string
-	setvarOperations      []string
+	assignmentOperations  []string
 }
 
 type TreeShapeListener struct {
@@ -104,7 +104,7 @@ func (l *TreeShapeListener) EnterRemove_rule_by_tag(ctx *parser.Remove_rule_by_t
 	l.results.directiveList = append(l.results.directiveList, ctx.GetText())
 }
 
-func (l *TreeShapeListener) EnterValues(ctx *parser.ValuesContext) {
+func (l *TreeShapeListener) EnterString_remove_rules_values(ctx *parser.String_remove_rules_valuesContext) {
 	l.results.directiveValues = append(l.results.directiveValues, ctx.GetText())
 }
 
@@ -169,9 +169,17 @@ func (l *TreeShapeListener) EnterSetvar_stmt(ctx *parser.Setvar_stmtContext) {
 }
 
 func (l *TreeShapeListener) EnterAssignment(ctx *parser.AssignmentContext) {
-	l.results.setvarOperations = append(l.results.setvarOperations, ctx.GetText())
+	l.results.assignmentOperations = append(l.results.assignmentOperations, ctx.GetText())
 }
 
 func (l *TreeShapeListener) EnterVar_assignment(ctx *parser.Var_assignmentContext) {
 	l.results.directiveValues = append(l.results.directiveValues, ctx.GetText())
 }
+
+func (l *TreeShapeListener) EnterCtl_action(ctx *parser.Ctl_actionContext) {
+	l.results.directiveValues = append(l.results.directiveValues, ctx.GetText())
+}
+
+func (l *TreeShapeListener) EnterCtl_id(ctx *parser.Ctl_idContext) {
+	l.results.directiveValues = append(l.results.directiveValues, ctx.GetText())
+}

parser/seclang_parser.go

@@ -342,10 +342,23 @@ var checkOutputTests = map[string]struct {
 			directiveList:        []string{"SecRule", "SecRule", "SecRule"},
 			setvarCollections:    []string{"tx", "tx", "tx", "tx", "tx", "tx"},
 			setvarNames:          []string{"var1", "var2", "var2", "var2", "header_name_920450_%{tx.0}", "inbound_anomaly_score_pl1"},
-			setvarOperations:     []string{"=", "=", "=+", "=-", "=", "=+"},
+			assignmentOperations: []string{"=", "=", "=+", "=-", "=", "=+"},
 			directiveValues:      []string{"bar", "0", "2", "1", "/%{tx.0}/", "%{tx.critical_anomaly_score}"},
 		},
 	},
+	"testdata/test_43_colon.conf": {
+		0,
+		"",
+		ParserResult{
+			collections:     []string{"TX", "TX"},
+			operatorList:    []string{"unconditionalMatch"},
+			directiveList:   []string{"SecRule"},
+			collectionArgs:  []string{"paramcounter_ARGS_NAMES:folders.folders", "paramcounter_ARGS_NAMES:folders.folders"},
+			directiveValues: []string{"ruleRemoveTargetById", "921180"},
+			// directiveValues:      []string{"ruleRemoveTargetById", "921180;TX:paramcounter_ARGS_NAMES:folders.folders", "921180"},
+			assignmentOperations: []string{"="},
+		},
+	},
 }
 
 func TestSecLang(t *testing.T) {