Changeset 229168 in webkit

Timestamp:

Mar 2, 2018 12:20:56 AM (6 years ago)

Author:

mitz@apple.com

Message:

Safari uses WebContent.Development when loading injected bundle embedded in its app bundle
​https://bugs.webkit.org/show_bug.cgi?id=183275

Reviewed by Tim Horton.

Source/WebKit:

• UIProcess/mac/WebProcessProxyMac.mm:

(WebKit::WebProcessProxy::shouldAllowNonValidInjectedCode const): Return false if this is

a platform binary. We can also return false unconditionally when building for any shipping
major macOS release.

Source/WTF:

• wtf/spi/cocoa/SecuritySPI.h: Declared SecTaskGetCodeSignStatus.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/spi/cocoa/SecuritySPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/mac/WebProcessProxyMac.mm (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-03-02  Dan Bernstein  <mitz@apple.com>
+
+        Safari uses WebContent.Development when loading injected bundle embedded in its app bundle
+        https://bugs.webkit.org/show_bug.cgi?id=183275
+
+        Reviewed by Tim Horton.
+
+        * wtf/spi/cocoa/SecuritySPI.h: Declared SecTaskGetCodeSignStatus.
+
 2018-02-27  Karlen Simonyan  <szkarlen@gmail.com>
 

trunk/Source/WTF/wtf/spi/cocoa/SecuritySPI.h

@@ -72 +72 @@
 extern const SecAsn1Template kSecAsn1AlgorithmIDTemplate[];
 extern const SecAsn1Template kSecAsn1SubjectPublicKeyInfoTemplate[];
+uint32_t SecTaskGetCodeSignStatus(SecTaskRef);
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-02  Dan Bernstein  <mitz@apple.com>
+
+        Safari uses WebContent.Development when loading injected bundle embedded in its app bundle
+        https://bugs.webkit.org/show_bug.cgi?id=183275
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WebProcessProxyMac.mm:
+        (WebKit::WebProcessProxy::shouldAllowNonValidInjectedCode const): Return false if this is
+          a platform binary. We can also return false unconditionally when building for any shipping
+          major macOS release.
+
 2018-03-01  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/UIProcess/mac/WebProcessProxyMac.mm

@@ -32 +32 @@
 #import "WKFullKeyboardAccessWatcher.h"
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#import <Kernel/kern/cs_blobs.h>
+#import <wtf/spi/cocoa/SecuritySPI.h>
+#endif
+
 namespace WebKit {
 
@@ -41 +46 @@
 bool WebProcessProxy::shouldAllowNonValidInjectedCode() const
 {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
     static bool isSystemWebKit = [] {
 #if WK_API_ENABLED
@@ -53 +59 @@
         return false;
 
+    static bool isPlatformBinary = SecTaskGetCodeSignStatus(adoptCF(SecTaskCreateFromSelf(kCFAllocatorDefault)).get()) & CS_PLATFORM_BINARY;
+    if (isPlatformBinary)
+        return false;
+
     const String& path = m_processPool->configuration().injectedBundlePath();
     return !path.isEmpty() && !path.startsWith("/System/");
+#else
+    return false;
+#endif
 }