Diff
Modified: branches/safari-612.1.5-branch/Source/WebKit/ChangeLog (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/ChangeLog 2021-03-04 23:30:44 UTC (rev 273925)
@@ -1,3 +1,114 @@
+2021-03-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r273784. rdar://problem/75059445
+
+ REGRESSION(r270691): It's impossible to use MobileAsset fonts on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=222582
+ <rdar://problem/74877450>
+
+ Reviewed by Per Arne Vollan.
+
+ Source/WebKit:
+
+ Simply apply the iOS codepath to macOS.
+
+ There is also an additional change here to the Mac sandbox.
+ On Big Sur and earlier, before this patch, com.apple.mobileassetd was allowed,
+ and com.apple.mobileassetd.v2 was disallowed. After this patch, they both are
+ allowed, but only with the com.apple.webkit.extension.mach extension.
+ On other OSes, before this patch, nothing was allowed, whereas after this patch,
+ only com.apple.mobileassetd.v2 is allowed with the com.apple.webkit.extension.mach
+ extension.
+
+ Test: WebKit.MobileAssetSandboxCheck
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _grantAccessToAssetServices]):
+ (-[WKWebView _revokeAccessToAssetServices]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _grantAccessToAssetServices]): Deleted.
+ (-[WKWebView _revokeAccessToAssetServices]): Deleted.
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices):
+ (WebKit::WebPageProxy::revokeAccessToAssetServices):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices): Deleted.
+ (WebKit::WebPageProxy::revokeAccessToAssetServices): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/com.apple.WebProcess.sb.in:
+ * WebProcess/glib/WebProcessGLib.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/playstation/WebProcessPlayStation.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/win/WebProcessWin.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+
+ Tools:
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit/MobileAssetSandboxCheck.mm: Copied from Source/WebKit/WebProcess/win/WebProcessWin.cpp.
+ (TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-02 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ REGRESSION(r270691): It's impossible to use MobileAsset fonts on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=222582
+ <rdar://problem/74877450>
+
+ Reviewed by Per Arne Vollan.
+
+ Simply apply the iOS codepath to macOS.
+
+ There is also an additional change here to the Mac sandbox.
+ On Big Sur and earlier, before this patch, com.apple.mobileassetd was allowed,
+ and com.apple.mobileassetd.v2 was disallowed. After this patch, they both are
+ allowed, but only with the com.apple.webkit.extension.mach extension.
+ On other OSes, before this patch, nothing was allowed, whereas after this patch,
+ only com.apple.mobileassetd.v2 is allowed with the com.apple.webkit.extension.mach
+ extension.
+
+ Test: WebKit.MobileAssetSandboxCheck
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _grantAccessToAssetServices]):
+ (-[WKWebView _revokeAccessToAssetServices]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _grantAccessToAssetServices]): Deleted.
+ (-[WKWebView _revokeAccessToAssetServices]): Deleted.
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices):
+ (WebKit::WebPageProxy::revokeAccessToAssetServices):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices): Deleted.
+ (WebKit::WebPageProxy::revokeAccessToAssetServices): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/com.apple.WebProcess.sb.in:
+ * WebProcess/glib/WebProcessGLib.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/playstation/WebProcessPlayStation.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/win/WebProcessWin.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+
2021-03-02 Alan Coon <alanc...@apple.com>
Cherry-pick r273568. rdar://problem/74952680
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2021-03-04 23:30:44 UTC (rev 273925)
@@ -2135,6 +2135,18 @@
return wrapper(_page->loadFile(URL.absoluteString, readAccessURL.absoluteString));
}
+- (void)_grantAccessToAssetServices
+{
+ if (_page)
+ _page->grantAccessToAssetServices();
+}
+
+- (void)_revokeAccessToAssetServices
+{
+ if (_page)
+ _page->revokeAccessToAssetServices();
+}
+
- (NSArray *)_certificateChain
{
if (WebKit::WebFrameProxy* mainFrame = _page->mainFrame())
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2021-03-04 23:30:44 UTC (rev 273925)
@@ -432,6 +432,9 @@
*/
- (WKNavigation *)loadSimulatedRequest:(NSURLRequest *)request withResponseHTMLString:(NSString *)string WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+- (void)_grantAccessToAssetServices WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(14.0));
+- (void)_revokeAccessToAssetServices WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(14.0));
+
@end
#if TARGET_OS_IPHONE
@@ -536,9 +539,6 @@
- (UIView *)_fullScreenPlaceholderView WK_API_AVAILABLE(ios(12.0));
-- (void)_grantAccessToAssetServices WK_API_AVAILABLE(ios(14.0));
-- (void)_revokeAccessToAssetServices WK_API_AVAILABLE(ios(14.0));
-
- (void)_willOpenAppLink WK_API_AVAILABLE(ios(14.0));
- (void)_isNavigatingToAppBoundDomain:(void(^)(BOOL))completionHandler WK_API_AVAILABLE(ios(14.0));
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2021-03-04 23:30:44 UTC (rev 273925)
@@ -3240,22 +3240,6 @@
return nil;
}
-- (void)_grantAccessToAssetServices
-{
-#if PLATFORM(IOS)
- if (_page)
- _page->grantAccessToAssetServices();
-#endif
-}
-
-- (void)_revokeAccessToAssetServices
-{
-#if PLATFORM(IOS)
- if (_page)
- _page->revokeAccessToAssetServices();
-#endif
-}
-
- (void)_willOpenAppLink
{
if (_page)
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/Cocoa/WebPageProxyCocoa.mm 2021-03-04 23:30:44 UTC (rev 273925)
@@ -42,6 +42,7 @@
#import "WebPage.h"
#import "WebPageMessages.h"
#import "WebPasteboardProxy.h"
+#import "WebProcessMessages.h"
#import "WebProcessProxy.h"
#import "WebsiteDataStore.h"
#import "WKErrorInternal.h"
@@ -616,6 +617,18 @@
sendWithAsyncReply(Messages::WebPage::LastNavigationWasAppBound(), WTFMove(completionHandler));
}
+void WebPageProxy::grantAccessToAssetServices()
+{
+ SandboxExtension::Handle mobileAssetHandleV2;
+ SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd.v2"_s, WTF::nullopt, mobileAssetHandleV2);
+ process().send(Messages::WebProcess::GrantAccessToAssetServices(mobileAssetHandleV2), 0);
+}
+
+void WebPageProxy::revokeAccessToAssetServices()
+{
+ process().send(Messages::WebProcess::RevokeAccessToAssetServices(), 0);
+}
+
} // namespace WebKit
#if USE(APPLE_INTERNAL_SDK)
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/WebPageProxy.h (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/WebPageProxy.h 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/WebPageProxy.h 2021-03-04 23:30:44 UTC (rev 273925)
@@ -1770,10 +1770,8 @@
bool hasQueuedKeyEvent() const;
const NativeWebKeyboardEvent& firstQueuedKeyEvent() const;
-#if PLATFORM(IOS)
void grantAccessToAssetServices();
void revokeAccessToAssetServices();
-#endif
#if PLATFORM(COCOA)
void grantAccessToPreferenceService();
Modified: branches/safari-612.1.5-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2021-03-04 23:30:44 UTC (rev 273925)
@@ -1542,20 +1542,6 @@
}
#endif
-#if PLATFORM(IOS)
-void WebPageProxy::grantAccessToAssetServices()
-{
- SandboxExtension::Handle mobileAssetHandleV2;
- SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd.v2"_s, WTF::nullopt, mobileAssetHandleV2);
- process().send(Messages::WebProcess::GrantAccessToAssetServices(mobileAssetHandleV2), 0);
-}
-
-void WebPageProxy::revokeAccessToAssetServices()
-{
- process().send(Messages::WebProcess::RevokeAccessToAssetServices(), 0);
-}
-#endif
-
void WebPageProxy::willPerformPasteCommand()
{
grantAccessToCurrentPasteboardData(UIPasteboardNameGeneral);
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/WebProcess.h (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/WebProcess.h 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/WebProcess.h 2021-03-04 23:30:44 UTC (rev 273925)
@@ -337,10 +337,8 @@
bool removeServiceWorkerRegistration(WebCore::ServiceWorkerRegistrationIdentifier);
#endif
-#if PLATFORM(IOS)
void grantAccessToAssetServices(WebKit::SandboxExtension::Handle&& mobileAssetV2Handle);
void revokeAccessToAssetServices();
-#endif
#if PLATFORM(MAC)
void updatePageScreenProperties();
@@ -701,9 +699,7 @@
WebCore::ThirdPartyCookieBlockingMode m_thirdPartyCookieBlockingMode { WebCore::ThirdPartyCookieBlockingMode::All };
#endif
-#if PLATFORM(IOS)
RefPtr<SandboxExtension> m_assetServiceV2Extension;
-#endif
#if PLATFORM(COCOA)
HashCountedSet<String> m_pendingPasteboardWriteCounts;
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/WebProcess.messages.in (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/WebProcess.messages.in 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/WebProcess.messages.in 2021-03-04 23:30:44 UTC (rev 273925)
@@ -170,10 +170,8 @@
SendResourceLoadStatisticsDataImmediately() -> () Async
#endif
-#if PLATFORM(IOS)
GrantAccessToAssetServices(WebKit::SandboxExtension::Handle mobileAssetV2Handle)
RevokeAccessToAssetServices()
-#endif
#if PLATFORM(COCOA)
UnblockServicesRequiredByAccessibility(WebKit::SandboxExtension::HandleArray handleArray)
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2021-03-04 23:30:44 UTC (rev 273925)
@@ -1135,7 +1135,6 @@
}
#endif
-#if PLATFORM(IOS)
void WebProcess::grantAccessToAssetServices(WebKit::SandboxExtension::Handle&& mobileAssetV2Handle)
{
if (m_assetServiceV2Extension)
@@ -1151,7 +1150,6 @@
m_assetServiceV2Extension->revoke();
m_assetServiceV2Extension = nullptr;
}
-#endif
void WebProcess::setScreenProperties(const ScreenProperties& properties)
{
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/com.apple.WebProcess.sb.in 2021-03-04 23:30:44 UTC (rev 273925)
@@ -1098,8 +1098,18 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 110000
(allow mach-lookup
- (global-name "com.apple.mobileassetd")
-)
+ (require-all
+ (extension "com.apple.webkit.extension.mach")
+ (global-name
+ "com.apple.mobileassetd"
+ "com.apple.mobileassetd.v2"
+)))
+#else
+(allow mach-lookup
+ (require-all
+ (extension "com.apple.webkit.extension.mach")
+ (global-name "com.apple.mobileassetd.v2")
+))
#endif
;; Various services required by AppKit and other frameworks
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp 2021-03-04 23:30:44 UTC (rev 273925)
@@ -128,4 +128,12 @@
}
#endif
+void WebProcess::grantAccessToAssetServices(WebKit::SandboxExtension::Handle&&)
+{
+}
+
+void WebProcess::revokeAccessToAssetServices()
+{
+}
+
} // namespace WebKit
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/playstation/WebProcessPlayStation.cpp 2021-03-04 23:30:44 UTC (rev 273925)
@@ -44,4 +44,12 @@
{
}
+void WebProcess::grantAccessToAssetServices(WebKit::SandboxExtension::Handle&&)
+{
+}
+
+void WebProcess::revokeAccessToAssetServices()
+{
+}
+
} // namespace WebKit
Modified: branches/safari-612.1.5-branch/Source/WebKit/WebProcess/win/WebProcessWin.cpp (273924 => 273925)
--- branches/safari-612.1.5-branch/Source/WebKit/WebProcess/win/WebProcessWin.cpp 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Source/WebKit/WebProcess/win/WebProcessWin.cpp 2021-03-04 23:30:44 UTC (rev 273925)
@@ -51,4 +51,12 @@
{
}
+void WebProcess::grantAccessToAssetServices(WebKit::SandboxExtension::Handle&&)
+{
+}
+
+void WebProcess::revokeAccessToAssetServices()
+{
+}
+
} // namespace WebKit
Modified: branches/safari-612.1.5-branch/Tools/ChangeLog (273924 => 273925)
--- branches/safari-612.1.5-branch/Tools/ChangeLog 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Tools/ChangeLog 2021-03-04 23:30:44 UTC (rev 273925)
@@ -1,3 +1,77 @@
+2021-03-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r273784. rdar://problem/75059445
+
+ REGRESSION(r270691): It's impossible to use MobileAsset fonts on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=222582
+ <rdar://problem/74877450>
+
+ Reviewed by Per Arne Vollan.
+
+ Source/WebKit:
+
+ Simply apply the iOS codepath to macOS.
+
+ There is also an additional change here to the Mac sandbox.
+ On Big Sur and earlier, before this patch, com.apple.mobileassetd was allowed,
+ and com.apple.mobileassetd.v2 was disallowed. After this patch, they both are
+ allowed, but only with the com.apple.webkit.extension.mach extension.
+ On other OSes, before this patch, nothing was allowed, whereas after this patch,
+ only com.apple.mobileassetd.v2 is allowed with the com.apple.webkit.extension.mach
+ extension.
+
+ Test: WebKit.MobileAssetSandboxCheck
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _grantAccessToAssetServices]):
+ (-[WKWebView _revokeAccessToAssetServices]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _grantAccessToAssetServices]): Deleted.
+ (-[WKWebView _revokeAccessToAssetServices]): Deleted.
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices):
+ (WebKit::WebPageProxy::revokeAccessToAssetServices):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices): Deleted.
+ (WebKit::WebPageProxy::revokeAccessToAssetServices): Deleted.
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/com.apple.WebProcess.sb.in:
+ * WebProcess/glib/WebProcessGLib.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/playstation/WebProcessPlayStation.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+ * WebProcess/win/WebProcessWin.cpp:
+ (WebKit::WebProcess::grantAccessToAssetServices):
+ (WebKit::WebProcess::revokeAccessToAssetServices):
+
+ Tools:
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit/MobileAssetSandboxCheck.mm: Copied from Source/WebKit/WebProcess/win/WebProcessWin.cpp.
+ (TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273784 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-03-02 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ REGRESSION(r270691): It's impossible to use MobileAsset fonts on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=222582
+ <rdar://problem/74877450>
+
+ Reviewed by Per Arne Vollan.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit/MobileAssetSandboxCheck.mm: Copied from Source/WebKit/WebProcess/win/WebProcessWin.cpp.
+ (TEST):
+
2021-03-02 Alan Coon <alanc...@apple.com>
Cherry-pick r273583. rdar://problem/74953376
Modified: branches/safari-612.1.5-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (273924 => 273925)
--- branches/safari-612.1.5-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-03-04 23:22:29 UTC (rev 273924)
+++ branches/safari-612.1.5-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2021-03-04 23:30:44 UTC (rev 273925)
@@ -118,6 +118,7 @@
1CB2F27E24F88A52000A5BC1 /* orthogonal-flow-available-size.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1CB2F27D24F883BE000A5BC1 /* orthogonal-flow-available-size.html */; };
1CC80CEA2474F249004DC489 /* idempotent-mode-autosizing-only-honors-percentages.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1CC80CE92474F1F7004DC489 /* idempotent-mode-autosizing-only-honors-percentages.html */; };
1CE6FAC32320267C00E48F6E /* rich-color-filtered.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1CE6FAC12320264F00E48F6E /* rich-color-filtered.html */; };
+ 1CF087D825ED7F73004148CB /* MobileAssetSandboxCheck.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF087D725ED7F73004148CB /* MobileAssetSandboxCheck.mm */; };
1CF59AE221E68925006E37EC /* ForceLightAppearanceInBundle_Bundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF59AE021E68925006E37EC /* ForceLightAppearanceInBundle_Bundle.mm */; };
1CF59AE321E68932006E37EC /* ForceLightAppearanceInBundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF59ADF21E68925006E37EC /* ForceLightAppearanceInBundle.mm */; };
1CF59AE521E6977D006E37EC /* dark-mode.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1CF59AE421E696FB006E37EC /* dark-mode.html */; };
@@ -1817,6 +1818,7 @@
1CB9BC371A67482300FE5678 /* WeakPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WeakPtr.cpp; sourceTree = "<group>"; };
1CC80CE92474F1F7004DC489 /* idempotent-mode-autosizing-only-honors-percentages.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "idempotent-mode-autosizing-only-honors-percentages.html"; sourceTree = "<group>"; };
1CE6FAC12320264F00E48F6E /* rich-color-filtered.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "rich-color-filtered.html"; sourceTree = "<group>"; };
+ 1CF087D725ED7F73004148CB /* MobileAssetSandboxCheck.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MobileAssetSandboxCheck.mm; sourceTree = "<group>"; };
1CF0D3781BBF2F3D00B4EF54 /* WKRetainPtr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKRetainPtr.cpp; sourceTree = "<group>"; };
1CF59ADF21E68925006E37EC /* ForceLightAppearanceInBundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ForceLightAppearanceInBundle.mm; sourceTree = "<group>"; };
1CF59AE021E68925006E37EC /* ForceLightAppearanceInBundle_Bundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ForceLightAppearanceInBundle_Bundle.mm; sourceTree = "<group>"; };
@@ -3211,6 +3213,7 @@
E394AE6E23F2303E005B4936 /* GrantAccessToMobileAssets.mm */,
E34A6D182412DE390012AB6E /* GrantAccessToPreferencesService.mm */,
E35B908123F60DD0000011FF /* LocalizedDeviceModel.mm */,
+ 1CF087D725ED7F73004148CB /* MobileAssetSandboxCheck.mm */,
C104BC1E2547237100C078C9 /* OverrideAppleLanguagesPreference.mm */,
E325C90623E3870200BC7D3B /* PictureInPictureSupport.mm */,
C15CBB3E23FB177A00300CC7 /* PreferenceChanges.mm */,
@@ -5424,6 +5427,7 @@
5165FE04201EE620009F7EC3 /* MessagePortProviders.mm in Sources */,
51EB126224CA6B66000CB030 /* MicrosoftXboxOne.mm in Sources */,
A5B149DE1F5A19EA00C6DAFF /* MIMETypeRegistry.cpp in Sources */,
+ 1CF087D825ED7F73004148CB /* MobileAssetSandboxCheck.mm in Sources */,
51CD1C6C1B38CE4300142CA5 /* ModalAlerts.mm in Sources */,
7C83E0B61D0A64B300FEBCF3 /* ModalAlertsSPI.cpp in Sources */,
7CCE7F011A411AE600447C4C /* MouseMoveAfterCrash.cpp in Sources */,
Copied: branches/safari-612.1.5-branch/Tools/TestWebKitAPI/Tests/WebKit/MobileAssetSandboxCheck.mm (from rev 273863, branches/safari-612.1.5-branch/Source/WebKit/WebProcess/win/WebProcessWin.cpp) (0 => 273925)
--- branches/safari-612.1.5-branch/Tools/TestWebKitAPI/Tests/WebKit/MobileAssetSandboxCheck.mm (rev 0)
+++ branches/safari-612.1.5-branch/Tools/TestWebKitAPI/Tests/WebKit/MobileAssetSandboxCheck.mm 2021-03-04 23:30:44 UTC (rev 273925)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#if WK_HAVE_C_SPI
+
+#import "PlatformUtilities.h"
+#import "TestWKWebView.h"
+#import <WebKit/WKWebViewPrivate.h>
+
+TEST(WebKit, MobileAssetSandboxCheck)
+{
+ auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+ auto context = adoptWK(TestWebKitAPI::Util::createContextForInjectedBundleTest("InternalsInjectedBundleTest"));
+ configuration.get().processPool = (WKProcessPool *)context.get();
+ auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 300, 300) configuration:configuration.get() addToWindow:YES]);
+
+ auto sandboxAccess = [&] {
+ return [webView stringByEvaluatingJavaScript:@"window.internals.hasSandboxMachLookupAccessToXPCServiceName('com.apple.WebKit.WebContent', 'com.apple.mobileassetd.v2')"].boolValue;
+ };
+
+ ASSERT_FALSE(sandboxAccess());
+
+ [webView _grantAccessToAssetServices];
+
+ ASSERT_TRUE(sandboxAccess());
+}
+
+#endif // WK_HAVE_C_SPI
