Changeset 181840 in webkit

Timestamp:

Mar 22, 2015, 7:04:11 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

Detect when url filter pattern with groups match the empty string
​https://bugs.webkit.org/show_bug.cgi?id=142930

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2015-03-22
Reviewed by Sam Weinig.

Source/WebCore:

The previous test was only accounting for simple atoms. This patch extends
it to groups.

• contentextensions/URLFilterParser.cpp:

(WebCore::ContentExtensions::Term::quantify):
(WebCore::ContentExtensions::Term::matchesAtLeastOneCharacter):
(WebCore::ContentExtensions::GraphBuilder::finalize):
(WebCore::ContentExtensions::Term::quantifier): Deleted.

Tools:

• TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/contentextensions/URLFilterParser.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-22  Benjamin Poulain  <bpoulain@apple.com>
+
+        Detect when url filter pattern with groups match the empty string
+        https://bugs.webkit.org/show_bug.cgi?id=142930
+
+        Reviewed by Sam Weinig.
+
+        The previous test was only accounting for simple atoms. This patch extends
+        it to groups.
+
+        * contentextensions/URLFilterParser.cpp:
+        (WebCore::ContentExtensions::Term::quantify):
+        (WebCore::ContentExtensions::Term::matchesAtLeastOneCharacter):
+        (WebCore::ContentExtensions::GraphBuilder::finalize):
+        (WebCore::ContentExtensions::Term::quantifier): Deleted.
+
 2015-03-22  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/contentextensions/URLFilterParser.cpp

@@ -176 +176 @@
         m_quantifier = quantifier;
     }
-    AtomQuantifier quantifier() const { return m_quantifier; }
 
     unsigned generateGraph(NFA& nfa, uint64_t patternId, unsigned start) const
@@ -225 +224 @@
     {
         return m_termType == TermType::CharacterSet && m_atomData.characterSet.characters.bitCount() == 1 && m_atomData.characterSet.characters.get(0);
+    }
+
+    bool matchesAtLeastOneCharacter() const
+    {
+        ASSERT(isValid());
+
+        if (m_quantifier == AtomQuantifier::ZeroOrOne || m_quantifier == AtomQuantifier::ZeroOrMore)
+            return false;
+        if (isEndOfLineAssertion())
+            return false;
+
+        if (m_termType == TermType::Group) {
+            for (const Term& term : m_atomData.group.terms) {
+                if (term.matchesAtLeastOneCharacter())
+                    return true;
+            }
+            return false;
+        }
+        return true;
     }
 
@@ -445 +463 @@
         bool matchesEverything = true;
         for (const auto& term : m_sunkTerms) {
-            if (term.quantifier() == AtomQuantifier::One || term.quantifier() == AtomQuantifier::OneOrMore) {
+            if (term.matchesAtLeastOneCharacter()) {
                 matchesEverything = false;
                 break;

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-22  Benjamin Poulain  <bpoulain@apple.com>
+
+        Detect when url filter pattern with groups match the empty string
+        https://bugs.webkit.org/show_bug.cgi?id=142930
+
+        Reviewed by Sam Weinig.
+
+        * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+
 2015-03-22  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp

@@ -405 +405 @@
 }
 
+TEST_F(ContentExtensionTest, PatternMatchingTheEmptyString)
+{
+    // Simple atoms.
+    testPatternStatus(".*", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("a*", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus(".?", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("a?", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+
+    // Character sets.
+    testPatternStatus("[a-z]*", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("[a-z]?", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+
+    // Groups.
+    testPatternStatus("(foobar)*", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("(foobar)?", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("(.*)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("(a*)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("(.?)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("(a?)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("([a-z]*)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+    testPatternStatus("([a-z]?)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+
+    // Nested groups.
+    testPatternStatus("((foo)?((.)*)(bar)*)", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
+}
+
 } // namespace TestWebKitAPI