Merge pull request #57 from GSI-Fing-Udelar/main

feat: update setvar flow

Author: fzipi

g4/SecLangLexer.g4

@@ -308,7 +308,7 @@ ACTION_SETUID
 	;
 
 ACTION_SETVAR
-	: 'setvar'
+	: 'setvar' -> pushMode(SETVAR)
 	;
 
 ACTION_SEVERITY
@@ -1143,47 +1143,87 @@ STRING
 mode MACRO;
 
 MACRO_EXPANSION
-    : VARIABLE_NAME '}' -> popMode
+    : (LETTER | DIGIT) (LETTER | DIGIT | '_' | '-' | '.')* '}' -> popMode
 	;
 
 mode SETVAR;
 
+COLON_SETVAR
+   : ':' -> type(COLON)
+   ;
+
 SINGLE_QUOTE_SETVAR
     : '\'' -> type(SINGLE_QUOTE)
     ;
 
+COLLECTION_NAME_SETVAR
+	: ('ip'
+	| 'IP'
+	| 'global'
+	| 'GLOBAL'
+	| 'resource'
+	| 'RESOURCE'
+	| 'session'
+	| 'SESSION'
+	| 'user'
+	| 'USER'
+	| 'tx'
+	| 'TX')
+	;
+
+DOT
+	: '.'
+	;
+
 COLLECTION_ELEMENT
-    : ('t'|'T') ('x'|'X') '.' (LETTER) (LETTER | DIGIT | '_' | '-')* -> popMode
+    : (LETTER | DIGIT) (LETTER | DIGIT | '_' | '-')*
     ;
 
 COLLECTION_WITH_MACRO
-    : 'tx.' IDENT '{%' -> mode(MACRO)
+    : '%{' -> pushMode(MACRO)
     ;
 
-VAR_ASSIGNMENT
-	: ~('\''|' ')+ -> popMode
-	;
-
 EQUAL_SETVAR
-	: '=' -> type(EQUAL)
+	: '=' -> type(EQUAL), pushMode(SETVAR_ASSIGNMENT)
 	;
 
 EQUALS_PLUS_SETVAR
-	: EQUAL_SETVAR '+' -> type(EQUALS_PLUS)
+	: EQUAL_SETVAR '+' -> type(EQUALS_PLUS), pushMode(SETVAR_ASSIGNMENT)
 	;
 
 EQUALS_MINUS_SETVAR
-	: EQUAL_SETVAR '-' -> type(EQUALS_MINUS)
+	: EQUAL_SETVAR '-' -> type(EQUALS_MINUS), pushMode(SETVAR_ASSIGNMENT)
 	;
 
 
+mode SETVAR_ASSIGNMENT;
+
+VAR_ASSIGNMENT
+	: ('\\\''|~('\''|','|'"'))+
+	;
+
+SINGLE_QUOTE_SETVAR_ASSIGNMENT
+    : '\'' -> type(SINGLE_QUOTE), pushMode(DEFAULT_MODE)
+    ;
+
+QUOTE_SETVAR_ASSIGNMENT
+    : '"' -> type(QUOTE), pushMode(DEFAULT_MODE)
+    ;
+
+COMMA_SETVAR_ASSIGNMENT
+    : ',' -> type(COMMA), pushMode(DEFAULT_MODE)
+    ;
+
+SPACE_SETVAR_ASSIGNMENT
+    : WS -> skip
+    ;
+
 mode COMMA_SEPARATED_STRING_MODE;
 
 COLON_COMMA_STRING
 	: COLON_DEFAULT -> type(COLON)
 	;
 
-
 COMMA_SEPARATED_STRING
     : ~([:,"])+ -> popMode
     ;

g4/SecLangParser.g4

@@ -225,7 +225,6 @@ values:
     | CONFIG_VALUE_PATH
     | STRING
     | VARIABLE_NAME
-    | VAR_ASSIGNMENT
     | COMMA_SEPARATED_STRING
     | ACTION_CTL_BODY_PROCESSOR_TYPE
     | AUDIT_PARTS
@@ -434,6 +433,7 @@ flow_action_with_params:
 
 action_value:
     action_value_types
+    | SINGLE_QUOTE action_value_types SINGLE_QUOTE
     | SINGLE_QUOTE string_literal SINGLE_QUOTE
     ;
 
@@ -474,17 +474,23 @@ collection_value:
     ;
 
 setvar_action:
-    setvar_stmt assignment values
+    col_name DOT setvar_stmt assignment var_assignment
+    ;
+
+col_name:
+    COLLECTION_NAME_SETVAR
     ;
 
 setvar_stmt:
-    COLLECTION_ELEMENT
-    | COLLECTION_WITH_MACRO
-    | VARIABLE_NAME
+    (COLLECTION_ELEMENT | COLLECTION_WITH_MACRO MACRO_EXPANSION) +
     ;
 
 assignment:
     EQUAL
     | EQUALS_PLUS
     | EQUALS_MINUS
     ;
+
+var_assignment:
+    VAR_ASSIGNMENT
+    ;

listener.go

@@ -26,6 +26,9 @@ type ParserResult struct {
 	rangeEvents           []string
 	rangeStartEvents      []int
 	rangeEndEvents        []int
+	setvarCollections     []string
+	setvarNames           []string
+	setvarOperations      []string
 }
 
 type TreeShapeListener struct {
@@ -156,3 +159,19 @@ func (l *TreeShapeListener) EnterOperator_value(ctx *parser.Operator_valueContex
 func (l *TreeShapeListener) EnterOperator_not(ctx *parser.Operator_notContext) {
 	l.results.negatedOperatorCount++
 }
+
+func (l *TreeShapeListener) EnterCol_name(ctx *parser.Col_nameContext) {
+	l.results.setvarCollections = append(l.results.setvarCollections, ctx.GetText())
+}
+
+func (l *TreeShapeListener) EnterSetvar_stmt(ctx *parser.Setvar_stmtContext) {
+	l.results.setvarNames = append(l.results.setvarNames, ctx.GetText())
+}
+
+func (l *TreeShapeListener) EnterAssignment(ctx *parser.AssignmentContext) {
+	l.results.setvarOperations = append(l.results.setvarOperations, ctx.GetText())
+}
+
+func (l *TreeShapeListener) EnterVar_assignment(ctx *parser.Var_assignmentContext) {
+	l.results.directiveValues = append(l.results.directiveValues, ctx.GetText())
+}