<!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>[171859] 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/171859">171859</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-07-31 09:45:19 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Regression tests can't load HTTPS pages with NetworkProcess due to self-signed certificate
https://bugs.webkit.org/show_bug.cgi?id=115282
Reviewed by Sam Weinig.
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::canAuthenticateAgainstProtectionSpaceInFrame): Return true for any
local host server trust protection space.
(WTR::TestController::didReceiveAuthenticationChallengeInFrame): Respond with a non-empty
credential to server trust challenges.
LayoutTests:
* platform/mac-wk2/TestExpectations: Removed the exceptions listed under this bug.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171858 => 171859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-31 16:43:06 UTC (rev 171858)
+++ trunk/LayoutTests/ChangeLog 2014-07-31 16:45:19 UTC (rev 171859)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-07-31 Dan Bernstein <mitz@apple.com>
+
+ [WK2] Regression tests can't load HTTPS pages with NetworkProcess due to self-signed certificate
+ https://bugs.webkit.org/show_bug.cgi?id=115282
+
+ Reviewed by Sam Weinig.
+
+ * platform/mac-wk2/TestExpectations: Removed the exceptions listed under this bug.
+
</ins><span class="cx"> 2014-07-31 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (171858 => 171859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-07-31 16:43:06 UTC (rev 171858)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-07-31 16:45:19 UTC (rev 171859)
</span><span class="lines">@@ -628,25 +628,6 @@
</span><span class="cx"> [ Mavericks ] storage/domstorage/sessionstorage/private-browsing-affects-storage.html [ Skip ]
</span><span class="cx"> [ Mavericks ] storage/websql/private-browsing-noread-nowrite.html [ Skip ]
</span><span class="cx">
</span><del>-# https://bugs.webkit.org/show_bug.cgi?id=115282
-# PPT: https loads fail due to self-signed certificate
-[ Mavericks ] http/tests/appcache/different-https-origin-resource-main.html [ Skip ]
-[ Mavericks ] http/tests/cache/history-only-cached-subresource-loads-max-age-https.html [ Skip ]
-[ Mavericks ] http/tests/misc/dns-prefetch-control.html [ Skip ]
-[ Mavericks ] http/tests/navigation/https-in-page-cache.html [ Skip ]
-[ Mavericks ] http/tests/navigation/ping-cross-origin-from-https.html [ Skip ]
-[ Mavericks ] http/tests/security/contentSecurityPolicy/block-mixed-content-hides-warning.html [ Skip ]
-[ Mavericks ] http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html [ Skip ]
-[ Mavericks ] http/tests/security/mixedContent [ Skip ]
-[ Mavericks ] http/tests/security/originHeader/origin-header-for-https.html [ Skip ]
-[ Mavericks ] http/tests/security/referrer-policy-https-always.html [ Skip ]
-[ Mavericks ] http/tests/security/referrer-policy-https-default.html [ Skip ]
-[ Mavericks ] http/tests/security/referrer-policy-https-never.html [ Skip ]
-[ Mavericks ] http/tests/security/referrer-policy-https-origin.html [ Skip ]
-[ Mavericks ] http/tests/security/referrer-policy-redirect-link.html [ Skip ]
-[ Mavericks ] http/tests/security/referrer-policy-redirect.html [ Skip ]
-[ Mavericks ] http/tests/ssl [ Skip ]
-
</del><span class="cx"> # testRunner.setAlwaysAcceptCookies does not work with NetworkProcess
</span><span class="cx"> [ Mavericks ] http/tests/cookies/third-party-cookie-relaxing.html [ Skip ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (171858 => 171859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-31 16:43:06 UTC (rev 171858)
+++ trunk/Tools/ChangeLog 2014-07-31 16:45:19 UTC (rev 171859)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-31 Dan Bernstein <mitz@apple.com>
+
+ [WK2] Regression tests can't load HTTPS pages with NetworkProcess due to self-signed certificate
+ https://bugs.webkit.org/show_bug.cgi?id=115282
+
+ Reviewed by Sam Weinig.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::canAuthenticateAgainstProtectionSpaceInFrame): Return true for any
+ local host server trust protection space.
+ (WTR::TestController::didReceiveAuthenticationChallengeInFrame): Respond with a non-empty
+ credential to server trust challenges.
+
</ins><span class="cx"> 2014-07-31 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [webkitpy] Make diff_text generate correct diff if there is no newline at the end of file
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (171858 => 171859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-07-31 16:43:06 UTC (rev 171858)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-07-31 16:45:19 UTC (rev 171859)
</span><span class="lines">@@ -1198,7 +1198,14 @@
</span><span class="cx">
</span><span class="cx"> bool TestController::canAuthenticateAgainstProtectionSpaceInFrame(WKPageRef, WKFrameRef, WKProtectionSpaceRef protectionSpace, const void*)
</span><span class="cx"> {
</span><del>- return WKProtectionSpaceGetAuthenticationScheme(protectionSpace) <= kWKProtectionSpaceAuthenticationSchemeHTTPDigest;
</del><ins>+ WKProtectionSpaceAuthenticationScheme authenticationScheme = WKProtectionSpaceGetAuthenticationScheme(protectionSpace);
+
+ if (authenticationScheme == kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
+ std::string host = toSTD(adoptWK(WKProtectionSpaceCopyHost(protectionSpace)).get());
+ return host == "localhost" || host == "127.0.0.1";
+ }
+
+ return authenticationScheme <= kWKProtectionSpaceAuthenticationSchemeHTTPDigest;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::didReceiveAuthenticationChallengeInFrame(WKPageRef page, WKFrameRef frame, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo)
</span><span class="lines">@@ -1249,6 +1256,18 @@
</span><span class="cx">
</span><span class="cx"> void TestController::didReceiveAuthenticationChallengeInFrame(WKPageRef page, WKFrameRef frame, WKAuthenticationChallengeRef authenticationChallenge)
</span><span class="cx"> {
</span><ins>+ WKProtectionSpaceRef protectionSpace = WKAuthenticationChallengeGetProtectionSpace(authenticationChallenge);
+ WKAuthenticationDecisionListenerRef decisionListener = WKAuthenticationChallengeGetDecisionListener(authenticationChallenge);
+
+ if (WKProtectionSpaceGetAuthenticationScheme(protectionSpace) == kWKProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {
+ // Any non-empty credential signals to accept the server trust. Since the cross-platform API
+ // doesn't expose a way to create a credential from server trust, we use a password credential.
+
+ WKRetainPtr<WKCredentialRef> credential = adoptWK(WKCredentialCreate(toWK("accept server trust").get(), toWK("").get(), kWKCredentialPersistenceNone));
+ WKAuthenticationDecisionListenerUseCredential(decisionListener, credential.get());
+ return;
+ }
+
</ins><span class="cx"> String message;
</span><span class="cx"> if (!m_handlesAuthenticationChallenges)
</span><span class="cx"> message = "didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet\n";
</span><span class="lines">@@ -1256,7 +1275,6 @@
</span><span class="cx"> message = String::format("didReceiveAuthenticationChallenge - Responding with %s:%s\n", m_authenticationUsername.utf8().data(), m_authenticationPassword.utf8().data());
</span><span class="cx"> m_currentInvocation->outputText(message);
</span><span class="cx">
</span><del>- WKAuthenticationDecisionListenerRef decisionListener = WKAuthenticationChallengeGetDecisionListener(authenticationChallenge);
</del><span class="cx"> if (!m_handlesAuthenticationChallenges) {
</span><span class="cx"> WKAuthenticationDecisionListenerUseCredential(decisionListener, 0);
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>