Merge pull request #71 from coreruleset/chore/separate-variable-events

chore: divide variable listener events

Author: Agustindeleon

g4/SecLangLexer.g4

@@ -498,11 +498,8 @@ VARIABLE_NAME_ENUM:
 	| 'USERAGENT_IP'
 	| 'USERID'
 	| 'WEBAPPID'
-	| 'WEBSERVER_ERROR_LOG') -> pushMode(VARIABLE_FOUND)
-	;
-
-UNKNOWN_VARIABLES:
-	('MSC_PCRE_ERROR'
+	| 'WEBSERVER_ERROR_LOG'
+	| 'MSC_PCRE_ERROR'
 	| 'MULTIPART_BOUNDARY_QUOTED'
 	| 'MULTIPART_BOUNDARY_WHITESPACE'
 	| 'MULTIPART_DATA_AFTER'

g4/SecLangParser.g4

@@ -242,8 +242,8 @@ values:
     ;
 
 action_ctl_target_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)?
+    (ctl_id | SINGLE_QUOTE string_literal SINGLE_QUOTE | VARIABLE_NAME) SEMI ctl_variable_enum
+    | (ctl_id | SINGLE_QUOTE string_literal SINGLE_QUOTE | VARIABLE_NAME) SEMI ctl_collection_enum (COLON ctl_collection_value)?
     ;
 
 update_target_rules_values:
@@ -333,19 +333,26 @@ new_target:
 var_stmt:
     variable_enum
     | collection_enum (COLON collection_value)?
-
     ;
 
 variable_enum:
     VARIABLE_NAME_ENUM
-    | UNKNOWN_VARIABLES
+    ;
+
+ctl_variable_enum:
+    VARIABLE_NAME_ENUM
     ;
 
 collection_enum:
     COLLECTION_NAME_ENUM
     | RUN_TIME_VAR_XML
     ;
 
+ctl_collection_enum:
+    COLLECTION_NAME_ENUM
+    | RUN_TIME_VAR_XML
+    ;
+
 actions:
     QUOTE action (COMMA action)* QUOTE
     ;
@@ -482,6 +489,11 @@ collection_value:
     | COLLECTION_ELEMENT_VALUE
     ;
 
+ctl_collection_value:
+    | XPATH_EXPRESSION
+    | COLLECTION_ELEMENT_VALUE
+    ;
+
 setvar_action:
     col_name DOT setvar_stmt assignment var_assignment
     ;

listener.go

@@ -150,6 +150,10 @@ func (l *TreeShapeListener) EnterEngine_config_rule_directive(ctx *parser.Engine
 	l.results.DirectiveList = append(l.results.DirectiveList, ctx.GetText())
 }
 
+func (l *TreeShapeListener) EnterConfig_dir_sec_action(ctx *parser.Config_dir_sec_actionContext) {
+	l.results.DirectiveList = append(l.results.DirectiveList, ctx.GetText())
+}
+
 func (l *TreeShapeListener) EnterOperator_name(ctx *parser.Operator_nameContext) {
 	l.results.OperatorList = append(l.results.OperatorList, ctx.GetText())
 }