Title: [259074] trunk
- Revision
- 259074
- Author
- katherine_che...@apple.com
- Date
- 2020-03-26 13:45:54 -0700 (Thu, 26 Mar 2020)
Log Message
Guard AppBound domain protections with PLATFORM(iOS_FAMILY)
https://bugs.webkit.org/show_bug.cgi?id=209615
<rdar://problem/60931014>
Reviewed by Darin Adler.
Source/WebKit:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
Tools:
Tests should only be run on iOS.
* TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (259073 => 259074)
--- trunk/Source/WebKit/ChangeLog 2020-03-26 20:43:53 UTC (rev 259073)
+++ trunk/Source/WebKit/ChangeLog 2020-03-26 20:45:54 UTC (rev 259074)
@@ -1,3 +1,14 @@
+2020-03-26 Kate Cheney <katherine_che...@apple.com>
+
+ Guard AppBound domain protections with PLATFORM(iOS_FAMILY)
+ https://bugs.webkit.org/show_bug.cgi?id=209615
+ <rdar://problem/60931014>
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
+
2020-03-26 Brent Fulgham <bfulg...@apple.com>
[iOS] Deny mach lookup to 'com.apple.webinspector' in the WebContent process.
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (259073 => 259074)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-03-26 20:43:53 UTC (rev 259073)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-03-26 20:45:54 UTC (rev 259074)
@@ -3099,13 +3099,16 @@
PolicyCheckIdentifier m_identifier;
};
+#if PLATFORM(IOS_FAMILY)
static bool shouldBeTreatedAsAppBound(const URL& requestURL)
{
return requestURL.protocolIsAbout() || requestURL.protocolIsData() || requestURL.protocolIsBlob() || requestURL.isLocalFile();
}
+#endif
void WebPageProxy::setIsNavigatingToAppBoundDomain(bool isMainFrame, const URL& requestURL, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain)
{
+#if PLATFORM(IOS_FAMILY)
if (isMainFrame && (m_preferences->isInAppBrowserPrivacyEnabled() || WEB_PAGE_PROXY_ADDITIONS_SETISNAVIGATINGTOAPPBOUNDDOMAIN_2)) {
if (m_ignoresAppBoundDomains)
return;
@@ -3122,6 +3125,11 @@
m_configuration->setWebViewCategory(WebViewCategory::AppBoundDomain);
m_isNavigatingToAppBoundDomain = NavigatingToAppBoundDomain::Yes;
}
+#else
+ UNUSED_PARAM(isMainFrame);
+ UNUSED_PARAM(requestURL);
+ UNUSED_PARAM(isNavigatingToAppBoundDomain);
+#endif
}
void WebPageProxy::setIsNavigatingToAppBoundDomainTesting(bool isNavigatingToAppBoundDomain, CompletionHandler<void()>&& completionHandler)
Modified: trunk/Tools/ChangeLog (259073 => 259074)
--- trunk/Tools/ChangeLog 2020-03-26 20:43:53 UTC (rev 259073)
+++ trunk/Tools/ChangeLog 2020-03-26 20:45:54 UTC (rev 259074)
@@ -1,3 +1,15 @@
+2020-03-26 Kate Cheney <katherine_che...@apple.com>
+
+ Guard AppBound domain protections with PLATFORM(iOS_FAMILY)
+ https://bugs.webkit.org/show_bug.cgi?id=209615
+ <rdar://problem/60931014>
+
+ Reviewed by Darin Adler.
+
+ Tests should only be run on iOS.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
+
2020-03-26 Aakash Jain <aakash_j...@apple.com>
[ews] status-bubble for tester queues should point to tester queue while waiting in queue (Follow-up fix)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm (259073 => 259074)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm 2020-03-26 20:43:53 UTC (rev 259073)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm 2020-03-26 20:45:54 UTC (rev 259074)
@@ -39,6 +39,8 @@
#import <wtf/RunLoop.h>
#import <wtf/text/WTFString.h>
+#if PLATFORM(IOS_FAMILY)
+
#if USE(APPLE_INTERNAL_SDK)
#include <WebKitAdditions/InAppBrowserPrivacyTestAdditions.h>
@@ -506,3 +508,4 @@
#endif // USE(APPLE_INTERNAL_SDK)
+#endif // PLATFORM(IOS_FAMILY)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
