Changeset 183209 in webkit

Timestamp:

Apr 23, 2015, 2:14:56 PM (10 years ago)

Author:

ap@apple.com

Message:

[iOS] WebKit services should inherit environment variables for home
​https://bugs.webkit.org/show_bug.cgi?id=144078
rdar://problem/20571678

Reviewed by Dan Bernstein.

Source/WebCore:

Added an SPI header for a drive-by fix.

• WebCore.xcodeproj/project.pbxproj:
• platform/spi/cf/CFBundleSPI.h: Added.

Source/WebKit2:

Pass current environment variables as XPC bootstrap. Also while at it, made
_CFBundleSetupXPCBootstrap not soft linked.

• Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:

(main):

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::connectToService):

Source/WTF:

• wtf/spi/darwin/XPCSPI.h: Added xpc_copy_bootstrap and xpc_dictionary_apply.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/spi/darwin/XPCSPI.h (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/platform/spi/cf/CFBundleSPI.h (added)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm (modified) (1 diff)
• WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-04-23  Alexey Proskuryakov  <ap@apple.com>
+
+        [iOS] WebKit services should inherit environment variables for home
+        https://bugs.webkit.org/show_bug.cgi?id=144078
+        rdar://problem/20571678
+
+        Reviewed by Dan Bernstein.
+
+        * wtf/spi/darwin/XPCSPI.h: Added xpc_copy_bootstrap and xpc_dictionary_apply.
+
 2015-04-23  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h

@@ -59 +59 @@
 #if COMPILER_SUPPORTS(BLOCKS)
 typedef bool (^xpc_array_applier_t)(size_t index, xpc_object_t);
+typedef bool (^xpc_dictionary_applier_t)(const char *key, xpc_object_t value);
 typedef void (^xpc_handler_t)(xpc_object_t);
 #endif
@@ -99 +100 @@
 #if COMPILER_SUPPORTS(BLOCKS)
 EXTERN_C bool xpc_array_apply(xpc_object_t, xpc_array_applier_t);
+EXTERN_C bool xpc_dictionary_apply(xpc_object_t xdict, xpc_dictionary_applier_t applier);
 #endif
 EXTERN_C size_t xpc_array_get_count(xpc_object_t);
@@ -143 +145 @@
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 EXTERN_C void xpc_connection_set_bootstrap(xpc_connection_t, xpc_object_t bootstrap);
+EXTERN_C xpc_object_t xpc_copy_bootstrap(void);
 #endif
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-22  Alexey Proskuryakov  <ap@apple.com>
+
+        [iOS] WebKit services should inherit environment variables for home
+        https://bugs.webkit.org/show_bug.cgi?id=144078
+        rdar://problem/20571678
+
+        Reviewed by Dan Bernstein.
+
+        Added an SPI header for a drive-by fix.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/spi/cf/CFBundleSPI.h: Added.
+
 2015-04-23  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5999 +5999 @@
                 E107400D0E77BDC00033AF24 /* JSMessageChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E107400B0E77BDC00033AF24 /* JSMessageChannel.cpp */; };
                 E107400E0E77BDC00033AF24 /* JSMessageChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = E107400C0E77BDC00033AF24 /* JSMessageChannel.h */; };
+                E10A39E21AE84E7100A29AE3 /* CFBundleSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E10A39E11AE84E7100A29AE3 /* CFBundleSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 E10B937C0B73C00A003ED890 /* JSCustomXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */; };
                 E10B93C30B73C291003ED890 /* JSCustomXPathNSResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */; };
@@ -13605 +13606 @@
                 E107400B0E77BDC00033AF24 /* JSMessageChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageChannel.cpp; sourceTree = "<group>"; };
                 E107400C0E77BDC00033AF24 /* JSMessageChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMessageChannel.h; sourceTree = "<group>"; };
+                E10A39E11AE84E7100A29AE3 /* CFBundleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFBundleSPI.h; sourceTree = "<group>"; };
                 E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCustomXPathNSResolver.h; sourceTree = "<group>"; };
                 E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCustomXPathNSResolver.cpp; sourceTree = "<group>"; };
@@ -16492 +16494 @@
                         isa = PBXGroup;
                         children = (
+                                E10A39E11AE84E7100A29AE3 /* CFBundleSPI.h */,
                                 65086DA719AC1719009AF46B /* CFLocaleSPI.h */,
                                 CE8245EF19B671BA00AC0122 /* CFNetworkConnectionCacheSPI.h */,
@@ -27156 +27159 @@
                                 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */,
                                 2E4346530F546A8200B0F1BA /* WorkerRunLoop.h in Headers */,
+                                E10A39E21AE84E7100A29AE3 /* CFBundleSPI.h in Headers */,
                                 F3820899147D35F90010BC06 /* WorkerRuntimeAgent.h in Headers */,
                                 E1A643F20EC0972500779668 /* WorkerScriptController.h in Headers */,

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-22  Alexey Proskuryakov  <ap@apple.com>
+
+        [iOS] WebKit services should inherit environment variables for home
+        https://bugs.webkit.org/show_bug.cgi?id=144078
+        rdar://problem/20571678
+
+        Reviewed by Dan Bernstein.
+
+        Pass current environment variables as XPC bootstrap. Also while at it, made
+        _CFBundleSetupXPCBootstrap not soft linked.
+
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+        (main):
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::connectToService):
+
 2015-04-23  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm

@@ -78 +78 @@
 int main(int argc, char** argv)
 {
+#if PLATFORM(IOS)
+    auto bootstrap = adoptOSObject(xpc_copy_bootstrap());
+    auto containerEnvironmentVariables = xpc_dictionary_get_value(bootstrap.get(), "ContainerEnvironmentVariables");
+    xpc_dictionary_apply(containerEnvironmentVariables, ^(const char *key, xpc_object_t value) {
+        setenv(key, xpc_string_get_string_ptr(value), 1);
+        return true;
+    });
+#endif
+
     xpc_main(XPCServiceEventHandler);
     return 0;

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

@@ -29 +29 @@
 #import "DynamicLinkerEnvironmentExtractor.h"
 #import "EnvironmentVariables.h"
+#import <WebCore/CFBundleSPI.h>
 #import <WebCore/ServersSPI.h>
 #import <WebCore/SoftLinking.h>
@@ -46 +47 @@
 #import <wtf/text/WTFString.h>
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-// FIXME: Soft linking is temporary, make this into a regular function call once this function is available everywhere we need.
-SOFT_LINK_FRAMEWORK(CoreFoundation)
-SOFT_LINK_OPTIONAL(CoreFoundation, _CFBundleSetupXPCBootstrap, void, unused, (xpc_object_t))
-#endif
-
 namespace WebKit {
 
@@ -223 +218 @@
     // 1.1. An important case is WebKitTestRunner, where we should use English localizations for all system frameworks.
     // 2. When AppleLanguages is passed as command line argument for UI process, or set in its preferences, we should respect it in child processes.
-    if (_CFBundleSetupXPCBootstrapPtr()) {
-        auto initializationMessage = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
-        _CFBundleSetupXPCBootstrapPtr()(initializationMessage.get());
-        xpc_connection_set_bootstrap(connection.get(), initializationMessage.get());
-    }
+    auto initializationMessage = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
+    _CFBundleSetupXPCBootstrap(initializationMessage.get());
+#if PLATFORM(IOS)
+    // Clients that set these environment variables explicitly do not have the values automatically forwarded by libxpc.
+    auto containerEnvironmentVariables = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
+    if (const char* environmentHOME = getenv("HOME"))
+        xpc_dictionary_set_string(containerEnvironmentVariables.get(), "HOME", environmentHOME);
+    if (const char* environmentCFFIXED_USER_HOME = getenv("CFFIXED_USER_HOME"))
+        xpc_dictionary_set_string(containerEnvironmentVariables.get(), "CFFIXED_USER_HOME", environmentCFFIXED_USER_HOME);
+    if (const char* environmentTMPDIR = getenv("TMPDIR"))
+        xpc_dictionary_set_string(containerEnvironmentVariables.get(), "TMPDIR", environmentTMPDIR);
+    xpc_dictionary_set_value(initializationMessage.get(), "ContainerEnvironmentVariables", containerEnvironmentVariables.get());
+#endif
+    xpc_connection_set_bootstrap(connection.get(), initializationMessage.get());
 #endif