Changeset 86967 in webkit

Timestamp:

May 20, 2011 11:18:37 AM (13 years ago)

Author:

weinig@apple.com

Message:

2011-05-20 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

WebKit2: Media files cannot be saved in the Application Cache due to a sandbox violation
​https://bugs.webkit.org/show_bug.cgi?id=61199

Instead of using a sandbox extension to give permission to the application cache directory,
initialize the sandbox with access to it like we do for other databases.

• Shared/WebProcessCreationParameters.cpp: (WebKit::WebProcessCreationParameters::encode): (WebKit::WebProcessCreationParameters::decode):
• Shared/WebProcessCreationParameters.h:
• UIProcess/WebContext.cpp: (WebKit::WebContext::ensureWebProcess):
• WebProcess/WebProcess.cpp: (WebKit::WebProcess::initializeWebProcess):
• WebProcess/com.apple.WebProcess.sb:
• WebProcess/mac/WebProcessMac.mm: (WebKit::initializeSandbox):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/WebContext.cpp (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)
• WebProcess/com.apple.WebProcess.sb (modified) (1 diff)
• WebProcess/mac/WebProcessMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-20  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        WebKit2: Media files cannot be saved in the Application Cache due to a sandbox violation
+        https://bugs.webkit.org/show_bug.cgi?id=61199
+
+        Instead of using a sandbox extension to give permission to the application cache directory,
+        initialize the sandbox with access to it like we do for other databases.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        * WebProcess/com.apple.WebProcess.sb:
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::initializeSandbox):
+
 2011-05-20  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -52 +52 @@
     encoder->encode(injectedBundlePathExtensionHandle);
     encoder->encode(applicationCacheDirectory);
-    encoder->encode(applicationCacheDirectoryExtensionHandle);
     encoder->encode(databaseDirectory);
     encoder->encode(localStorageDirectory);
@@ -99 +98 @@
         return false;
     if (!decoder->decode(parameters.applicationCacheDirectory))
-        return false;
-    if (!decoder->decode(parameters.applicationCacheDirectoryExtensionHandle))
         return false;
     if (!decoder->decode(parameters.databaseDirectory))

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -54 +54 @@
     SandboxExtension::Handle injectedBundlePathExtensionHandle;
 
-    String applicationCacheDirectory;
-    SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
-    
+    String applicationCacheDirectory;    
     String databaseDirectory;
     String localStorageDirectory;

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -222 +222 @@
     WebProcessCreationParameters parameters;
 
-    parameters.applicationCacheDirectory = applicationCacheDirectory();
-    if (!parameters.applicationCacheDirectory.isEmpty())
-        SandboxExtension::createHandle(parameters.applicationCacheDirectory, SandboxExtension::ReadWrite, parameters.applicationCacheDirectoryExtensionHandle);
-
     if (!injectedBundlePath().isEmpty()) {
         parameters.injectedBundlePath = injectedBundlePath();
-
         SandboxExtension::createHandle(parameters.injectedBundlePath, SandboxExtension::ReadOnly, parameters.injectedBundlePathExtensionHandle);
     }
@@ -241 +236 @@
     parameters.presenterApplicationPid = getpid();
 #endif
-    
+
     copyToVector(m_schemesToRegisterAsEmptyDocument, parameters.urlSchemesRegistererdAsEmptyDocument);
     copyToVector(m_schemesToRegisterAsSecure, parameters.urlSchemesRegisteredAsSecure);

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -195 +195 @@
     
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    if (!parameters.applicationCacheDirectory.isEmpty()) {
-        m_applicationCachePathExtension = SandboxExtension::create(parameters.applicationCacheDirectoryExtensionHandle);
-        m_applicationCachePathExtension->consume();
-
+    if (!parameters.applicationCacheDirectory.isEmpty())
         cacheStorage().setCacheDirectory(parameters.applicationCacheDirectory);
-    }
 #endif
 

trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb

@@ -106 +106 @@
     (allow file* (subpath (param "DARWIN_USER_TEMP_DIR"))))
 
-;; Database dir
+;; Database directory.
 (if (positive? (string-length (param "WEBKIT_DATABASE_DIR")))
     (allow file* (subpath (param "WEBKIT_DATABASE_DIR"))))
 
-;; LocalStorage dir
+;; LocalStorage directory.
 (if (positive? (string-length (param "WEBKIT_LOCALSTORAGE_DIR")))
     (allow file* (subpath (param "WEBKIT_LOCALSTORAGE_DIR"))))
+
+;; ApplicationCache directory.
+(if (positive? (string-length (param "WEBKIT_APPLICATION_CACHE_DIR")))
+    (allow file* (subpath (param "WEBKIT_APPLICATION_CACHE_DIR"))))
 
 ;; The NSURLCache directory.

trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

@@ -188 +188 @@
     appendReadwriteSandboxDirectory(sandboxParameters, "WEBKIT_DATABASE_DIR", parameters.databaseDirectory);
     appendReadwriteSandboxDirectory(sandboxParameters, "WEBKIT_LOCALSTORAGE_DIR", parameters.localStorageDirectory);
+    appendReadwriteSandboxDirectory(sandboxParameters, "WEBKIT_APPLICATION_CACHE_DIR", parameters.applicationCacheDirectory);
     appendReadwriteSandboxDirectory(sandboxParameters, "NSURL_CACHE_DIR", parameters.nsURLCachePath);