<!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>[206732] trunk/Source/WebCore</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/206732">206732</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-03 03:42:11 -0700 (Mon, 03 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Simplify AuthenticationChallenge
https://bugs.webkit.org/show_bug.cgi?id=162784
Reviewed by Alex Christensen.
We don't really need to keep references to the SoupSession and SoupMessage in AuthenticationChallenge, the
SoupNetworkSession callback already forwards the challenge to the right ResourceHandle.
* platform/network/soup/AuthenticationChallenge.h:
(WebCore::AuthenticationChallenge::authenticationClient):
(WebCore::AuthenticationChallenge::soupSession): Deleted.
(WebCore::AuthenticationChallenge::soupMessage): Deleted.
* platform/network/soup/AuthenticationChallengeSoup.cpp:
(WebCore::AuthenticationChallenge::AuthenticationChallenge):
(WebCore::AuthenticationChallenge::platformCompare):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::continueDidReceiveAuthenticationChallenge):
(WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
(WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential):
(WebCore::ResourceHandle::receivedCredential):
(WebCore::ResourceHandle::receivedCancellation):
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::authenticateCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupAuthenticationChallengeh">trunk/Source/WebCore/platform/network/soup/AuthenticationChallenge.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupAuthenticationChallengeSoupcpp">trunk/Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206731 => 206732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-03 10:32:52 UTC (rev 206731)
+++ trunk/Source/WebCore/ChangeLog 2016-10-03 10:42:11 UTC (rev 206732)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-10-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [SOUP] Simplify AuthenticationChallenge
+ https://bugs.webkit.org/show_bug.cgi?id=162784
+
+ Reviewed by Alex Christensen.
+
+ We don't really need to keep references to the SoupSession and SoupMessage in AuthenticationChallenge, the
+ SoupNetworkSession callback already forwards the challenge to the right ResourceHandle.
+
+ * platform/network/soup/AuthenticationChallenge.h:
+ (WebCore::AuthenticationChallenge::authenticationClient):
+ (WebCore::AuthenticationChallenge::soupSession): Deleted.
+ (WebCore::AuthenticationChallenge::soupMessage): Deleted.
+ * platform/network/soup/AuthenticationChallengeSoup.cpp:
+ (WebCore::AuthenticationChallenge::AuthenticationChallenge):
+ (WebCore::AuthenticationChallenge::platformCompare):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::continueDidReceiveAuthenticationChallenge):
+ (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+ (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential):
+ (WebCore::ResourceHandle::receivedCredential):
+ (WebCore::ResourceHandle::receivedCancellation):
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::authenticateCallback):
+
+2016-10-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [SOUP] Cleanup persistent credential storage code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162777
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupAuthenticationChallengeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/AuthenticationChallenge.h (206731 => 206732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/AuthenticationChallenge.h 2016-10-03 10:32:52 UTC (rev 206731)
+++ trunk/Source/WebCore/platform/network/soup/AuthenticationChallenge.h 2016-10-03 10:42:11 UTC (rev 206732)
</span><span class="lines">@@ -44,10 +44,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- AuthenticationChallenge(SoupSession*, SoupMessage*, SoupAuth*, bool retrying, AuthenticationClient*);
</del><ins>+ AuthenticationChallenge(SoupMessage*, SoupAuth*, bool retrying, AuthenticationClient* = nullptr);
</ins><span class="cx"> AuthenticationClient* authenticationClient() const { return m_authenticationClient.get(); }
</span><del>- SoupSession* soupSession() const { return m_soupSession.get(); }
- SoupMessage* soupMessage() const { return m_soupMessage.get(); }
</del><span class="cx"> SoupAuth* soupAuth() const { return m_soupAuth.get(); }
</span><span class="cx"> void setProposedCredential(const Credential& credential) { m_proposedCredential = credential; }
</span><span class="cx">
</span><span class="lines">@@ -55,8 +53,6 @@
</span><span class="cx"> friend class AuthenticationChallengeBase;
</span><span class="cx"> static bool platformCompare(const AuthenticationChallenge&, const AuthenticationChallenge&);
</span><span class="cx">
</span><del>- GRefPtr<SoupSession> m_soupSession;
- GRefPtr<SoupMessage> m_soupMessage;
</del><span class="cx"> GRefPtr<SoupAuth> m_soupAuth;
</span><span class="cx"> RefPtr<AuthenticationClient> m_authenticationClient;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupAuthenticationChallengeSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp (206731 => 206732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp 2016-10-03 10:32:52 UTC (rev 206731)
+++ trunk/Source/WebCore/platform/network/soup/AuthenticationChallengeSoup.cpp 2016-10-03 10:42:11 UTC (rev 206732)
</span><span class="lines">@@ -66,14 +66,12 @@
</span><span class="cx"> String::fromUTF8(soup_auth_get_realm(soupAuth)), scheme);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AuthenticationChallenge::AuthenticationChallenge(SoupSession* soupSession, SoupMessage* soupMessage, SoupAuth* soupAuth, bool retrying, AuthenticationClient* client)
</del><ins>+AuthenticationChallenge::AuthenticationChallenge(SoupMessage* soupMessage, SoupAuth* soupAuth, bool retrying, AuthenticationClient* client)
</ins><span class="cx"> : AuthenticationChallengeBase(protectionSpaceFromSoupAuthAndMessage(soupAuth, soupMessage),
</span><span class="cx"> Credential(), // proposedCredentials
</span><span class="cx"> retrying ? 1 : 0, // previousFailureCount
</span><span class="cx"> soupMessage, // failureResponse
</span><span class="cx"> ResourceError::authenticationError(soupMessage))
</span><del>- , m_soupSession(soupSession)
- , m_soupMessage(soupMessage)
</del><span class="cx"> , m_soupAuth(soupAuth)
</span><span class="cx"> , m_authenticationClient(client)
</span><span class="cx"> {
</span><span class="lines">@@ -81,9 +79,7 @@
</span><span class="cx">
</span><span class="cx"> bool AuthenticationChallenge::platformCompare(const AuthenticationChallenge& a, const AuthenticationChallenge& b)
</span><span class="cx"> {
</span><del>- return a.soupSession() == b.soupSession()
- && a.soupMessage() == b.soupMessage()
- && a.soupAuth() == b.soupAuth();
</del><ins>+ return a.soupAuth() == b.soupAuth();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (206731 => 206732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-10-03 10:32:52 UTC (rev 206731)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-10-03 10:42:11 UTC (rev 206732)
</span><span class="lines">@@ -969,19 +969,16 @@
</span><span class="cx"> ASSERT(!d->m_currentWebChallenge.isNull());
</span><span class="cx"> AuthenticationChallenge& challenge = d->m_currentWebChallenge;
</span><span class="cx">
</span><del>- ASSERT(challenge.soupSession());
- ASSERT(challenge.soupMessage());
</del><ins>+ ASSERT(d->m_soupMessage);
</ins><span class="cx"> if (!credentialFromPersistentStorage.isEmpty())
</span><span class="cx"> challenge.setProposedCredential(credentialFromPersistentStorage);
</span><span class="cx">
</span><span class="cx"> if (!client()) {
</span><del>- soup_session_unpause_message(challenge.soupSession(), challenge.soupMessage());
</del><ins>+ soup_session_unpause_message(d->soupSession(), d->m_soupMessage.get());
</ins><span class="cx"> clearAuthentication();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(challenge.soupSession());
- ASSERT(challenge.soupMessage());
</del><span class="cx"> client()->didReceiveAuthenticationChallenge(this, challenge);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1015,7 +1012,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> d->m_currentWebChallenge = challenge;
</span><del>- soup_session_pause_message(challenge.soupSession(), challenge.soupMessage());
</del><ins>+ soup_session_pause_message(d->soupSession(), d->m_soupMessage.get());
</ins><span class="cx">
</span><span class="cx"> // We could also do this before we even start the request, but that would be at the expense
</span><span class="cx"> // of all request latency, versus a one-time latency for the small subset of requests that
</span><span class="lines">@@ -1036,7 +1033,7 @@
</span><span class="cx"> ASSERT(!challenge.isNull());
</span><span class="cx"> if (challenge != d->m_currentWebChallenge)
</span><span class="cx"> return;
</span><del>- soup_session_unpause_message(challenge.soupSession(), challenge.soupMessage());
</del><ins>+ soup_session_unpause_message(d->soupSession(), d->m_soupMessage.get());
</ins><span class="cx">
</span><span class="cx"> clearAuthentication();
</span><span class="cx"> }
</span><span class="lines">@@ -1067,10 +1064,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(challenge.soupSession());
- ASSERT(challenge.soupMessage());
</del><ins>+ ASSERT(d->m_soupMessage);
</ins><span class="cx"> soup_auth_authenticate(challenge.soupAuth(), credential.user().utf8().data(), credential.password().utf8().data());
</span><del>- soup_session_unpause_message(challenge.soupSession(), challenge.soupMessage());
</del><ins>+ soup_session_unpause_message(d->soupSession(), d->m_soupMessage.get());
</ins><span class="cx">
</span><span class="cx"> clearAuthentication();
</span><span class="cx"> }
</span><span class="lines">@@ -1086,9 +1082,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(challenge.soupSession());
- ASSERT(challenge.soupMessage());
- soup_session_unpause_message(challenge.soupSession(), challenge.soupMessage());
</del><ins>+ ASSERT(d->m_soupMessage);
+ soup_session_unpause_message(d->soupSession(), d->m_soupMessage.get());
</ins><span class="cx">
</span><span class="cx"> if (client())
</span><span class="cx"> client()->receivedCancellation(this, challenge);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (206731 => 206732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-10-03 10:32:52 UTC (rev 206731)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-10-03 10:42:11 UTC (rev 206732)
</span><span class="lines">@@ -75,12 +75,12 @@
</span><span class="cx"> return std::unique_ptr<SoupNetworkSession>(new SoupNetworkSession(soupSession));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void authenticateCallback(SoupSession* session, SoupMessage* soupMessage, SoupAuth* soupAuth, gboolean retrying)
</del><ins>+static void authenticateCallback(SoupSession*, SoupMessage* soupMessage, SoupAuth* soupAuth, gboolean retrying)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(g_object_get_data(G_OBJECT(soupMessage), "handle"));
</span><span class="cx"> if (!handle)
</span><span class="cx"> return;
</span><del>- handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(session, soupMessage, soupAuth, retrying, handle.get()));
</del><ins>+ handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(soupMessage, soupAuth, retrying, handle.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_TIMING) && !SOUP_CHECK_VERSION(2, 49, 91)
</span></span></pre>
</div>
</div>
</body>
</html>