Hook up ITP quirks to the needsSiteSpecificQuirks setting

https://bugs.webkit.org/show_bug.cgi?id=174691 Reviewed by Darin Adler. Hook up ITP quirks to the needsSiteSpecificQuirks setting to make it easier for Web-developers to test their fixes. * loader/ResourceLoadObserver.cpp: (WebCore::shouldEnableSiteSpecificQuirks): (WebCore::areDomainsAssociated): (WebCore::ResourceLoadObserver::logFrameNavigation): (WebCore::resourceNeedsSSOQuirk): (WebCore::ResourceLoadObserver::logSubresourceLoading): (WebCore::ResourceLoadObserver::logWebSocketLoading): Canonical link: https://commits.webkit.org/191520@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219711 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jul 21, 2017 · 9d21b32 · 9d21b32
1 parent 61fe326
commit 9d21b32
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2017-07-20  Chris Dumez  <cdumez@apple.com>
+
+        Hook up ITP quirks to the needsSiteSpecificQuirks setting
+        https://bugs.webkit.org/show_bug.cgi?id=174691
+
+        Reviewed by Darin Adler.
+
+        Hook up ITP quirks to the needsSiteSpecificQuirks setting to make it easier for
+        Web-developers to test their fixes.
+
+        * loader/ResourceLoadObserver.cpp:
+        (WebCore::shouldEnableSiteSpecificQuirks):
+        (WebCore::areDomainsAssociated):
+        (WebCore::ResourceLoadObserver::logFrameNavigation):
+        (WebCore::resourceNeedsSSOQuirk):
+        (WebCore::ResourceLoadObserver::logSubresourceLoading):
+        (WebCore::ResourceLoadObserver::logWebSocketLoading):
+
 2017-07-20  Matt Lewis  <jlewis3@apple.com>
 
         Unreviewed, rolling out r219700.

diff --git a/Source/WebCore/loader/ResourceLoadObserver.cpp b/Source/WebCore/loader/ResourceLoadObserver.cpp
@@ -54,8 +54,21 @@ ResourceLoadObserver& ResourceLoadObserver::shared()
     return resourceLoadObserver;
 }
 
+static bool shouldEnableSiteSpecificQuirks(Page* page)
+{
+#if PLATFORM(IOS)
+    UNUSED_PARAM(page);
+
+    // There is currently no way to toggle the needsSiteSpecificQuirks setting on iOS so we always enable
+    // the site-specific quirks on iOS.
+    return true;
+#else
+    return page && page->settings().needsSiteSpecificQuirks();
+#endif
+}
+
 // FIXME: Temporary fix for <rdar://problem/32343256> until content can be updated.
-static bool areDomainsAssociated(const String& firstDomain, const String& secondDomain)
+static bool areDomainsAssociated(Page* page, const String& firstDomain, const String& secondDomain)
 {
     static NeverDestroyed<HashMap<String, unsigned>> metaDomainIdentifiers = [] {
         HashMap<String, unsigned> map;
@@ -76,6 +89,9 @@ static bool areDomainsAssociated(const String& firstDomain, const String& second
 
     ASSERT(!equalIgnoringASCIICase(firstDomain, secondDomain));
 
+    if (!shouldEnableSiteSpecificQuirks(page))
+        return false;
+
     unsigned firstMetaDomainIdentifier = metaDomainIdentifiers.get().get(firstDomain);
     if (!firstMetaDomainIdentifier)
         return false;
@@ -135,7 +151,8 @@ void ResourceLoadObserver::logFrameNavigation(const Frame& frame, const Frame& t
     if (frame.isMainFrame())
         return;
 
-    if (!shouldLog(topFrame.page()))
+    auto* page = topFrame.page();
+    if (!shouldLog(page))
         return;
 
     auto& sourceURL = frame.document()->url();
@@ -155,7 +172,7 @@ void ResourceLoadObserver::logFrameNavigation(const Frame& frame, const Frame& t
     auto mainFramePrimaryDomain = primaryDomain(mainFrameURL);
     auto sourcePrimaryDomain = primaryDomain(sourceURL);
 
-    if (areDomainsAssociated(targetPrimaryDomain, mainFramePrimaryDomain) || areDomainsAssociated(targetPrimaryDomain, sourcePrimaryDomain))
+    if (areDomainsAssociated(page, targetPrimaryDomain, mainFramePrimaryDomain) || areDomainsAssociated(page, targetPrimaryDomain, sourcePrimaryDomain))
         return;
 
     auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
@@ -166,19 +183,20 @@ void ResourceLoadObserver::logFrameNavigation(const Frame& frame, const Frame& t
 }
 
 // FIXME: This quirk was added to address <rdar://problem/33325881> and should be removed once content is fixed.
-static bool resourceNeedsSSOQuirk(const URL& url)
+static bool resourceNeedsSSOQuirk(Page* page, const URL& url)
 {
-    static const auto ssoOriginsHash = makeNeverDestroyed(HashSet<String, ASCIICaseInsensitiveHash> {
-        "sp.auth.adobe.com"
-    });
-    return ssoOriginsHash.get().contains(url.host());
+    if (!shouldEnableSiteSpecificQuirks(page))
+        return false;
+
+    return equalIgnoringASCIICase(url.host(), "sp.auth.adobe.com");
 }
 
 void ResourceLoadObserver::logSubresourceLoading(const Frame* frame, const ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
     ASSERT(frame->page());
 
-    if (!shouldLog(frame->page()))
+    auto* page = frame->page();
+    if (!shouldLog(page))
         return;
 
     bool isRedirect = is3xxRedirect(redirectResponse);
@@ -196,10 +214,10 @@ void ResourceLoadObserver::logSubresourceLoading(const Frame* frame, const Resou
     auto mainFramePrimaryDomain = primaryDomain(mainFrameURL);
     auto sourcePrimaryDomain = primaryDomain(sourceURL);
 
-    if (areDomainsAssociated(targetPrimaryDomain, mainFramePrimaryDomain) || (isRedirect && areDomainsAssociated(targetPrimaryDomain, sourcePrimaryDomain)))
+    if (areDomainsAssociated(page, targetPrimaryDomain, mainFramePrimaryDomain) || (isRedirect && areDomainsAssociated(page, targetPrimaryDomain, sourcePrimaryDomain)))
         return;
 
-    if (resourceNeedsSSOQuirk(targetURL))
+    if (resourceNeedsSSOQuirk(page, targetURL))
         return;
 
     bool shouldCallNotificationCallback = false;
@@ -227,7 +245,8 @@ void ResourceLoadObserver::logWebSocketLoading(const Frame* frame, const URL& ta
     if (!frame)
         return;
 
-    if (!shouldLog(frame->page()))
+    auto* page = frame->page();
+    if (!shouldLog(page))
         return;
 
     auto& mainFrameURL = frame->mainFrame().document()->url();
@@ -241,7 +260,7 @@ void ResourceLoadObserver::logWebSocketLoading(const Frame* frame, const URL& ta
     auto targetPrimaryDomain = primaryDomain(targetURL);
     auto mainFramePrimaryDomain = primaryDomain(mainFrameURL);
 
-    if (areDomainsAssociated(targetPrimaryDomain, mainFramePrimaryDomain))
+    if (areDomainsAssociated(page, targetPrimaryDomain, mainFramePrimaryDomain))
         return;
 
     auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);