Changeset 173238 in webkit

Timestamp:

Sep 3, 2014 3:50:17 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Avoid warning if a process does not have access to com.apple.webinspector
​https://bugs.webkit.org/show_bug.cgi?id=136473

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-09-03
Reviewed by Alexey Proskuryakov.

Pre-check for access to the mach port to avoid emitting warnings
in syslog for processes that do not have access.

• inspector/remote/RemoteInspector.mm:

(Inspector::canAccessWebInspectorMachPort):
(Inspector::RemoteInspector::shared):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/remote/RemoteInspector.mm (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-09-03  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Avoid warning if a process does not have access to com.apple.webinspector
+        https://bugs.webkit.org/show_bug.cgi?id=136473
+
+        Reviewed by Alexey Proskuryakov.
+
+        Pre-check for access to the mach port to avoid emitting warnings
+        in syslog for processes that do not have access.
+
+        * inspector/remote/RemoteInspector.mm:
+        (Inspector::canAccessWebInspectorMachPort):
+        (Inspector::RemoteInspector::shared):
+
 2014-09-03  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm

@@ -41 +41 @@
 #if __has_include(<xpc/xpc.h>)
 #import <xpc/xpc.h>
-#else
+#endif
 extern "C" {
     xpc_connection_t xpc_connection_create_mach_service(const char* name, dispatch_queue_t, uint64_t flags);
     void xpc_release(xpc_object_t);
 }
+
+#if __has_include(<sandbox/private.h>)
+#import <sandbox/private.h>
+#else
+enum sandbox_filter_type {
+    SANDBOX_FILTER_GLOBAL_NAME,
+};
 #endif
+extern "C" {
+    int sandbox_check(pid_t, const char *operation, enum sandbox_filter_type, ...);
+}
 
 #if PLATFORM(IOS)
@@ -54 +64 @@
 namespace Inspector {
 
+static bool canAccessWebInspectorMachPort()
+{
+    return sandbox_check(getpid(), "mach-lookup", SANDBOX_FILTER_GLOBAL_NAME, WIRXPCMachPortName) == 0;
+}
+
 static void dispatchAsyncOnQueueSafeForAnyDebuggable(void (^block)())
 {
@@ -79 +94 @@
     static dispatch_once_t once;
     dispatch_once(&once, ^{
-        JSC::initializeThreading();
-        if (RemoteInspector::startEnabled)
-            shared.get().start();
+        if (canAccessWebInspectorMachPort()) {
+            JSC::initializeThreading();
+            if (RemoteInspector::startEnabled)
+                shared.get().start();
+        }
     });