Changeset 202520 in webkit

Timestamp:

Jun 27, 2016 4:56:09 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

REGRESSION?(r202466): http/tests/security/canvas-remote-read-remote-video-redirect.html failing on Sierra
​https://bugs.webkit.org/show_bug.cgi?id=159172
<rdar://problem/27030025>

Reviewed by Brent Fulgham.

Add a hasSingleSecurityOrigin property to WebCoreNSURLSession that gets updated each time one of that
sessions' tasks receieves a response or a redirect request. Check that property from the MediaPlayerPrivate.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin):

• platform/network/cocoa/WebCoreNSURLSession.h:
• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSession updateHasSingleSecurityOrigin:]):
(-[WebCoreNSURLSession dataTaskWithRequest:]):
(-[WebCoreNSURLSession dataTaskWithURL:]):
(-[WebCoreNSURLSessionDataTask resource:receivedResponse:]):
(-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)
• platform/network/cocoa/WebCoreNSURLSession.h (modified) (3 diffs)
• platform/network/cocoa/WebCoreNSURLSession.mm (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-27  Jer Noble  <jer.noble@apple.com>
+
+        REGRESSION?(r202466): http/tests/security/canvas-remote-read-remote-video-redirect.html failing on Sierra
+        https://bugs.webkit.org/show_bug.cgi?id=159172
+        <rdar://problem/27030025>
+
+        Reviewed by Brent Fulgham.
+
+        Add a hasSingleSecurityOrigin property to WebCoreNSURLSession that gets updated each time one of that
+        sessions' tasks receieves a response or a redirect request. Check that property from the MediaPlayerPrivate.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::hasSingleSecurityOrigin):
+        * platform/network/cocoa/WebCoreNSURLSession.h:
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSession updateHasSingleSecurityOrigin:]):
+        (-[WebCoreNSURLSession dataTaskWithRequest:]):
+        (-[WebCoreNSURLSession dataTaskWithURL:]):
+        (-[WebCoreNSURLSessionDataTask resource:receivedResponse:]):
+        (-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:]):
+
 2016-06-27  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -2242 +2242 @@
     Ref<SecurityOrigin> resolvedOrigin(SecurityOrigin::create(resolvedURL()));
     Ref<SecurityOrigin> requestedOrigin(SecurityOrigin::createFromString(assetURL()));
-    return resolvedOrigin.get().isSameSchemeHostPort(&requestedOrigin.get());
+    if (!resolvedOrigin.get().isSameSchemeHostPort(&requestedOrigin.get()))
+        return false;
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
+    AVAssetResourceLoader *resourceLoader = m_avAsset.get().resourceLoader;
+    if (Settings::isAVFoundationNSURLSessionEnabled() && [resourceLoader respondsToSelector:@selector(URLSession)]) {
+        WebCoreNSURLSession *session = (WebCoreNSURLSession *)resourceLoader.URLSession;
+        if ([session respondsToSelector:@selector(hasSingleSecurityOrigin)])
+            return session.hasSingleSecurityOrigin;
+    }
+#endif
+    return true;
 }
 

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h

@@ -47 +47 @@
 class PlatformMediaResourceLoader;
 class WebCoreNSURLSessionDataTaskClient;
+class SecurityOrigin;
 }
 
@@ -64 +65 @@
     HashSet<RetainPtr<WebCoreNSURLSessionDataTask>> _dataTasks;
     BOOL _invalidated;
+    BOOL _hasSingleSecurityOrigin;
     NSUInteger _nextTaskIdentifier;
     OSObjectPtr<dispatch_queue_t> _internalQueue;
     WebCoreNSURLSessionCORSAccessCheckResults _corsResults;
+    RefPtr<WebCore::SecurityOrigin> _requestedOrigin;
 }
 - (id)initWithResourceLoader:(WebCore::PlatformMediaResourceLoader&)loader delegate:(id<NSURLSessionTaskDelegate>)delegate delegateQueue:(NSOperationQueue*)queue;
@@ -74 +77 @@
 @property (copy) NSString *sessionDescription;
 @property (readonly) BOOL didPassCORSAccessChecks;
+@property (readonly) BOOL hasSingleSecurityOrigin;
 - (void)finishTasksAndInvalidate;
 - (void)invalidateAndCancel;

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm

@@ -31 +31 @@
 #import "CachedResourceRequest.h"
 #import "PlatformMediaResourceLoader.h"
+#import "SecurityOrigin.h"
 #import "SubresourceLoader.h"
 
@@ -45 +46 @@
 - (void)addDelegateOperation:(void (^)(void))operation;
 - (void)task:(WebCoreNSURLSessionDataTask *)task didReceiveCORSAccessCheckResult:(BOOL)result;
+- (void)updateHasSingleSecurityOrigin:(SecurityOrigin&)origin;
 @end
 
@@ -84 +86 @@
     _queue = inQueue ? inQueue : [NSOperationQueue mainQueue];
     _internalQueue = adoptOSObject(dispatch_queue_create("WebCoreNSURLSession _internalQueue", DISPATCH_QUEUE_SERIAL));
+    _hasSingleSecurityOrigin = YES;
 
     return self;
@@ -140 +143 @@
 }
 
+- (void)updateHasSingleSecurityOrigin:(SecurityOrigin&)origin
+{
+    if (!_requestedOrigin) {
+        _requestedOrigin = &origin;
+        return;
+    }
+
+    if (!origin.isSameSchemeHostPort(_requestedOrigin.get()))
+        _hasSingleSecurityOrigin = false;
+}
+
 #pragma mark - NSURLSession API
 @synthesize sessionDescription=_sessionDescription;
@@ -235 +249 @@
         return nil;
 
+    [self updateHasSingleSecurityOrigin:SecurityOrigin::create([request URL])];
+
     WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ request:request];
     _dataTasks.add(task);
@@ -244 +260 @@
     if (_invalidated)
         return nil;
+
+    [self updateHasSingleSecurityOrigin:SecurityOrigin::create(url)];
 
     WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ URL:url];
@@ -525 +543 @@
     ASSERT(isMainThread());
     [self.session task:self didReceiveCORSAccessCheckResult:resource.didPassAccessControlCheck()];
+    [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(response.url())];
     self.countOfBytesExpectedToReceive = response.expectedContentLength();
     [self _setDefersLoading:YES];
@@ -609 +628 @@
     if (response.httpStatusCode() != 302 && response.httpStatusCode() != 307)
         self.currentRequest = [NSURLRequest requestWithURL:request.url()];
+
+    [self.session updateHasSingleSecurityOrigin:SecurityOrigin::create(request.url())];
 }