Changeset 293418 in webkit

Timestamp:

Apr 26, 2022 12:34:40 AM (3 months ago)

Author:

youenn@apple.com

Message:

Service Worker loads should not expose some ResourceTiming information
​https://bugs.webkit.org/show_bug.cgi?id=239608

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

• web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https-expected.txt:

Source/WebCore:

Filter out some resource timing info when the load is served from a service worker.
While we could do the filtering on service worker side, it is best to do it within PerformanceResourceTiming
as native clients might still want to use non filtered data in case the service worker is returning a network load
as the response.

Covered by rebased test.

• loader/ResourceTiming.cpp:

(WebCore::ResourceTiming::ResourceTiming):

• loader/ResourceTiming.h:

(WebCore::ResourceTiming::isLoadedFromServiceWorker const):

• page/PerformanceResourceTiming.cpp:

(WebCore::PerformanceResourceTiming::nextHopProtocol const):
(WebCore::PerformanceResourceTiming::redirectStart const):
(WebCore::PerformanceResourceTiming::redirectEnd const):
(WebCore::PerformanceResourceTiming::domainLookupStart const):
(WebCore::PerformanceResourceTiming::domainLookupEnd const):
(WebCore::PerformanceResourceTiming::connectStart const):
(WebCore::PerformanceResourceTiming::connectEnd const):

• page/PerformanceResourceTiming.h:

(WebCore::PerformanceResourceTiming::isLoadedFromServiceWorker const):

LayoutTests:

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/ResourceTiming.cpp (modified) (1 diff)
• Source/WebCore/loader/ResourceTiming.h (modified) (2 diffs)
• Source/WebCore/page/PerformanceResourceTiming.cpp (modified) (6 diffs)
• Source/WebCore/page/PerformanceResourceTiming.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-26  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker loads should not expose some ResourceTiming information
+        https://bugs.webkit.org/show_bug.cgi?id=239608
+
+        Reviewed by Alex Christensen.
+
+        * TestExpectations:
+
 2022-04-25  Devin Rousso  <drousso@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -855 +855 @@
 imported/w3c/web-platform-tests/html/cross-origin-embedder-policy/anonymous-iframe/sharedworker-partitioning.tentative.https.window.html [ Failure Pass ]
 imported/w3c/web-platform-tests/service-workers/service-worker/navigation-timing-extended.https.html [ Failure Pass ]
-imported/w3c/web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https.html [ Failure Pass ]
 imported/w3c/web-platform-tests/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html [ Failure Pass ]
 

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-04-26  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker loads should not expose some ResourceTiming information
+        https://bugs.webkit.org/show_bug.cgi?id=239608
+
+        Reviewed by Alex Christensen.
+
+        * web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https-expected.txt:
+
 2022-04-25  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/resource-timing-fetch-variants.https-expected.txt

@@ -1 +1 @@
 
-FAIL Redirects done from within a service-worker should not be exposed to client ResourceTiming assert_equals: expected (number) 0 but got (string) "same"
+PASS Redirects done from within a service-worker should not be exposed to client ResourceTiming
 PASS Connection info from within a service-worker should not be exposed to client ResourceTiming
 PASS requestStart should never be before fetchStart

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-26  Youenn Fablet  <youenn@apple.com>
+
+        Service Worker loads should not expose some ResourceTiming information
+        https://bugs.webkit.org/show_bug.cgi?id=239608
+
+        Reviewed by Alex Christensen.
+
+        Filter out some resource timing info when the load is served from a service worker.
+        While we could do the filtering on service worker side, it is best to do it within PerformanceResourceTiming
+        as native clients might still want to use non filtered data in case the service worker is returning a network load
+        as the response.
+
+        Covered by rebased test.
+
+        * loader/ResourceTiming.cpp:
+        (WebCore::ResourceTiming::ResourceTiming):
+        * loader/ResourceTiming.h:
+        (WebCore::ResourceTiming::isLoadedFromServiceWorker const):
+        * page/PerformanceResourceTiming.cpp:
+        (WebCore::PerformanceResourceTiming::nextHopProtocol const):
+        (WebCore::PerformanceResourceTiming::redirectStart const):
+        (WebCore::PerformanceResourceTiming::redirectEnd const):
+        (WebCore::PerformanceResourceTiming::domainLookupStart const):
+        (WebCore::PerformanceResourceTiming::domainLookupEnd const):
+        (WebCore::PerformanceResourceTiming::connectStart const):
+        (WebCore::PerformanceResourceTiming::connectEnd const):
+        * page/PerformanceResourceTiming.h:
+        (WebCore::PerformanceResourceTiming::isLoadedFromServiceWorker const):
+
 2022-04-25  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/loader/ResourceTiming.cpp

@@ -57 +57 @@
     , m_resourceLoadTiming(timing)
     , m_networkLoadMetrics(networkLoadMetrics)
+    , m_isLoadedFromServiceWorker(response.source() == ResourceResponse::Source::ServiceWorker)
 {
     if (RuntimeEnabledFeatures::sharedFeatures().serverTimingEnabled() && !m_networkLoadMetrics.failsTAOCheck)

trunk/Source/WebCore/loader/ResourceTiming.h

@@ -56 +56 @@
 
     void overrideInitiatorName(const String& name) { m_initiator = name; }
+    bool isLoadedFromServiceWorker() const { return m_isLoadedFromServiceWorker; }
 
 private:
@@ -73 +74 @@
     NetworkLoadMetrics m_networkLoadMetrics;
     Vector<ServerTiming> m_serverTiming;
+    bool m_isLoadedFromServiceWorker { false };
 };
 

trunk/Source/WebCore/page/PerformanceResourceTiming.cpp

@@ -117 +117 @@
         return 0.0;
 
+    if (m_resourceTiming.isLoadedFromServiceWorker())
+        return 0.0;
+
     if (!m_resourceTiming.networkLoadMetrics().redirectCount)
         return 0.0;
@@ -126 +129 @@
 {
     if (m_resourceTiming.networkLoadMetrics().failsTAOCheck)
+        return 0.0;
+
+    if (m_resourceTiming.isLoadedFromServiceWorker())
         return 0.0;
 
@@ -146 +152 @@
         return 0.0;
 
+    if (m_resourceTiming.isLoadedFromServiceWorker())
+        return fetchStart();
+
     if (!m_resourceTiming.networkLoadMetrics().domainLookupStart)
         return fetchStart();
@@ -156 +165 @@
     if (m_resourceTiming.networkLoadMetrics().failsTAOCheck)
         return 0.0;
+
+    if (m_resourceTiming.isLoadedFromServiceWorker())
+        return fetchStart();
 
     if (!m_resourceTiming.networkLoadMetrics().domainLookupEnd)
@@ -168 +180 @@
         return 0.0;
 
+    if (m_resourceTiming.isLoadedFromServiceWorker())
+        return fetchStart();
+
     if (!m_resourceTiming.networkLoadMetrics().connectStart)
         return domainLookupEnd();
@@ -178 +193 @@
     if (m_resourceTiming.networkLoadMetrics().failsTAOCheck)
         return 0.0;
+
+    if (m_resourceTiming.isLoadedFromServiceWorker())
+        return fetchStart();
 
     if (!m_resourceTiming.networkLoadMetrics().connectEnd)

trunk/Source/WebCore/page/PerformanceResourceTiming.h

@@ -75 +75 @@
     ~PerformanceResourceTiming();
 
+    bool isLoadedFromServiceWorker() const { return m_resourceTiming.isLoadedFromServiceWorker(); }
+
     MonotonicTime m_timeOrigin;
     ResourceTiming m_resourceTiming;