Changeset 258795 in webkit

Timestamp:

Mar 20, 2020 3:36:45 PM (4 years ago)

Author:

jer.noble@apple.com

Message:

Ensure media cache directory is created before passing to AVURLAsset.
​https://bugs.webkit.org/show_bug.cgi?id=209341

Reviewed by Eric Carlson.

Source/WebCore:

Sandbox changes require the media cache directory to be created before passing to
AVFoundation, to ensure that a sandbox extension is allowed to be created for that
directory.

When the mediaCacheDirectory is empty or null, no longer specify a temporary directory. This
allows clients to disable caching by specifying an empty string for the cache directory.
Since now assetCacheForPath() can return nil, update all the call sites to handle that
possibility. Add a new method, ensureAssetCacheExistsAtPath() which tries to create a
directory at the specified path, and returns nil if that is not possible. This ensures the
cache path exists before adding the AVAssetCache to the AVURLAsset options dictionary.

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

(WebCore::assetCacheForPath):
(WebCore::ensureAssetCacheExistsForPath):
(WebCore::MediaPlayerPrivateAVFoundationObjC::originsInMediaCache):
(WebCore::MediaPlayerPrivateAVFoundationObjC::clearMediaCache):
(WebCore::MediaPlayerPrivateAVFoundationObjC::clearMediaCacheForOrigins):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):

Source/WebKitLegacy/mac:

MediaPlayerPrivateAVFoundaionObjC will no longer create an asset cache in a temporary
directory by default; ensure that it's media cache directory is set during initialization.

• WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (6 diffs)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-20  Jer Noble  <jer.noble@apple.com>
+
+        Ensure media cache directory is created before passing to AVURLAsset.
+        https://bugs.webkit.org/show_bug.cgi?id=209341
+
+        Reviewed by Eric Carlson.
+
+        Sandbox changes require the media cache directory to be created before passing to
+        AVFoundation, to ensure that a sandbox extension is allowed to be created for that
+        directory.
+
+        When the mediaCacheDirectory is empty or null, no longer specify a temporary directory. This
+        allows clients to disable caching by specifying an empty string for the cache directory.
+        Since now assetCacheForPath() can return nil, update all the call sites to handle that
+        possibility. Add a new method, ensureAssetCacheExistsAtPath() which tries to create a
+        directory at the specified path, and returns nil if that is not possible. This ensures the
+        cache path exists before adding the AVAssetCache to the AVURLAsset options dictionary.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::assetCacheForPath):
+        (WebCore::ensureAssetCacheExistsForPath):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::originsInMediaCache):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::clearMediaCache):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::clearMediaCacheForOrigins):
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+
 2020-03-20  David Kilzer  <ddkilzer@apple.com>
 

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

@@ -80 +80 @@
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/BlockObjCExceptions.h>
+#import <wtf/FileSystem.h>
 #import <wtf/ListHashSet.h>
 #import <wtf/NeverDestroyed.h>
@@ -324 +325 @@
 static AVAssetCache *assetCacheForPath(const String& path)
 {
-    NSURL *assetCacheURL;
-    
     if (path.isEmpty())
-        assetCacheURL = [[NSURL fileURLWithPath:NSTemporaryDirectory()] URLByAppendingPathComponent:@"MediaCache" isDirectory:YES];
-    else
-        assetCacheURL = [NSURL fileURLWithPath:path isDirectory:YES];
-
-    return [PAL::getAVAssetCacheClass() assetCacheWithURL:assetCacheURL];
+        return nil;
+
+    return [PAL::getAVAssetCacheClass() assetCacheWithURL:[NSURL fileURLWithPath:path isDirectory:YES]];
+}
+
+static AVAssetCache *ensureAssetCacheExistsForPath(const String& path)
+{
+    if (path.isEmpty())
+        return nil;
+
+    auto fileExistsAtPath = FileSystem::fileExists(path);
+
+    if (fileExistsAtPath && !FileSystem::fileIsDirectory(path, FileSystem::ShouldFollowSymbolicLinks::Yes)) {
+        // Non-directory file already exists at the path location; bail.
+        ASSERT_NOT_REACHED();
+        return nil;
+    }
+
+    if (!fileExistsAtPath && !FileSystem::makeAllDirectories(path)) {
+        // Could not create a directory at the specified location; bail.
+        ASSERT_NOT_REACHED();
+        return nil;
+    }
+
+    return assetCacheForPath(path);
 }
 
@@ -337 +356 @@
 {
     HashSet<RefPtr<SecurityOrigin>> origins;
-    for (NSString *key in [assetCacheForPath(path) allKeys]) {
+    AVAssetCache* assetCache = assetCacheForPath(path);
+    if (!assetCache)
+        return origins;
+
+    for (NSString *key in [assetCache allKeys]) {
         URL keyAsURL = URL(URL(), key);
         if (keyAsURL.isValid())
@@ -354 +377 @@
 {
     AVAssetCache* assetCache = assetCacheForPath(path);
+    if (!assetCache)
+        return;
     
     for (NSString *key in [assetCache allKeys]) {
@@ -396 +421 @@
 {
     AVAssetCache* assetCache = assetCacheForPath(path);
+    if (!assetCache)
+        return;
+
     for (NSString *key in [assetCache allKeys]) {
         URL keyAsURL = URL(URL(), key);
@@ -841 +869 @@
     [options setObject:@(!usePersistentCache) forKey:AVURLAssetUsesNoPersistentCacheKey];
     
-    if (usePersistentCache)
-        [options setObject:assetCacheForPath(player()->mediaCacheDirectory()) forKey:AVURLAssetCacheKey];
+    if (usePersistentCache) {
+        if (auto* assetCache = ensureAssetCacheExistsForPath(player()->mediaCacheDirectory()))
+            [options setObject:assetCache forKey:AVURLAssetCacheKey];
+        else
+            [options setObject:@NO forKey:AVURLAssetUsesNoPersistentCacheKey];
+    }
 
     NSURL *cocoaURL = canonicalURL(url);

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2020-03-20  Jer Noble  <jer.noble@apple.com>
+
+        Ensure media cache directory is created before passing to AVURLAsset.
+        https://bugs.webkit.org/show_bug.cgi?id=209341
+
+        Reviewed by Eric Carlson.
+
+        MediaPlayerPrivateAVFoundaionObjC will no longer create an asset cache in a temporary
+        directory by default; ensure that it's media cache directory is set during initialization.
+
+        * WebView/WebView.mm:
+        (-[WebView _commonInitializationWithFrameName:groupName:]):
+
 2020-03-20  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -1428 +1428 @@
             WebCore::DeprecatedGlobalSettings::setShouldManageAudioSessionCategory(true);
 #endif
+
+#if ENABLE(VIDEO)
+        WebCore::HTMLMediaElement::setMediaCacheDirectory(FileSystem::pathByAppendingComponent(NSTemporaryDirectory(), "MediaCache/"_s));
+#endif
         didOneTimeInitialization = true;
     }