Changeset 256787 in webkit

Timestamp:

Feb 17, 2020 3:45:16 PM (4 years ago)

Author:

youenn@apple.com

Message:

Fix regression in NSURLSessionWebSocketTask WSS support
​https://bugs.webkit.org/show_bug.cgi?id=207855

Reviewed by Alex Christensen.

Covered by http/tests/websocket/tests/hybi/simple-wss.html passing with NSURLSessionWebSocketTask code path.
When having an authentication challenge, we need to get the session from the task.
This was not working for websocket tasks.
Fix this by retrieving the session from the web socket data task, which is retrieved from the task identifier.

• NetworkProcess/Downloads/DownloadID.h:

(WebKit::DownloadID::operator bool const):
Add operator bool for convenience.

• NetworkProcess/NetworkSocketChannel.cpp:

(WebKit::NetworkSocketChannel::session):

• NetworkProcess/NetworkSocketChannel.h:
• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(-[WKNetworkSessionDelegate sessionFromTask:]):
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):

• NetworkProcess/cocoa/WebSocketTaskCocoa.h:
• NetworkProcess/cocoa/WebSocketTaskCocoa.mm:

(WebKit::WebSocketTask::networkSession):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Downloads/DownloadID.h (modified) (1 diff)
• NetworkProcess/NetworkSocketChannel.cpp (modified) (1 diff)
• NetworkProcess/NetworkSocketChannel.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (2 diffs)
• NetworkProcess/cocoa/WebSocketTaskCocoa.h (modified) (2 diffs)
• NetworkProcess/cocoa/WebSocketTaskCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-17  Youenn Fablet  <youenn@apple.com>
+
+        Fix regression in NSURLSessionWebSocketTask WSS support
+        https://bugs.webkit.org/show_bug.cgi?id=207855
+
+        Reviewed by Alex Christensen.
+
+        Covered by http/tests/websocket/tests/hybi/simple-wss.html passing with NSURLSessionWebSocketTask code path.
+        When having an authentication challenge, we need to get the session from the task.
+        This was not working for websocket tasks.
+        Fix this by retrieving the session from the web socket data task, which is retrieved from the task identifier.
+
+        * NetworkProcess/Downloads/DownloadID.h:
+        (WebKit::DownloadID::operator bool const):
+        Add operator bool for convenience.
+        * NetworkProcess/NetworkSocketChannel.cpp:
+        (WebKit::NetworkSocketChannel::session):
+        * NetworkProcess/NetworkSocketChannel.h:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate sessionFromTask:]):
+        (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+        * NetworkProcess/cocoa/WebSocketTaskCocoa.h:
+        * NetworkProcess/cocoa/WebSocketTaskCocoa.mm:
+        (WebKit::WebSocketTask::networkSession):
+
 2020-02-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/Downloads/DownloadID.h

@@ -48 +48 @@
     bool operator!=(DownloadID other) const { return m_downloadID != other.m_downloadID; }
 
+    explicit operator bool() const { return downloadID(); }
+
     uint64_t downloadID() const { return m_downloadID; }
 private:

trunk/Source/WebKit/NetworkProcess/NetworkSocketChannel.cpp

@@ -129 +129 @@
 }
 
+NetworkSession* NetworkSocketChannel::session()
+{
+    return m_session.get();
+}
+
 } // namespace WebKit

trunk/Source/WebKit/NetworkProcess/NetworkSocketChannel.h

@@ -73 +73 @@
     void close(int32_t code, const String& reason);
 
+    NetworkSession* session();
+
     IPC::Connection* messageSenderConnection() const final;
     uint64_t messageSenderDestinationID() const final { return m_identifier.toUInt64(); }

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -610 +610 @@
 #endif
 
+- (NetworkSessionCocoa*)sessionFromTask:(NSURLSessionTask *)task {
+    if (auto* networkDataTask = [self existingTask:task])
+        return static_cast<NetworkSessionCocoa*>(networkDataTask->networkSession());
+
+    if (auto downloadID = _sessionWrapper->downloadMap.get(task.taskIdentifier)) {
+        if (auto download = _session->networkProcess().downloadManager().download(downloadID))
+            return static_cast<NetworkSessionCocoa*>(_session->networkProcess().networkSession(download->sessionID()));
+        return nullptr;
+    }
+
+#if HAVE(NSURLSESSION_WEBSOCKET)
+    if (auto* webSocketTask = _sessionWrapper->webSocketDataTaskMap.get(task.taskIdentifier))
+        return webSocketTask->networkSession();
+#endif
+
+    return nullptr;
+}
+
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
 {
-    auto* networkDataTask = [self existingTask:task];
-    auto* sessionCocoa = networkDataTask ? static_cast<NetworkSessionCocoa*>(networkDataTask->networkSession()) : nullptr;
-    if (!networkDataTask) {
-        ASSERT(!sessionCocoa);
-        auto downloadID = _sessionWrapper->downloadMap.get(task.taskIdentifier);
-        auto download = downloadID.downloadID() ? _session->networkProcess().downloadManager().download(downloadID) : nil;
-        sessionCocoa = download ? static_cast<NetworkSessionCocoa*>(_session->networkProcess().networkSession(download->sessionID())) : nil;
-    }
+    auto* sessionCocoa = [self sessionFromTask: task];
     if (!sessionCocoa || [task state] == NSURLSessionTaskStateCanceling) {
         completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
@@ -658 +669 @@
         if (sessionCocoa->fastServerTrustEvaluationEnabled() && negotiatedLegacyTLS == NegotiatedLegacyTLS::No) {
 #if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
+            auto* networkDataTask = [self existingTask:task];
             auto decisionHandler = makeBlockPtr([weakSelf = WeakObjCPtr<WKNetworkSessionDelegate>(self), sessionCocoa = makeWeakPtr(sessionCocoa), completionHandler = makeBlockPtr(completionHandler), taskIdentifier, networkDataTask = makeRefPtr(networkDataTask), negotiatedLegacyTLS](NSURLAuthenticationChallenge *challenge, OSStatus trustResult) mutable {
                 auto strongSelf = weakSelf.get();

trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h

@@ -39 +39 @@
 namespace WebKit {
 class NetworkSession;
+class NetworkSessionCocoa;
 class NetworkSocketChannel;
 
@@ -60 +61 @@
     TaskIdentifier identifier() const;
 
+    NetworkSessionCocoa* networkSession();
+
 private:
     void readNextMessage();

trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm

@@ -30 +30 @@
 
 #import "DataReference.h"
+#import "NetworkSessionCocoa.h"
 #import "NetworkSocketChannel.h"
 #import <Foundation/NSURLSession.h>
@@ -134 +135 @@
 }
 
+NetworkSessionCocoa* WebSocketTask::networkSession()
+{
+    return static_cast<NetworkSessionCocoa*>(m_channel.session());
+}
+
 }