<!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>[190798] branches/safari-601.1.46-branch</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/190798">190798</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-09 07:22:16 -0700 (Fri, 09 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190602">r190602</a>. rdar://problem/22995810</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorecontentextensionsContentExtensionParsercpp">branches/safari-601.1.46-branch/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestshttptestscontentextensionsinvalidselectorexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestscontentextensionsinvalidselectorhtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestscontentextensionsinvalidselectorhtmljson">branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (190797 => 190798)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog        2015-10-09 14:22:10 UTC (rev 190797)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog        2015-10-09 14:22:16 UTC (rev 190798)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190602. rdar://problem/22995810
+
+ 2015-10-05 Alex Christensen <achristensen@webkit.org>
+
+ Invalid CSS Selector for Content Blockers invalidates others
+ https://bugs.webkit.org/show_bug.cgi?id=148446
+ rdar://problem/22918235
+
+ Reviewed by Benjamin Poulain.
+
+ * http/tests/contentextensions/invalid-selector-expected.txt: Added.
+ * http/tests/contentextensions/invalid-selector.html: Added.
+ * http/tests/contentextensions/invalid-selector.html.json: Added.
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190438. rdar://problem/22865007
</span><span class="cx">
</span><span class="cx"> 2015-10-01 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscontentextensionsinvalidselectorexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector-expected.html (0 => 190798)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector-expected.html         (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector-expected.html        2015-10-09 14:22:16 UTC (rev 190798)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This text should be visible because the class is an invalid selector.
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscontentextensionsinvalidselectorhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html (0 => 190798)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html         (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html        2015-10-09 14:22:16 UTC (rev 190798)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<body>
+<p class="valid-selector">This text should not be visible.</p>
+<p class="non-universal-valid-selector">This text should not be visible.</p>
+<p class="body{">This text should be visible because the class is an invalid selector.</p>
+</body>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestscontentextensionsinvalidselectorhtmljson"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html.json (0 => 190798)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html.json         (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/invalid-selector.html.json        2015-10-09 14:22:16 UTC (rev 190798)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+[{
+ "action" : {
+ "type" : "css-display-none",
+ "selector" : "body{"
+ },
+ "trigger" : {
+ "url-filter" : ".*"
+ }
+},{
+ "action" : {
+ "type" : "css-display-none",
+ "selector" : ".valid-selector"
+ },
+ "trigger" : {
+ "url-filter" : ".*"
+ }
+},{
+ "action" : {
+ "type" : "css-display-none",
+ "selector" : ".body{"
+ },
+ "trigger" : {
+ "url-filter" : ".*"
+ }
+},{
+ "action":{
+         "type":"css-display-none",
+         "selector":"body{background-image: url(http://127.0.0.1:8000/resources/square100.png)}"
+ },
+ "trigger":{
+         "url-filter":"html"
+ }
+},{
+ "action" : {
+ "type" : "css-display-none",
+ "selector" : ".non-universal-valid-selector"
+ },
+ "trigger" : {
+ "url-filter" : "invalid-selector\\.html"
+ }
+}]
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (190797 => 190798)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2015-10-09 14:22:10 UTC (rev 190797)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2015-10-09 14:22:16 UTC (rev 190798)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190602. rdar://problem/22995810
+
+ 2015-10-05 Alex Christensen <achristensen@webkit.org>
+
+ Invalid CSS Selector for Content Blockers invalidates others
+ https://bugs.webkit.org/show_bug.cgi?id=148446
+ rdar://problem/22918235
+
+ Reviewed by Benjamin Poulain.
+
+ Test: http/tests/contentextensions/invalid-selector.html
+
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::loadTrigger):
+ (WebCore::ContentExtensions::isValidSelector):
+ (WebCore::ContentExtensions::loadAction):
+ (WebCore::ContentExtensions::loadRule):
+ Add a check to see if a selector is valid before adding it.
+
+2015-10-08 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190447. rdar://problem/22865007
</span><span class="cx">
</span><span class="cx"> 2015-10-01 Jaehun Lim <ljaehun.lim@samsung.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/contentextensions/ContentExtensionParser.cpp (190797 => 190798)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/contentextensions/ContentExtensionParser.cpp        2015-10-09 14:22:10 UTC (rev 190797)
+++ branches/safari-601.1.46-branch/Source/WebCore/contentextensions/ContentExtensionParser.cpp        2015-10-09 14:22:16 UTC (rev 190798)
</span><span class="lines">@@ -28,6 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span><span class="cx">
</span><ins>+#include "CSSParser.h"
+#include "CSSParserMode.h"
+#include "CSSSelectorList.h"
</ins><span class="cx"> #include "ContentExtensionError.h"
</span><span class="cx"> #include "ContentExtensionRule.h"
</span><span class="cx"> #include "ContentExtensionsBackend.h"
</span><span class="lines">@@ -46,7 +49,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> namespace ContentExtensions {
</span><del>-
</del><ins>+
</ins><span class="cx"> static bool containsOnlyASCIIWithNoUppercase(const String& domain)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < domain.length(); ++i) {
</span><span class="lines">@@ -56,21 +59,21 @@
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> static std::error_code getDomainList(ExecState& exec, JSObject* arrayObject, Vector<String>& vector)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(vector.isEmpty());
</span><span class="cx"> if (!arrayObject || !isJSArray(arrayObject))
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><span class="cx"> JSArray* array = jsCast<JSArray*>(arrayObject);
</span><del>-
</del><ins>+
</ins><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> // FIXME: JSObject::getIndex should be marked as const.
</span><span class="cx"> JSValue value = array->getIndex(&exec, i);
</span><span class="cx"> if (exec.hadException() || !value.isString())
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Domains should be punycode encoded lower case.
</span><span class="cx"> const String& domain = jsCast<JSString*>(value)->value(&exec);
</span><span class="cx"> if (domain.isEmpty())
</span><span class="lines">@@ -92,13 +95,13 @@
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><span class="cx"> JSArray* array = jsCast<JSArray*>(object);
</span><del>-
</del><ins>+
</ins><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue value = array->getIndex(&exec, i);
</span><span class="cx"> if (exec.hadException() || !value)
</span><span class="cx"> return ContentExtensionError::JSONInvalidObjectInTriggerFlagsArray;
</span><del>-
</del><ins>+
</ins><span class="cx"> String name = value.toWTFString(&exec);
</span><span class="cx"> uint16_t type = stringToType(name);
</span><span class="cx"> if (!type)
</span><span class="lines">@@ -109,13 +112,13 @@
</span><span class="cx">
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> static std::error_code loadTrigger(ExecState& exec, JSObject& ruleObject, Trigger& trigger)
</span><span class="cx"> {
</span><span class="cx"> JSValue triggerObject = ruleObject.get(&exec, Identifier::fromString(&exec, "trigger"));
</span><span class="cx"> if (!triggerObject || exec.hadException() || !triggerObject.isObject())
</span><span class="cx"> return ContentExtensionError::JSONInvalidTrigger;
</span><del>-
</del><ins>+
</ins><span class="cx"> JSValue urlFilterObject = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter"));
</span><span class="cx"> if (!urlFilterObject || exec.hadException() || !urlFilterObject.isString())
</span><span class="cx"> return ContentExtensionError::JSONInvalidURLFilterInTrigger;
</span><span class="lines">@@ -157,7 +160,7 @@
</span><span class="cx"> trigger.domainCondition = Trigger::DomainCondition::IfDomain;
</span><span class="cx"> } else if (!ifDomain.isUndefined())
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><del>-
</del><ins>+
</ins><span class="cx"> JSValue unlessDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "unless-domain"));
</span><span class="cx"> if (!exec.hadException() && unlessDomain.isObject()) {
</span><span class="cx"> if (trigger.domainCondition != Trigger::DomainCondition::None)
</span><span class="lines">@@ -174,8 +177,18 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::error_code loadAction(ExecState& exec, JSObject& ruleObject, Action& action)
</del><ins>+static bool isValidSelector(const String& selector)
</ins><span class="cx"> {
</span><ins>+ CSSParserContext context(CSSQuirksMode);
+ CSSParser parser(context);
+ CSSSelectorList selectorList;
+ parser.parseSelector(selector, selectorList);
+ return selectorList.isValid();
+}
+
+static std::error_code loadAction(ExecState& exec, JSObject& ruleObject, Action& action, bool& validSelector)
+{
+ validSelector = true;
</ins><span class="cx"> JSValue actionObject = ruleObject.get(&exec, Identifier::fromString(&exec, "action"));
</span><span class="cx"> if (!actionObject || exec.hadException() || !actionObject.isObject())
</span><span class="cx"> return ContentExtensionError::JSONInvalidAction;
</span><span class="lines">@@ -197,7 +210,13 @@
</span><span class="cx"> if (!selector || exec.hadException() || !selector.isString())
</span><span class="cx"> return ContentExtensionError::JSONInvalidCSSDisplayNoneActionType;
</span><span class="cx">
</span><del>- action = Action(ActionType::CSSDisplayNoneSelector, selector.toWTFString(&exec));
</del><ins>+ String s = selector.toWTFString(&exec);
+ if (!isValidSelector(s)) {
+ // Skip rules with invalid selectors to be backwards-compatible.
+ validSelector = false;
+ return { };
+ }
+ action = Action(ActionType::CSSDisplayNoneSelector, s);
</ins><span class="cx"> } else
</span><span class="cx"> return ContentExtensionError::JSONInvalidActionType;
</span><span class="cx">
</span><span class="lines">@@ -212,11 +231,13 @@
</span><span class="cx"> return triggerError;
</span><span class="cx">
</span><span class="cx"> Action action;
</span><del>- auto actionError = loadAction(exec, ruleObject, action);
</del><ins>+ bool validSelector;
+ auto actionError = loadAction(exec, ruleObject, action, validSelector);
</ins><span class="cx"> if (actionError)
</span><span class="cx"> return actionError;
</span><span class="cx">
</span><del>- ruleList.append(ContentExtensionRule(trigger, action));
</del><ins>+ if (validSelector)
+ ruleList.append(ContentExtensionRule(trigger, action));
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -234,7 +255,7 @@
</span><span class="cx"> JSObject* topLevelObject = decodedRules.toObject(&exec);
</span><span class="cx"> if (!topLevelObject || exec.hadException())
</span><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnObject;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!isJSArray(topLevelObject))
</span><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnArray;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>