Changeset 149619 in webkit

Timestamp:

May 6, 2013 11:40:29 AM (11 years ago)

Author:

ap@apple.com

Message:

<rdar://problem/13479806> [Mac] Pass plug-in bundle ID to LaunchServices
​https://bugs.webkit.org/show_bug.cgi?id=115483

Reviewed by Darin Adler.

• PluginProcess/PluginProcess.h: Added m_pluginBundleIdentifier. We now need it in multiple places, so it's easier to pre-compute it.

• PluginProcess/mac/PluginProcessMac.mm: (WebKit::loadSandboxProfileForDirectory): Changed to use precomputed bundle ID. (WebKit::loadSandboxProfile): Ditto. (WebKit::PluginProcess::platformInitializeProcess): Pre-compute bundle ID. (WebKit::PluginProcess::initializeProcessName): Pass it to LaunchServices. (WebKit::PluginProcess::initializeSandbox): Pass precomputed bundle ID instead of a path.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginProcess.h (modified) (1 diff)
• PluginProcess/mac/PluginProcessMac.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-06  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/13479806> [Mac] Pass plug-in bundle ID to LaunchServices
+        https://bugs.webkit.org/show_bug.cgi?id=115483
+
+        Reviewed by Darin Adler.
+
+        * PluginProcess/PluginProcess.h: Added m_pluginBundleIdentifier. We now need it
+        in multiple places, so it's easier to pre-compute it.
+
+        * PluginProcess/mac/PluginProcessMac.mm:
+        (WebKit::loadSandboxProfileForDirectory): Changed to use precomputed bundle ID.
+        (WebKit::loadSandboxProfile): Ditto.
+        (WebKit::PluginProcess::platformInitializeProcess): Pre-compute bundle ID.
+        (WebKit::PluginProcess::initializeProcessName): Pass it to LaunchServices.
+        (WebKit::PluginProcess::initializeSandbox): Pass precomputed bundle ID instead of
+        a path.
+
 2013-05-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginProcess.h

@@ -98 +98 @@
     String m_pluginPath;
 
+#if PLATFORM(MAC)
+    String m_pluginBundleIdentifier;
+#endif
+
     // The plug-in module.
     RefPtr<NetscapePluginModule> m_pluginModule;

trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm

@@ -45 +45 @@
 using namespace WebCore;
 
+const CFStringRef kLSPlugInBundleIdentifierKey = CFSTR("LSPlugInBundleIdentifierKey");
+
 namespace WebKit {
 
@@ -281 +283 @@
 }
 
-static String loadSandboxProfileForDirectory(const String& pluginPath, NSString *sandboxProfileDirectoryPath)
-{
-    RetainPtr<CFURLRef> pluginURL = adoptCF(CFURLCreateWithFileSystemPath(0, pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
-    if (!pluginURL)
-        return String();
-
-    RetainPtr<CFBundleRef> pluginBundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, pluginURL.get()));
-    if (!pluginBundle)
-        return String();
-
-    String bundleIdentifier = CFBundleGetIdentifier(pluginBundle.get());
+static String loadSandboxProfileForDirectory(const String& bundleIdentifier, NSString *sandboxProfileDirectoryPath)
+{
     if (bundleIdentifier.isEmpty())
         return String();
 
     // Fold all / characters to : to prevent the plugin bundle-id from trying to escape the profile directory
-    bundleIdentifier.replace('/', ':');
+    String sanitizedBundleIdentifier = bundleIdentifier;
+    sanitizedBundleIdentifier.replace('/', ':');
 
     RetainPtr<CFURLRef> sandboxProfileDirectory = adoptCF(CFURLCreateWithFileSystemPath(0, (CFStringRef)sandboxProfileDirectoryPath, kCFURLPOSIXPathStyle, TRUE));
 
-    RetainPtr<CFStringRef> sandboxFileName = adoptCF(CFStringCreateWithFormat(0, 0, CFSTR("%@.sb"), bundleIdentifier.createCFString().get()));
+    RetainPtr<CFStringRef> sandboxFileName = adoptCF(CFStringCreateWithFormat(0, 0, CFSTR("%@.sb"), sanitizedBundleIdentifier.createCFString().get()));
     RetainPtr<CFURLRef> sandboxURL = adoptCF(CFURLCreateWithFileSystemPathRelativeToBase(0, sandboxFileName.get(), kCFURLPOSIXPathStyle, FALSE, sandboxProfileDirectory.get()));
 
@@ -316 +310 @@
 }
 
-static String loadSandboxProfile(const String& pluginPath)
+static String loadSandboxProfile(const String& bundleIdentifier)
 {
     // First look in the WebKit2 bundle.
-    String sandboxProfile = loadSandboxProfileForDirectory(pluginPath, [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"]);
+    String sandboxProfile = loadSandboxProfileForDirectory(bundleIdentifier, [[[NSBundle bundleForClass:NSClassFromString(@"WKView")] resourcePath] stringByAppendingPathComponent:@"PlugInSandboxProfiles"]);
     if (!sandboxProfile.isEmpty())
         return sandboxProfile;
 
     // Then try /System/Library/Sandbox/Profiles/.
-    sandboxProfile = loadSandboxProfileForDirectory(pluginPath, @"/System/Library/Sandbox/Profiles/");
+    sandboxProfile = loadSandboxProfileForDirectory(bundleIdentifier, @"/System/Library/Sandbox/Profiles/");
     if (!sandboxProfile.isEmpty())
         return sandboxProfile;
@@ -365 +359 @@
     [defaults release];
 #endif
+
+    RetainPtr<CFURLRef> pluginURL = adoptCF(CFURLCreateWithFileSystemPath(0, m_pluginPath.createCFString().get(), kCFURLPOSIXPathStyle, false));
+    if (!pluginURL)
+        return;
+
+    RetainPtr<CFBundleRef> pluginBundle = adoptCF(CFBundleCreate(kCFAllocatorDefault, pluginURL.get()));
+    if (!pluginBundle)
+        return;
+
+    m_pluginBundleIdentifier = CFBundleGetIdentifier(pluginBundle.get());
 }
 
@@ -371 +375 @@
     NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ (%@ Internet plug-in)", "visible name of the plug-in host process. The first argument is the plug-in name and the second argument is the application name."), [[(NSString *)m_pluginPath lastPathComponent] stringByDeletingPathExtension], (NSString *)parameters.uiProcessName];
     WKSetVisibleApplicationName((CFStringRef)applicationName);
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+    if (!m_pluginBundleIdentifier.isEmpty())
+        WKSetApplicationInformationItem(kLSPlugInBundleIdentifierKey, m_pluginBundleIdentifier.createCFString().get());
+#endif
 }
 
 void PluginProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters)
 {
-    String sandboxProfile = loadSandboxProfile(m_pluginPath);
+    String sandboxProfile = loadSandboxProfile(m_pluginBundleIdentifier);
     if (sandboxProfile.isEmpty())
         return;