Changeset 128003 in webkit

Timestamp:

Sep 9, 2012 3:48:00 PM (12 years ago)

Author:

weinig@apple.com

Message:

Switch to entering the sandbox directly from main(), rather than waiting for the initialization message
​https://bugs.webkit.org/show_bug.cgi?id=96194

Reviewed by Dan Bernstein.

Source/WebKit2:

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess):
Pass a client identifier to WebProcess as a command line argument
so that it can be used to create private temporary and cache directories.

• WebProcess/WebProcess.h:

(WebProcess):

• WebProcess/mac/WebProcessMac.mm:

(WebKit::WebProcess::initializeSandbox):
(WebKit::WebProcess::platformInitializeWebProcess):
Expose the initializeSandbox() function and stop calling it from platformInitializeWebProcess()
since it is now going to be called from WebProcessMain. Also, move changing the current working
directory to sandbox initialization function and replace use of creation parameters with just
the client identifier.

• WebProcess/com.apple.WebProcess.sb.in:

Add some new exceptions that come from entering the sandbox earlier in the AppKit
initialization process. Don't allow access to com.apple.coreservices.appleevents.

• WebProcess/mac/WebProcessMainMac.mm:

(WebKit::WebProcessMainXPC):
(WebKit::WebProcessMain):
Enter the sandbox explicitly, not waiting until the initialization message. Also,
since we now have an extra parameter for the client identifier, make the WebProcess
launches the UIProcess code path work by extracting a client identifier from the
client executable path.

WebKitLibraries:

Update WKSI with SPI for getting the bundle URL from an executable URL.

• WebKitSystemInterface.h:
• libWebKitSystemInterfaceLion.a:
• libWebKitSystemInterfaceMountainLion.a:
• libWebKitSystemInterfaceSnowLeopard.a:

Adds WKCopyBundleURLForExecutableURL().

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (1 diff)
• Source/WebKit2/WebProcess/WebProcess.h (modified) (1 diff)
• Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (modified) (4 diffs)
• Source/WebKit2/WebProcess/mac/WebProcessMac.mm (modified) (3 diffs)
• Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm (modified) (7 diffs)
• Tools/Scripts/run-test-webkit-api (modified) (1 diff)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/WebKitSystemInterface.h (modified) (1 diff)
• WebKitLibraries/libWebKitSystemInterfaceLion.a (modified) (previous)
• WebKitLibraries/libWebKitSystemInterfaceMountainLion.a (modified) (previous)
• WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a (modified) (previous)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-08  Sam Weinig  <sam@webkit.org>
+
+        Switch to entering the sandbox directly from main(), rather than waiting for the initialization message
+        https://bugs.webkit.org/show_bug.cgi?id=96194
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::ProcessLauncher::launchProcess):
+        Pass a client identifier to WebProcess as a command line argument
+        so that it can be used to create private temporary and cache directories.
+
+        * WebProcess/WebProcess.h:
+        (WebProcess):
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::WebProcess::initializeSandbox):
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        Expose the initializeSandbox() function and stop calling it from platformInitializeWebProcess()
+        since it is now going to be called from WebProcessMain.  Also, move changing the current working
+        directory to sandbox initialization function and replace use of creation parameters with just
+        the client identifier.
+
+        * WebProcess/com.apple.WebProcess.sb.in:
+        Add some new exceptions that come from entering the sandbox earlier in the AppKit
+        initialization process. Don't allow access to com.apple.coreservices.appleevents.
+
+        * WebProcess/mac/WebProcessMainMac.mm:
+        (WebKit::WebProcessMainXPC):
+        (WebKit::WebProcessMain):
+        Enter the sandbox explicitly, not waiting until the initialization message.  Also,
+        since we now have an extra parameter for the client identifier, make the WebProcess
+        launches the UIProcess code path work by extracting a client identifier from the 
+        client executable path.
+
 2012-09-09  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -223 +223 @@
         RetainPtr<CFStringRef> cfLocalization(AdoptCF, WKCopyCFLocalizationPreferredName(NULL));
         CString localization = String(cfLocalization.get()).utf8();
-        
+
+        NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
+        CString clientIdentifier = bundleIdentifier ? String([[NSBundle mainBundle] bundleIdentifier]).utf8() : *_NSGetProgname();
+
         // Make a unique, per pid, per process launcher web process service name.
         CString serviceName = String::format("com.apple.WebKit.WebProcess-%d-%p", getpid(), this).utf8();
 
-        const char* args[] = { [processAppExecutablePath fileSystemRepresentation], frameworkExecutablePath, "-type", processTypeAsString(m_launchOptions.processType), "-servicename", serviceName.data(), "-localization", localization.data(), 0 };
+        const char* args[] = { [processAppExecutablePath fileSystemRepresentation], frameworkExecutablePath, "-type", processTypeAsString(m_launchOptions.processType), "-servicename", serviceName.data(), "-localization", localization.data(), "-client-identifier", clientIdentifier.data(), 0 };
 
         // Register ourselves.

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -129 +129 @@
 #if PLATFORM(MAC)
     void initializeShim();
+    void initializeSandbox(const String& clientIdentifier);
 
 #if USE(ACCELERATED_COMPOSITING)

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

@@ -52 +52 @@
        (home-literal "/Library/Preferences/com.apple.security.plist")
        (home-literal "/Library/Preferences/com.apple.security.revocation.plist")
+       (home-literal "/Library/Preferences/com.apple.speech.recognition.AppleSpeechRecognition.prefs.plist")
        (home-literal "/Library/Application Support/SyncServices/Local/ClientsWithChanges/com.apple.Keychain")
        (home-regex #"/Library/Preferences/com\.apple\.driver\.(AppleBluetoothMultitouch\.mouse|AppleBluetoothMultitouch\.trackpad|AppleHIDMouse)\.plist$")
@@ -71 +72 @@
        (subpath "/Library/QuickTime")
 
-       (home-subpath "/Library/Dictionaries"))
+       (home-subpath "/Library/Dictionaries")
+       (home-subpath "/Library/Keyboard Layouts")
+       (home-subpath "/Library/Input Methods"))
 
 ;; This should be updated when <rdar://problem/9355830> is fixed.
@@ -148 +151 @@
        (global-name "com.apple.cfnetwork.AuthBrokerAgent")
        (global-name "com.apple.PowerManagement.control")
+       (global-name "com.apple.speech.recognitionserver")
 
        ;; FIXME: This should be removed when <rdar://problem/9276393> is fixed.
@@ -188 +192 @@
        (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2")
        (home-literal "/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV2-journal"))
+
+(deny mach-lookup (with no-log)
+       (global-name "com.apple.coreservices.appleevents"))

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

@@ -181 +181 @@
 #endif
 
-static void initializeSandbox(const WebProcessCreationParameters& parameters)
-{
+void WebProcess::initializeSandbox(const String& clientIdentifier)
+{
+    [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
+
 #if ENABLE(WEB_PROCESS_SANDBOX)
 
@@ -192 +194 @@
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     // Use private temporary and cache directories.
-    String systemDirectorySuffix = "com.apple.WebProcess+" + parameters.uiProcessBundleIdentifier;
+    String systemDirectorySuffix = "com.apple.WebProcess+" + clientIdentifier;
     setenv("DIRHELPER_USER_DIR_SUFFIX", fileSystemRepresentation(systemDirectorySuffix).data(), 0);
     char temporaryDirectory[PATH_MAX];
@@ -249 +251 @@
 void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::ArgumentDecoder*)
 {
-    [[NSFileManager defaultManager] changeCurrentDirectoryPath:[[NSBundle mainBundle] bundlePath]];
-
-    initializeSandbox(parameters);
-
     SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
     SandboxExtension::consumePermanently(parameters.localStorageDirectoryExtensionHandle);

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

@@ -30 +30 @@
 #import "EnvironmentUtilities.h"
 #import "EnvironmentVariables.h"
+#import "StringUtilities.h"
 #import "WebProcess.h"
 #import "WebSystemInterface.h"
@@ -94 +95 @@
     RunLoop::initializeMainRunLoop();
 
-    // Initialize the shim.
     // FIXME: Make the shim work.
     WebProcess::shared().initializeShim();
-
-    // Create the connection.
+    // FIXME: Pass the client identifier here.
+    WebProcess::shared().initializeSandbox(String());
     WebProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort, xpcConnection), RunLoop::main());
 
@@ -125 +125 @@
     if (serviceName.isEmpty() && clientExecutable.isEmpty())
         return EXIT_FAILURE;
+
+    String clientIdentifier;
 
     // Get the server port.
@@ -133 +135 @@
             WTFLogAlways("bootstrap_look_up result: %s (%x)\n", mach_error_string(kr), kr);
             return 2;
+        }
+        
+        clientIdentifier = commandLine["client-identifier"];
+        if (!clientIdentifier) {
+            WTFLogAlways("No client identifier passed to the WebProcess");
+            return EXIT_FAILURE;
         }
     }
@@ -186 +194 @@
             return EXIT_FAILURE;
         }
+
+        RetainPtr<NSURL> clientExecutableURL = adoptNS([[NSURL alloc] initFileURLWithPath:nsStringFromWebCoreString(clientExecutable)]);
+        RetainPtr<CFURLRef> clientBundleURL = adoptCF(WKCopyBundleURLForExecutableURL((CFURLRef)clientExecutableURL.get()));
+        RetainPtr<NSBundle> clientBundle = adoptNS([[NSBundle alloc] initWithURL:(NSURL *)clientBundleURL.get()]);
+        
+        clientIdentifier = [clientBundle.get() bundleIdentifier];
+        if (!clientIdentifier) {
+            WTFLogAlways("Failed to obtain bundle identifier from the client executable. .\n");
+            return EXIT_FAILURE;
+        }
     }
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
@@ -207 +225 @@
     RunLoop::initializeMainRunLoop();
 
-    // Initialize the shim.
-    WebProcess::shared().initializeShim();
-
-    // Create the connection.
-    WebProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());
-
-    [pool drain];
-
 #if USE(APPKIT)
      // Initialize AppKit.
@@ -224 +234 @@
 #endif
 
+    WebProcess::shared().initializeShim();
+    WebProcess::shared().initializeSandbox(clientIdentifier);
+    WebProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());
+
     WKAXRegisterRemoteApp();
-    
+
+    [pool drain];
+
     RunLoop::run();
 

trunk/Tools/Scripts/run-test-webkit-api

@@ -27 +27 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Simplified "run" script for launching the WebKit2 estWebKitAPI.
+# Simplified "run" script for launching TestWebKitAPI.
 
 use strict;

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2012-09-08  Sam Weinig  <sam@webkit.org>
+
+        Switch to entering the sandbox directly from main(), rather than waiting for the initialization message
+        https://bugs.webkit.org/show_bug.cgi?id=96194
+
+        Reviewed by Dan Bernstein.
+
+        Update WKSI with SPI for getting the bundle URL from an executable URL.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        Adds WKCopyBundleURLForExecutableURL().
+
 2012-08-29  Tony Chang  <tony@chromium.org>
 

trunk/WebKitLibraries/WebKitSystemInterface.h

@@ -249 +249 @@
 
 void WKSetVisibleApplicationName(CFStringRef);
+
+CFURLRef WKCopyBundleURLForExecutableURL(CFURLRef);
 
 typedef enum {