Changeset 248348 in webkit

Timestamp:

Aug 6, 2019, 11:52:28 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r247793. rdar://problem/54017899

Regression(r247400): Unable to log into AIB Mobile Banking App
​https://bugs.webkit.org/show_bug.cgi?id=200094
<rdar://problem/52519818>

Reviewed by Brent Fulgham.

In r247400, a change was made to only set the 'app has universal sandbox access' flag
only when issueing the sandbox extension for / actually succeeded (it usually fails
in practice). Previously, AIB Mobile Banking app was relying on this behavior to
trigger a load for ​file:///login which is outside their container. However, now that
the 'app has universal sandbox access' flag is no longer set, it trips our security
checks and the load gets ignored.

To address the issue, apply only the 'app has universal sandbox access' flag fix with
a linked-on-after check.

• UIProcess/Cocoa/VersionChecks.h:
• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@247793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-608.1-branch/Source

Files:

• WTF/wtf/spi/darwin/dyldSPI.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Cocoa/VersionChecks.h (modified) (4 diffs)
• WebKit/UIProcess/WebPageProxy.cpp (modified) (2 diffs)

branches/safari-608.1-branch/Source/WTF/wtf/spi/darwin/dyldSPI.h

@@ -54 +54 @@
 #endif
 
+#ifndef DYLD_MACOSX_VERSION_10_15
+#define DYLD_MACOSX_VERSION_10_15 0x000A0F00
+#endif
+
 #else
 
@@ -72 +76 @@
 #define DYLD_MACOSX_VERSION_10_13 0x000A0D00
 #define DYLD_MACOSX_VERSION_10_14 0x000A0E00
+#define DYLD_MACOSX_VERSION_10_15 0x000A0F00
 
 #endif

branches/safari-608.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r247793. rdar://problem/54017899
+
+    Regression(r247400): Unable to log into AIB Mobile Banking App
+    https://bugs.webkit.org/show_bug.cgi?id=200094
+    <rdar://problem/52519818>
+    
+    Reviewed by Brent Fulgham.
+    
+    In r247400, a change was made to only set the 'app has universal sandbox access' flag
+    only when issueing the sandbox extension for / actually succeeded (it usually fails
+    in practice). Previously, AIB Mobile Banking app was relying on this behavior to
+    trigger a load for file:///login which is outside their container. However, now that
+    the 'app has universal sandbox access' flag is no longer set, it trips our security
+    checks and the load gets ignored.
+    
+    To address the issue, apply only the 'app has universal sandbox access' flag fix with
+    a linked-on-after check.
+    
+    * UIProcess/Cocoa/VersionChecks.h:
+    * UIProcess/WebPageProxy.cpp:
+    (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247793 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-24  Chris Dumez  <cdumez@apple.com>
+
+            Regression(r247400): Unable to log into AIB Mobile Banking App
+            https://bugs.webkit.org/show_bug.cgi?id=200094
+            <rdar://problem/52519818>
+
+            Reviewed by Brent Fulgham.
+
+            In r247400, a change was made to only set the 'app has universal sandbox access' flag
+            only when issueing the sandbox extension for / actually succeeded (it usually fails
+            in practice). Previously, AIB Mobile Banking app was relying on this behavior to
+            trigger a load for file:///login which is outside their container. However, now that
+            the 'app has universal sandbox access' flag is no longer set, it trips our security
+            checks and the load gets ignored.
+
+            To address the issue, apply only the 'app has universal sandbox access' flag fix with
+            a linked-on-after check.
+
+            * UIProcess/Cocoa/VersionChecks.h:
+            * UIProcess/WebPageProxy.cpp:
+            (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
+
 2019-08-06  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1-branch/Source/WebKit/UIProcess/Cocoa/VersionChecks.h

@@ -41 +41 @@
 #endif
 
+#if PLATFORM(IOS_FAMILY)
 #ifndef DYLD_IOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES
 #define DYLD_IOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES 0
-#endif
-#ifndef DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES
-#define DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES 0
 #endif
 
@@ -51 +49 @@
 #define DYLD_IOS_VERSION_FIRST_WITH_DEVICE_ORIENTATION_AND_MOTION_PERMISSION_API 0
 #endif
+#endif // PLATFORM(IOS_FAMILY)
+
+#if PLATFORM(MAC)
+#ifndef DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES
+#define DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES 0
+#endif
+#endif
+
+
 
 namespace WebKit {
@@ -66 +73 @@
     FirstWhereUIScrollViewDoesNotApplyKeyboardInsetsUnconditionally = DYLD_IOS_VERSION_12_0,
     FirstWithMainThreadReleaseAssertionInWebPageProxy = DYLD_IOS_VERSION_12_0,
+    FirstWithoutUnconditionalUniversalSandboxExtension = DYLD_IOS_VERSION_13_0,
     FirstWithLazyGestureRecognizerInstallation = DYLD_IOS_VERSION_FIRST_WITH_LAZY_GESTURE_RECOGNIZER_INSTALLATION,
     FirstWithProcessSwapOnCrossSiteNavigation = DYLD_IOS_VERSION_FIRST_WITH_PROCESS_SWAP_ON_CROSS_SITE_NAVIGATION,
@@ -81 +89 @@
     FirstWithExpiredOnlyReloadBehavior = DYLD_MACOSX_VERSION_10_13,
     FirstWithMainThreadReleaseAssertionInWebPageProxy = DYLD_MACOSX_VERSION_10_14,
+    FirstWithoutUnconditionalUniversalSandboxExtension = DYLD_MACOSX_VERSION_10_15,
     FirstWithSnapshotAfterScreenUpdates = DYLD_MACOS_VERSION_FIRST_WITH_SNAPSHOT_AFTER_SCREEN_UPDATES,
     FirstWithExceptionsForRelatedWebViewsUsingDifferentDataStores = DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES,

branches/safari-608.1-branch/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -196 +196 @@
 #include "TouchBarMenuData.h"
 #include "TouchBarMenuItemData.h"
+#include "VersionChecks.h"
 #include "VideoFullscreenManagerProxy.h"
 #include "VideoFullscreenManagerProxyMessages.h"
@@ -1063 +1064 @@
         return;
     }
+
+#if PLATFORM(COCOA)
+    if (!linkedOnOrAfter(SDKVersion::FirstWithoutUnconditionalUniversalSandboxExtension))
+        willAcquireUniversalFileReadSandboxExtension(process);
+#endif
 
     // We failed to issue an universal file read access sandbox, fall back to issuing one for the base URL instead.