UI: RuleTextParser: Fix bracket values end line

tnodir · Nov 30, 2024 · 17b54ef · 17b54ef
1 parent f63adad
commit 17b54ef
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/tests/UtilTest/tst_ruletextparser.h b/src/tests/UtilTest/tst_ruletextparser.h
@@ -409,7 +409,6 @@ TEST_F(RuleTextParserTest, lineBracketValues)
     ASSERT_EQ(p.ruleFilters().size(), 5);
 }
 
-
 TEST_F(RuleTextParserTest, lineIpPortSubList)
 {
     RuleTextParser p("{1}\n2");
@@ -418,3 +417,20 @@ TEST_F(RuleTextParserTest, lineIpPortSubList)
 
     ASSERT_EQ(p.ruleFilters().size(), 7);
 }
+
+TEST_F(RuleTextParserTest, linesNotBracketValues)
+{
+    RuleTextParser p("!(1.1.1.1)\n!(2.2.2.2)");
+
+    ASSERT_TRUE(p.parse());
+
+    ASSERT_EQ(p.ruleFilters().size(), 5);
+
+    // Check Last IP
+    {
+        const RuleFilter &rf = p.ruleFilters()[4];
+        ASSERT_TRUE(rf.isNot);
+        ASSERT_EQ(rf.type, FORT_RULE_FILTER_TYPE_ADDRESS);
+        checkStringList(rf.values, { "2.2.2.2" });
+    }
+}
diff --git a/src/ui/util/conf/ruletextparser.cpp b/src/ui/util/conf/ruletextparser.cpp
@@ -356,7 +356,7 @@ bool RuleTextParser::parseBracketValue(RuleCharTypes expectedSeparator)
     }
 
     if (hasParsedCharTypes(CharBracketEnd)) {
-        returnToCharType(CharBracketEnd); // Unget new lines
+        checkBracketValueEnd();
         return false;
     }
 
@@ -385,6 +385,8 @@ bool RuleTextParser::checkBracketValueEnd()
         return false;
     }
 
+    returnToCharType(CharBracketEnd); // Unget new lines
+
     return true;
 }