Changeset 220389 in webkit

Timestamp:

Aug 8, 2017 12:29:22 AM (7 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220247. rdar://problem/33754443

Location:

branches/safari-604-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp (modified) (2 diffs)
• platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm (modified) (8 diffs)
• platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (modified) (1 diff)

branches/safari-604-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-08  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220247. rdar://problem/33754443
+
+    2017-08-03  Jer Noble  <jer.noble@apple.com>
+
+            [EME][Mac] SecureStop left on disk in Private Browsing mode.
+            https://bugs.webkit.org/show_bug.cgi?id=175162
+
+            Reviewed by Eric Carlson.
+
+            Return an empty string from mediaKeysStorageDirectory() when the page indicates that storage should
+            be ephemeral(). Previously, an empty string in this case would be treated as an error. Instead, treat
+            an empty string as valid, and do not try to store or retrieve session information to disk in that case.
+
+            * Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp:
+            (WebCore::WebKitMediaKeySession::mediaKeysStorageDirectory const):
+            * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+            (WebCore::CDMSessionAVContentKeySession::releaseKeys):
+            (WebCore::CDMSessionAVContentKeySession::update):
+            (WebCore::CDMSessionAVContentKeySession::generateKeyReleaseMessage):
+            (WebCore::CDMSessionAVContentKeySession::contentKeySession):
+            * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+            (WebCore::CDMSessionMediaSourceAVFObjC::storagePath const):
+
 2017-08-07  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604-branch/Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.cpp

@@ -33 +33 @@
 #include "ExceptionCode.h"
 #include "FileSystem.h"
+#include "Page.h"
 #include "SecurityOriginData.h"
 #include "Settings.h"
@@ -224 +225 @@
         return emptyString();
 
+    auto* page = document->page();
+    if (!page || page->usesEphemeralSession())
+        return emptyString();
+
     auto storageDirectory = document->settings().mediaKeysStorageDirectory();
     if (storageDirectory.isEmpty())

branches/safari-604-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm

@@ -46 +46 @@
 SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVContentKeySession);
 SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVContentKeyRequestProtocolVersionsKey, NSString *)
+SOFT_LINK_CONSTANT_MAY_FAIL(AVFoundation, AVContentKeySystemFairPlayStreaming, NSString *)
+
+typedef NSString *AVContentKeySystem;
 
 @interface AVContentKeySession : NSObject
++ (instancetype)contentKeySessionWithKeySystem:(AVContentKeySystem)keySystem;
 - (instancetype)initWithStorageDirectoryAtURL:(NSURL *)storageURL;
 @property (assign) id delegate;
@@ -192 +196 @@
             return;
 
+        auto storagePath = this->storagePath();
+        if (storagePath.isEmpty())
+            return;
+
         RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
-        NSArray* expiredSessions = [getAVContentKeySessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath()]];
+        NSArray* expiredSessions = [getAVContentKeySessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath]];
         for (NSData* expiredSessionData in expiredSessions) {
             NSDictionary *expiredSession = [NSPropertyListSerialization propertyListWithData:expiredSessionData options:kCFPropertyListImmutable format:nullptr error:nullptr];
@@ -240 +248 @@
         LOG(Media, "CDMSessionAVContentKeySession::update(%p) - acknowleding secure stop message", this);
 
-        if (!m_expiredSession) {
+        String storagePath = this->storagePath();
+        if (!m_expiredSession || storagePath.isEmpty()) {
             errorCode = MediaPlayer::InvalidPlayerState;
             return false;
@@ -248 +257 @@
 
         if ([getAVContentKeySessionClass() respondsToSelector:@selector(removePendingExpiredSessionReports:withAppIdentifier:storageDirectoryAtURL:)])
-            [getAVContentKeySessionClass() removePendingExpiredSessionReports:@[m_expiredSession.get()] withAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath()]];
+            [getAVContentKeySessionClass() removePendingExpiredSessionReports:@[m_expiredSession.get()] withAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath]];
         m_expiredSession = nullptr;
         return true;
@@ -316 +325 @@
     RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
 
-    if (![getAVContentKeySessionClass() respondsToSelector:@selector(pendingExpiredSessionReportsWithAppIdentifier:storageDirectoryAtURL:)]) {
+    String storagePath = this->storagePath();
+    if (storagePath.isEmpty() || ![getAVContentKeySessionClass() respondsToSelector:@selector(pendingExpiredSessionReportsWithAppIdentifier:storageDirectoryAtURL:)]) {
         errorCode = MediaPlayer::KeySystemNotSupported;
         systemCode = '!mor';
@@ -322 +332 @@
     }
 
-    NSArray* expiredSessions = [getAVContentKeySessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath()]];
+    NSArray* expiredSessions = [getAVContentKeySessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:storagePath]];
     if (![expiredSessions count]) {
         LOG(Media, "CDMSessionAVContentKeySession::generateKeyReleaseMessage(%p) - no expired sessions found", this);
@@ -346 +356 @@
 AVContentKeySession* CDMSessionAVContentKeySession::contentKeySession()
 {
-    if (!m_contentKeySession) {
-
-        String storagePath = this->storagePath();
-        if (storagePath.isEmpty())
+    if (m_contentKeySession)
+        return m_contentKeySession.get();
+
+    String storagePath = this->storagePath();
+    if (storagePath.isEmpty()) {
+        if (![getAVContentKeySessionClass() respondsToSelector:@selector(contentKeySessionWithKeySystem:)] || !canLoadAVContentKeySystemFairPlayStreaming())
             return nil;
 
+        m_contentKeySession = [getAVContentKeySessionClass() contentKeySessionWithKeySystem:getAVContentKeySystemFairPlayStreaming()];
+    } else {
         String storageDirectory = directoryName(storagePath);
 
@@ -360 +374 @@
 
         m_contentKeySession = adoptNS([allocAVContentKeySessionInstance() initWithStorageDirectoryAtURL:[NSURL fileURLWithPath:storagePath]]);
-        m_contentKeySession.get().delegate = m_contentKeySessionDelegate.get();
-    }
-
+    }
+
+    m_contentKeySession.get().delegate = m_contentKeySessionDelegate.get();
     return m_contentKeySession.get();
 }

branches/safari-604-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm

@@ -99 +99 @@
 String CDMSessionMediaSourceAVFObjC::storagePath() const
 {
-    return m_client ? pathByAppendingComponent(m_client->mediaKeysStorageDirectory(), "SecureStop.plist") : emptyString();
+    if (!m_client)
+        return emptyString();
+
+    String storageDirectory = m_client->mediaKeysStorageDirectory();
+    if (storageDirectory.isEmpty())
+        return emptyString();
+
+    return pathByAppendingComponent(storageDirectory, "SecureStop.plist");
 }