Title: [219784] branches/safari-604-branch/Source
- Revision
- 219784
- Author
- [email protected]
- Date
- 2017-07-22 23:51:43 -0700 (Sat, 22 Jul 2017)
Log Message
Cherry-pick r219701. rdar://problem/33465715
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (219783 => 219784)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-07-23 06:51:38 UTC (rev 219783)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-07-23 06:51:43 UTC (rev 219784)
@@ -1,5 +1,27 @@
2017-07-22 Jason Marcell <[email protected]>
+ Cherry-pick r219701. rdar://problem/33465715
+
+ 2017-07-20 Chris Dumez <[email protected]>
+
+ Regression(ITP): Can no longer log in on abc.go.com
+ https://bugs.webkit.org/show_bug.cgi?id=174533
+ <rdar://problem/33325881>
+
+ Reviewed by Geoffrey Garen.
+
+ Add quirk for sp.auth.adobe.com which is used for SSO by web sites such as
+ abc.go.com. This would otherwise cause adobe.com to be identified as a
+ tracker and log in on abc.go.com would break.
+
+ No new tests, tested manually on abc.go.com.
+
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::resourceNeedsSSOQuirk):
+ (WebCore::ResourceLoadObserver::logSubresourceLoading):
+
+2017-07-22 Jason Marcell <[email protected]>
+
Cherry-pick r219683. rdar://problem/33464463
2017-07-20 Brady Eidson <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/loader/ResourceLoadObserver.cpp (219783 => 219784)
--- branches/safari-604-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2017-07-23 06:51:38 UTC (rev 219783)
+++ branches/safari-604-branch/Source/WebCore/loader/ResourceLoadObserver.cpp 2017-07-23 06:51:43 UTC (rev 219784)
@@ -135,7 +135,16 @@
if (subframeUnderTopFrameOriginsResult.isNewEntry)
scheduleNotificationIfNeeded();
}
-
+
+// 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 const auto ssoOriginsHash = makeNeverDestroyed(HashSet<String, ASCIICaseInsensitiveHash> {
+ "sp.auth.adobe.com"
+ });
+ return ssoOriginsHash.get().contains(url.host());
+}
+
void ResourceLoadObserver::logSubresourceLoading(const Frame* frame, const ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
{
ASSERT(frame->page());
@@ -161,6 +170,9 @@
if (targetPrimaryDomain == mainFramePrimaryDomain || (isRedirect && targetPrimaryDomain == sourcePrimaryDomain))
return;
+ if (resourceNeedsSSOQuirk(targetURL))
+ return;
+
bool shouldCallNotificationCallback = false;
{
auto& targetStatistics = ensureResourceStatisticsForPrimaryDomain(targetPrimaryDomain);
Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (219783 => 219784)
--- branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-23 06:51:38 UTC (rev 219783)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-23 06:51:43 UTC (rev 219784)
@@ -1,5 +1,23 @@
2017-07-22 Jason Marcell <[email protected]>
+ Cherry-pick r219701. rdar://problem/33465715
+
+ 2017-07-20 Chris Dumez <[email protected]>
+
+ Regression(ITP): Can no longer log in on abc.go.com
+ https://bugs.webkit.org/show_bug.cgi?id=174533
+ <rdar://problem/33325881>
+
+ Reviewed by Geoffrey Garen.
+
+ Bump statistics database version to blow away any existing statistics. Without this, SSO providers
+ for which we added a quirk may already be in the database and identified as trackers. The quirk
+ merely prevents the specified SSO providers from being identified as trackers.
+
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+
+2017-07-22 Jason Marcell <[email protected]>
+
Cherry-pick r219668. rdar://problem/33462676
2017-07-19 Simon Fraser <[email protected]>
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp (219783 => 219784)
--- branches/safari-604-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-07-23 06:51:38 UTC (rev 219783)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-07-23 06:51:43 UTC (rev 219784)
@@ -46,7 +46,7 @@
namespace WebKit {
constexpr unsigned operatingDatesWindow { 30 };
-constexpr unsigned statisticsModelVersion { 7 };
+constexpr unsigned statisticsModelVersion { 8 };
constexpr unsigned maxImportance { 3 };
template<typename T> static inline String isolatedPrimaryDomain(const T& value)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes