<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181762] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181762">181762</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-19 15:37:35 -0700 (Thu, 19 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Extensions] Test regular expression parse failures.
https://bugs.webkit.org/show_bug.cgi?id=142872
Reviewed by Benjamin Poulain.
Source/WebCore:
* contentextensions/URLFilterParser.cpp:
(WebCore::ContentExtensions::GraphBuilder::finalize):
(WebCore::ContentExtensions::GraphBuilder::quantifyAtom):
(WebCore::ContentExtensions::URLFilterParser::addPattern):
(WebCore::ContentExtensions::URLFilterParser::statusString):
* contentextensions/URLFilterParser.h:
Changed failures that can never happen to assertions.
Tools:
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::testPatternStatus):
(TestWebKitAPI::TEST_F):
Added tests for each parsing status.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsURLFilterParsercpp">trunk/Source/WebCore/contentextensions/URLFilterParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsURLFilterParserh">trunk/Source/WebCore/contentextensions/URLFilterParser.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181761 => 181762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-19 22:36:43 UTC (rev 181761)
+++ trunk/Source/WebCore/ChangeLog 2015-03-19 22:37:35 UTC (rev 181762)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-03-19 Alex Christensen <achristensen@webkit.org>
+
+ [Content Extensions] Test regular expression parse failures.
+ https://bugs.webkit.org/show_bug.cgi?id=142872
+
+ Reviewed by Benjamin Poulain.
+
+ * contentextensions/URLFilterParser.cpp:
+ (WebCore::ContentExtensions::GraphBuilder::finalize):
+ (WebCore::ContentExtensions::GraphBuilder::quantifyAtom):
+ (WebCore::ContentExtensions::URLFilterParser::addPattern):
+ (WebCore::ContentExtensions::URLFilterParser::statusString):
+ * contentextensions/URLFilterParser.h:
+ Changed failures that can never happen to assertions.
+
</ins><span class="cx"> 2015-03-19 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> <attachment> should put URLs on the pasteboard so that Finder can accept drops.
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsURLFilterParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/URLFilterParser.cpp (181761 => 181762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/URLFilterParser.cpp 2015-03-19 22:36:43 UTC (rev 181761)
+++ trunk/Source/WebCore/contentextensions/URLFilterParser.cpp 2015-03-19 22:37:35 UTC (rev 181762)
</span><span class="lines">@@ -477,15 +477,10 @@
</span><span class="cx"> m_subtreeEnd = m_lastPrefixTreeEntry->nfaNode;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_openGroups.isEmpty()) {
- fail(URLFilterParser::UnclosedGroups);
- return;
- }
-
- if (m_subtreeStart != m_subtreeEnd)
- m_nfa.setFinal(m_subtreeEnd, m_patternId);
- else
- fail(URLFilterParser::CannotMatchAnything);
</del><ins>+ ASSERT_WITH_MESSAGE(m_openGroups.isEmpty(), "An unclosed group should be a parsing error in YARR.");
+ ASSERT_WITH_MESSAGE(m_subtreeStart != m_subtreeEnd, "This regex cannot match anything");
+
+ m_nfa.setFinal(m_subtreeEnd, m_patternId);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> URLFilterParser::ParseStatus parseStatus() const
</span><span class="lines">@@ -529,8 +524,7 @@
</span><span class="cx"> if (hasError())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_floatingTerm.isValid())
- fail(URLFilterParser::MisplacedQuantifier);
</del><ins>+ ASSERT(m_floatingTerm.isValid());
</ins><span class="cx">
</span><span class="cx"> if (!minimum && maximum == 1)
</span><span class="cx"> m_floatingTerm.quantify(AtomQuantifier::ZeroOrOne);
</span><span class="lines">@@ -723,8 +717,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (!pattern.containsOnlyASCII())
</span><span class="cx"> return NonASCII;
</span><del>- ASSERT(!pattern.isEmpty());
-
</del><span class="cx"> if (pattern.isEmpty())
</span><span class="cx"> return EmptyPattern;
</span><span class="cx">
</span><span class="lines">@@ -754,16 +746,10 @@
</span><span class="cx"> return "Ok";
</span><span class="cx"> case MatchesEverything:
</span><span class="cx"> return "Matches everything.";
</span><del>- case UnclosedGroups:
- return "The expression has unclosed groups.";
- case CannotMatchAnything:
- return "The pattern cannot match anything.";
</del><span class="cx"> case NonASCII:
</span><span class="cx"> return "Only ASCII characters are supported in pattern.";
</span><span class="cx"> case UnsupportedCharacterClass:
</span><span class="cx"> return "Character class is not supported.";
</span><del>- case MisplacedQuantifier:
- return "Quantifier without corresponding term to quantify.";
</del><span class="cx"> case BackReference:
</span><span class="cx"> return "Patterns cannot contain backreferences.";
</span><span class="cx"> case MisplacedStartOfLine:
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsURLFilterParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/URLFilterParser.h (181761 => 181762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/URLFilterParser.h 2015-03-19 22:36:43 UTC (rev 181761)
+++ trunk/Source/WebCore/contentextensions/URLFilterParser.h 2015-03-19 22:37:35 UTC (rev 181762)
</span><span class="lines">@@ -44,11 +44,8 @@
</span><span class="cx"> enum ParseStatus {
</span><span class="cx"> Ok,
</span><span class="cx"> MatchesEverything,
</span><del>- UnclosedGroups,
- CannotMatchAnything,
</del><span class="cx"> NonASCII,
</span><span class="cx"> UnsupportedCharacterClass,
</span><del>- MisplacedQuantifier,
</del><span class="cx"> BackReference,
</span><span class="cx"> MisplacedStartOfLine,
</span><span class="cx"> WordBoundary,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181761 => 181762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-19 22:36:43 UTC (rev 181761)
+++ trunk/Tools/ChangeLog 2015-03-19 22:37:35 UTC (rev 181762)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-03-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ [Content Extensions] Test regular expression parse failures.
+ https://bugs.webkit.org/show_bug.cgi?id=142872
+
+ Reviewed by Benjamin Poulain.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::testPatternStatus):
+ (TestWebKitAPI::TEST_F):
+ Added tests for each parsing status.
+
+2015-03-19 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Fix API tests after r181754.
</span><span class="cx">
</span><span class="cx"> * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (181761 => 181762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-19 22:36:43 UTC (rev 181761)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-19 22:37:35 UTC (rev 181762)
</span><span class="lines">@@ -341,11 +341,11 @@
</span><span class="cx"> testRequest(backend, mainDocumentRequest("http://block_only_images.org", ResourceType::Document), { });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void testPatternStatus(const char* pattern, ContentExtensions::URLFilterParser::ParseStatus status)
</del><ins>+static void testPatternStatus(String pattern, ContentExtensions::URLFilterParser::ParseStatus status)
</ins><span class="cx"> {
</span><span class="cx"> ContentExtensions::NFA nfa;
</span><span class="cx"> ContentExtensions::URLFilterParser parser(nfa);
</span><del>- EXPECT_EQ(status, parser.addPattern(ASCIILiteral(pattern), false, 0));
</del><ins>+ EXPECT_EQ(status, parser.addPattern(pattern, false, 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(ContentExtensionTest, ParsingFailures)
</span><span class="lines">@@ -353,7 +353,55 @@
</span><span class="cx"> testPatternStatus("a*b?.*.?[a-z]?[a-z]*", ContentExtensions::URLFilterParser::ParseStatus::MatchesEverything);
</span><span class="cx"> testPatternStatus("a*b?.*.?[a-z]?[a-z]+", ContentExtensions::URLFilterParser::ParseStatus::Ok);
</span><span class="cx"> testPatternStatus("a*b?.*.?[a-z]?[a-z]", ContentExtensions::URLFilterParser::ParseStatus::Ok);
</span><del>- // FIXME: Add regexes that cause each parse status.
</del><ins>+ testPatternStatus(".*?a", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus(".*a", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+
+ testPatternStatus("(?!)", ContentExtensions::URLFilterParser::ParseStatus::Group);
+ testPatternStatus("(?=)", ContentExtensions::URLFilterParser::ParseStatus::Group);
+ testPatternStatus("(?!a)", ContentExtensions::URLFilterParser::ParseStatus::Group);
+ testPatternStatus("(?=a)", ContentExtensions::URLFilterParser::ParseStatus::Group);
+ testPatternStatus("(regex)", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("(regex", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+ testPatternStatus("((regex)", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+ testPatternStatus("(?:regex)", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("(?:regex", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+ testPatternStatus("[^.]+", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+
+ testPatternStatus("a++", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+ testPatternStatus("[a]++", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+ testPatternStatus("+", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+
+ testPatternStatus("[", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+ testPatternStatus("[a}", ContentExtensions::URLFilterParser::ParseStatus::YarrError);
+
+ // FIXME: Look into why these do not cause YARR parsing errors. They probably should.
+ testPatternStatus("a]", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("{", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("{[a]", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("{0", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("{0,", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("{0,1", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("a{0,1", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("a{a,b}", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+
+ const char nonASCII[2] = {-1, '\0'};
+ testPatternStatus(nonASCII, ContentExtensions::URLFilterParser::ParseStatus::NonASCII);
+ testPatternStatus("\\xff", ContentExtensions::URLFilterParser::ParseStatus::NonASCII);
+
+ testPatternStatus("\\x\\r\\n", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("\\b", ContentExtensions::URLFilterParser::ParseStatus::WordBoundary);
+ testPatternStatus("[\\d]", ContentExtensions::URLFilterParser::ParseStatus::AtomCharacter);
+ testPatternStatus("\\d\\D\\w\\s\\v\\h\\i\\c", ContentExtensions::URLFilterParser::ParseStatus::UnsupportedCharacterClass);
+
+ testPatternStatus("this|that", ContentExtensions::URLFilterParser::ParseStatus::Disjunction);
+ testPatternStatus("a{0,1}b", ContentExtensions::URLFilterParser::ParseStatus::Ok);
+ testPatternStatus("a{0,2}b", ContentExtensions::URLFilterParser::ParseStatus::InvalidQuantifier);
+ testPatternStatus("", ContentExtensions::URLFilterParser::ParseStatus::EmptyPattern);
+ testPatternStatus("$$", ContentExtensions::URLFilterParser::ParseStatus::MisplacedEndOfLine);
+ testPatternStatus("a^", ContentExtensions::URLFilterParser::ParseStatus::MisplacedStartOfLine);
+ testPatternStatus("(^)", ContentExtensions::URLFilterParser::ParseStatus::MisplacedStartOfLine);
+
+ testPatternStatus("(a)\\1", ContentExtensions::URLFilterParser::ParseStatus::Ok); // This should be BackReference, right?
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>