Merge pull request CactuseSecurity#2209 from CactuseSecurity/develop

Main fix git mix-up
NilsPur · Jul 27, 2023 · 8abd825 · 8abd825
2 parents 2349f64 + f6644e8
commit 8abd825
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/roles/lib/files/FWO.Report.Filter/Scanner.cs b/roles/lib/files/FWO.Report.Filter/Scanner.cs
@@ -145,20 +145,14 @@ private List<Token> TryExtractToken(int beginPosition, string text, bool surroun
 
                 if (noWhitespaceTokens.TryGetValue(tokenText, out TokenKind tokenKind))
                 {
-                    Token realToken = validToken;
-
-                    if (!IsWhitespaceOrEnd(beginPosition + potentialTokenText.Length))
+                    if (!IsWhitespaceOrEnd(beginPosition + text.Length) &&
+                        noWhitespaceTokens.TryGetValue(tokenText + input[beginPosition + text.Length], out TokenKind realTokenKind))
                     {
-                        foreach (Token longerToken in noWhitespaceTokens)
-                        {
-                            if (longerToken != validToken && (potentialTokenText + input[beginPosition + potentialTokenText.Length]).EndsWith(longerToken.Text))
-                            {
-                                position++;
-                                realToken = longerToken;
-                                potentialTokenText += input[beginPosition + potentialTokenText.Length];
-                                break;
-                            }
-                        }
+                        tokenLength++;
+                        position++;
+                        tokenKind = realTokenKind;
+                        tokenText += input[beginPosition + text.Length];
+                        text += input[beginPosition + text.Length];                      
                     }
 
                     if (text.Length - tokenLength > 0)

diff --git a/roles/test/files/FWO.Test/FilterTest.cs b/roles/test/files/FWO.Test/FilterTest.cs
@@ -137,11 +137,5 @@ public void Brackets()
             var res = Compiler.Compile(t);
         }
 
-
-        [Test]
-        public void Brackets()
-        {
-            var res = Compiler.Compile("src=a&(dst=c)", ReportType.Rules);
-        }
     }
 }