<!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>[193328] branches/safari-601-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/193328">193328</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:11:12 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192615">r192615</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCookieStorageObjectjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceTesthtml">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Test.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsinspectorpagefiltercookiesfordomainexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectorpagefiltercookiesfordomainhtml">branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193327 => 193328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:11:05 UTC (rev 193327)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:11:12 UTC (rev 193328)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
+ Merge r192615. rdar://problem/23221163
+
+ 2015-11-18 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Storage tab shouldn't hide cookies for .example.com when inspected page is foo.bar.example.com
+ https://bugs.webkit.org/show_bug.cgi?id=151408
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/page/filter-cookies-for-domain-expected.txt: Added.
+ * inspector/page/filter-cookies-for-domain.html: Added.
+
</ins><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r192040. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorpagefiltercookiesfordomainexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain-expected.txt (0 => 193328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain-expected.txt 2015-12-03 19:11:12 UTC (rev 193328)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+Tests for model code related to the Page.getCookie command.
+
+
+== Running test suite: Page.getCookie
+-- Running test case: MatchCookiesAgainstResourceDomains
+PASS: .example.com should not match www.other.com
+PASS: .example.com should not match stuff.other.com
+PASS: .example.com should not match bad.stuff.other.com
+PASS: .example.com should match www.example.com
+PASS: .example.com should match stuff.example.com
+PASS: .example.com should match good.stuff.example.com
+PASS: stuff.example.com should not match www.other.com
+PASS: stuff.example.com should not match stuff.other.com
+PASS: stuff.example.com should not match bad.stuff.other.com
+PASS: stuff.example.com should not match www.example.com
+PASS: stuff.example.com should match stuff.example.com
+PASS: stuff.example.com should not match good.stuff.example.com
+PASS: .stuff.example.com should not match www.other.com
+PASS: .stuff.example.com should not match stuff.other.com
+PASS: .stuff.example.com should not match bad.stuff.other.com
+PASS: .stuff.example.com should not match www.example.com
+PASS: .stuff.example.com should match stuff.example.com
+PASS: .stuff.example.com should match good.stuff.example.com
+PASS: good.stuff.example.com should not match www.other.com
+PASS: good.stuff.example.com should not match stuff.other.com
+PASS: good.stuff.example.com should not match bad.stuff.other.com
+PASS: good.stuff.example.com should not match www.example.com
+PASS: good.stuff.example.com should not match stuff.example.com
+PASS: good.stuff.example.com should match good.stuff.example.com
+PASS: .good.stuff.example.com should not match www.other.com
+PASS: .good.stuff.example.com should not match stuff.other.com
+PASS: .good.stuff.example.com should not match bad.stuff.other.com
+PASS: .good.stuff.example.com should not match www.example.com
+PASS: .good.stuff.example.com should not match stuff.example.com
+PASS: .good.stuff.example.com should match good.stuff.example.com
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectorpagefiltercookiesfordomainhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain.html (0 => 193328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/page/filter-cookies-for-domain.html 2015-12-03 19:11:12 UTC (rev 193328)
</span><span class="lines">@@ -0,0 +1,184 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createSyncSuite("Page.getCookie");
+
+ suite.addTestCase({
+ name: "MatchCookiesAgainstResourceDomains",
+ description: "Test that Inspector properly detects whether a cookie matches a resource's domain or not.",
+ test: (resolve, reject) => {
+ let testcasesByCookieDomain = {
+ ".example.com": [
+ // Unrelated top-level domain.
+ {
+ "input": "www.other.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.other.com",
+ "output": false,
+ },
+ {
+ "input": "bad.stuff.other.com",
+ "output": false,
+ },
+
+ // Same top-level domain, with 0+ subdomains.
+ {
+ "input": "www.example.com",
+ "output": true,
+ },
+ {
+ "input": "stuff.example.com",
+ "output": true,
+ },
+ {
+ "input": "good.stuff.example.com",
+ "output": true,
+ },
+ ],
+ "stuff.example.com": [
+ // Unrelated top-level domain.
+ {
+ "input": "www.other.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.other.com",
+ "output": false,
+ },
+ {
+ "input": "bad.stuff.other.com",
+ "output": false,
+ },
+
+ // Same top-level domain, with 0+ subdomains.
+ {
+ "input": "www.example.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.example.com",
+ "output": true,
+ },
+ {
+ "input": "good.stuff.example.com",
+ "output": false,
+ },
+ ],
+
+ ".stuff.example.com": [
+ // Unrelated top-level domain.
+ {
+ "input": "www.other.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.other.com",
+ "output": false,
+ },
+ {
+ "input": "bad.stuff.other.com",
+ "output": false,
+ },
+
+ // Same top-level domain, with 0+ subdomains.
+ {
+ "input": "www.example.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.example.com",
+ "output": true,
+ },
+ {
+ "input": "good.stuff.example.com",
+ "output": true,
+ },
+ ],
+
+ "good.stuff.example.com": [
+ // Unrelated top-level domain.
+ {
+ "input": "www.other.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.other.com",
+ "output": false,
+ },
+ {
+ "input": "bad.stuff.other.com",
+ "output": false,
+ },
+
+ // Same top-level domain, with 0+ subdomains.
+ {
+ "input": "www.example.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.example.com",
+ "output": false,
+ },
+ {
+ "input": "good.stuff.example.com",
+ "output": true,
+ },
+ ],
+
+ ".good.stuff.example.com": [
+ // Unrelated top-level domain.
+ {
+ "input": "www.other.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.other.com",
+ "output": false,
+ },
+ {
+ "input": "bad.stuff.other.com",
+ "output": false,
+ },
+
+ // Same top-level domain, with 0+ subdomains.
+ {
+ "input": "www.example.com",
+ "output": false,
+ },
+ {
+ "input": "stuff.example.com",
+ "output": false,
+ },
+ {
+ "input": "good.stuff.example.com",
+ "output": true,
+ },
+ ]
+ };
+
+ for (let cookieDomain in testcasesByCookieDomain) {
+ for (let expected of testcasesByCookieDomain[cookieDomain]) {
+ let output = WebInspector.CookieStorageObject.cookieDomainMatchesResourceDomain(cookieDomain, expected.input);
+ let verdictText = expected.output ? "should match" : "should not match";
+ InspectorTest.expectThat(output === expected.output, `${cookieDomain} ${verdictText} ${expected.input}`);
+ }
+ }
+
+ return true;
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests for model code related to the Page.getCookie command.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193327 => 193328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:11:05 UTC (rev 193327)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:11:12 UTC (rev 193328)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192615. rdar://problem/23221163
+
+ 2015-11-18 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Storage tab shouldn't hide cookies for .example.com when inspected page is foo.bar.example.com
+ https://bugs.webkit.org/show_bug.cgi?id=151408
+
+ Reviewed by Timothy Hatcher.
+
+ The regex should allow multiple subdomains to match a cookie for domain .example.com.
+
+ Test: inspector/page/filter-cookies-for-domain.html
+
+ * UserInterface/Models/CookieStorageObject.js:
+ (WebInspector.CookieStorageObject.cookieDomainMatchesResourceDomain):
+
+ Also make the group non-capturing. We don't use the match.
+
+ (WebInspector.CookieStorageObject.prototype.saveIdentityToCookie):
+ (WebInspector.CookieStorageObject):
+ * UserInterface/Test.html:
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192614. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-18 Brian Burg <bburg@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsCookieStorageObjectjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js (193327 => 193328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js 2015-12-03 19:11:05 UTC (rev 193327)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/CookieStorageObject.js 2015-12-03 19:11:12 UTC (rev 193328)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (cookieDomain.charAt(0) !== ".")
</span><span class="cx"> return resourceDomain === cookieDomain;
</span><del>- return !!resourceDomain.match(new RegExp("^([^\\.]+\\.)?" + cookieDomain.substring(1).escapeForRegExp() + "$"), "i");
</del><ins>+ return !!resourceDomain.match(new RegExp("^(?:[^\\.]+\\.)*" + cookieDomain.substring(1).escapeForRegExp() + "$"), "i");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME <https://webkit.org/b/151413>: This class should actually store cookie data for this host.
</span><span class="cx"> cookie[WebInspector.CookieStorageObject.CookieHostCookieKey] = this.host;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.CookieStorageObject.TypeIdentifier = "cookie-storage";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceTesthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Test.html (193327 => 193328)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Test.html 2015-12-03 19:11:05 UTC (rev 193327)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Test.html 2015-12-03 19:11:12 UTC (rev 193328)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> <script src="Models/CallFrame.js"></script>
</span><span class="cx"> <script src="Models/CollectionEntry.js"></script>
</span><span class="cx"> <script src="Models/Color.js"></script>
</span><ins>+ <script src="Models/CookieStorageObject.js"></script>
</ins><span class="cx"> <script src="Models/ConsoleCommandResultMessage.js"></script>
</span><span class="cx"> <script src="Models/ContentFlow.js"></script>
</span><span class="cx"> <script src="Models/DOMNode.js"></script>
</span></span></pre>
</div>
</div>
</body>
</html>