Changeset 271417 in webkit

Timestamp:

Jan 12, 2021 2:47:15 PM (3 years ago)

Author:

pvollan@apple.com

Message:

[macOS] Reset user directory suffix before getting sandbox directory
​https://bugs.webkit.org/show_bug.cgi?id=220358
<rdar://problem/57616019>

Reviewed by Alexey Proskuryakov.

Source/WebCore/PAL:

Declare functions to get and set user directory suffix.

• pal/spi/cocoa/CoreServicesSPI.h:

Source/WebKit:

Reset the user directory suffix before getting the sandbox data vault directory with confstr. We do not want to include the user
directory suffix, since the sandbox data vault will then end up inside the host process' cache folder, which is undesirable.
Also, creating the data vault directory with confstr can fail under some circumstances if the user directory suffix is not empty.
This patch also changes how we next set the user directory suffix for the process. Instead of setting the environment variable
DIRHELPER_USER_DIR_SUFFIX, we can use the SPI _set_user_dir_suffix. The behavior should be identical, but I believe it is better
to use SPI for this.

• Shared/mac/AuxiliaryProcessMac.mm:

(WebKit::initializeSandboxParameters):
(WebKit::AuxiliaryProcess::initializeSandbox):

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/CoreServicesSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/mac/AuxiliaryProcessMac.mm (modified) (2 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-01-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] Reset user directory suffix before getting sandbox directory
+        https://bugs.webkit.org/show_bug.cgi?id=220358
+        <rdar://problem/57616019>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Declare functions to get and set user directory suffix.
+
+        * pal/spi/cocoa/CoreServicesSPI.h:
+
 2021-01-12  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/CoreServicesSPI.h

@@ -26 +26 @@
 #pragma once
 
-extern "C" void _CSCheckFixDisable();
-extern "C" CFArrayRef _UTCopyDeclaredTypeIdentifiers(void);
+WTF_EXTERN_C_BEGIN
 
+void _CSCheckFixDisable();
+CFArrayRef _UTCopyDeclaredTypeIdentifiers(void);
+
+char *_get_user_dir_suffix();
+bool _set_user_dir_suffix(const char *user_dir_suffix);
+
+WTF_EXTERN_C_END

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-12  Per Arne Vollan  <pvollan@apple.com>
+
+        [macOS] Reset user directory suffix before getting sandbox directory
+        https://bugs.webkit.org/show_bug.cgi?id=220358
+        <rdar://problem/57616019>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Reset the user directory suffix before getting the sandbox data vault directory with confstr. We do not want to include the user 
+        directory suffix, since the sandbox data vault will then end up inside the host process' cache folder, which is undesirable. 
+        Also, creating the data vault directory with confstr can fail under some circumstances if the user directory suffix is not empty. 
+        This patch also changes how we next set the user directory suffix for the process. Instead of setting the environment variable 
+        DIRHELPER_USER_DIR_SUFFIX, we can use the SPI _set_user_dir_suffix. The behavior should be identical, but I believe it is better 
+        to use SPI for this.
+
+        * Shared/mac/AuxiliaryProcessMac.mm:
+        (WebKit::initializeSandboxParameters):
+        (WebKit::AuxiliaryProcess::initializeSandbox):
+
 2021-01-12  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKit/Shared/mac/AuxiliaryProcessMac.mm

@@ -656 +656 @@
 
     // Use private temporary and cache directories.
-    setenv("DIRHELPER_USER_DIR_SUFFIX", FileSystem::fileSystemRepresentation(sandboxParameters.userDirectorySuffix()).data(), 1);
+    _set_user_dir_suffix(FileSystem::fileSystemRepresentation(sandboxParameters.userDirectorySuffix()).data());
     char temporaryDirectory[PATH_MAX];
     if (!confstr(_CS_DARWIN_USER_TEMP_DIR, temporaryDirectory, sizeof(temporaryDirectory))) {
@@ -700 +700 @@
     // This must be called before initializeSandboxParameters so that the path does not include the user directory suffix.
     // We don't want the user directory suffix because we want all processes of the same type to use the same cache directory.
+    // First, make sure the user directory suffix is empty at this point. This is normally already the case, but some host
+    // processes are setting the user directory suffix, which we will inherit, and our sandbox datavault will then end up
+    // inside the host process' cache folder, which is undesirable.
+    _set_user_dir_suffix(nullptr);
     String dataVaultParentDirectory { sandboxDataVaultParentDirectory() };
 #else