Fix Resource Timing Encoded Body Size overflow.

The existing 'encoded_body_length' in url_response_head.mojom is default
to -1. In some cases, this default value is not overwritten and is
propagated all the way to JS code and caused number overflow. See
details in the last comments of crbug.com/1324812.

This CL wraps the `encoded_body_length` without default value into a
struct which is made optional. This way, the case it is not set and it
is set to 0 and when it is not set, 0 would be used explicitly in the
downstream code.

Also the type of the field is changed into uint64_t to align with the V8
binding. And because uint64_t and int64 has different range, so
variables passed from and into the mojom field also changed their types.
Most of files touched are just of this change.

Bug: 1336219,1324812
Change-Id: I67f7bd3e47e4f71f719bab9b56cfaa9d388c6f7a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4126836
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: Hao Liu <haoliuk@chromium.org>
Reviewed-by: Yoav Weiss <yoavweiss@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1091612}

Author: haoliuk

content/browser/devtools/devtools_url_loader_interceptor.cc

@@ -41,6 +41,8 @@
 #include "services/network/public/cpp/resource_request_body.h"
 #include "services/network/public/cpp/url_loader_completion_status.h"
 #include "services/network/public/mojom/early_hints.mojom.h"
+#include "services/network/public/mojom/encoded_body_length.mojom-forward.h"
+#include "services/network/public/mojom/encoded_body_length.mojom.h"
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "services/network/public/mojom/url_loader.mojom.h"
 #include "third_party/blink/public/platform/resource_request_blocked_reason.h"
@@ -1220,7 +1222,7 @@ Response InterceptionJob::ProcessResponseOverride(
   size_t headers_size = head->headers->raw_headers().size();
   head->content_length = body_size;
   head->encoded_data_length = headers_size;
-  head->encoded_body_length = 0;
+  head->encoded_body_length = network::mojom::EncodedBodyLength::New(0u);
   head->request_start = start_ticks_;
   head->response_start = now_ticks;
 

content/public/test/render_view_test.cc

@@ -117,7 +117,7 @@ class FakeWebURLLoader : public blink::WebURLLoader {
       absl::optional<blink::WebURLError>&,
       blink::WebData&,
       int64_t&,
-      int64_t&,
+      uint64_t&,
       blink::WebBlobInfo&,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>) override {
     client->DidFail(blink::WebURLError(kFailureReason, request->url),

services/network/public/mojom/BUILD.gn

@@ -342,6 +342,7 @@ mojom("url_loader_base") {
     "data_pipe_getter.mojom",
     "devtools_observer.mojom",
     "early_hints.mojom",
+    "encoded_body_length.mojom",
     "fetch_api.mojom",
     "http_raw_headers.mojom",
     "http_request_headers.mojom",

services/network/public/mojom/encoded_body_length.mojom

@@ -0,0 +1,11 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module network.mojom;
+
+// This struct contains a encoded body length which is of type unsign long and
+// is used as an optional value.
+struct EncodedBodyLength {
+  uint64 value;
+};

services/network/public/mojom/url_response_head.mojom

@@ -7,6 +7,7 @@ module network.mojom;
 import "mojo/public/mojom/base/time.mojom";
 import "mojo/public/mojom/base/unguessable_token.mojom";
 import "services/network/public/mojom/alternate_protocol_usage.mojom";
+import "services/network/public/mojom/encoded_body_length.mojom";
 import "services/network/public/mojom/fetch_api.mojom";
 import "services/network/public/mojom/ip_address_space.mojom";
 import "services/network/public/mojom/ip_endpoint.mojom";
@@ -55,9 +56,9 @@ struct URLResponseHead {
   // no data, contains -1.
   int64 encoded_data_length = -1;
 
-  // Length of the response body data before decompression. -1 unless the body
-  // has been read to the end.
-  int64 encoded_body_length = -1;
+  // Length of the response body data before decompression. It is null unless
+  // the body has been read to the end.
+  network.mojom.EncodedBodyLength? encoded_body_length;
 
   // True if the request accessed the network in the process of retrieving data.
   bool network_accessed = false;

third_party/blink/public/platform/internet_disconnected_web_url_loader.h

@@ -55,7 +55,7 @@ class InternetDisconnectedWebURLLoader final : public WebURLLoader {
       absl::optional<WebURLError>&,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override;

third_party/blink/public/platform/web_url_loader.h

@@ -109,7 +109,7 @@ class BLINK_PLATFORM_EXPORT WebURLLoader {
       absl::optional<WebURLError>& error,
       WebData& data,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper);

third_party/blink/public/platform/web_url_loader_client.h

@@ -113,7 +113,7 @@ class BLINK_PLATFORM_EXPORT WebURLLoaderClient {
   virtual void DidFinishLoading(
       base::TimeTicks finish_time,
       int64_t total_encoded_data_length,
-      int64_t total_encoded_body_length,
+      uint64_t total_encoded_body_length,
       int64_t total_decoded_body_length,
       bool should_report_corb_blocking,
       absl::optional<bool> pervasive_payload_requested = absl::nullopt) {}
@@ -124,7 +124,7 @@ class BLINK_PLATFORM_EXPORT WebURLLoaderClient {
   virtual void DidFail(const WebURLError&,
                        base::TimeTicks finish_time,
                        int64_t total_encoded_data_length,
-                       int64_t total_encoded_body_length,
+                       uint64_t total_encoded_body_length,
                        int64_t total_decoded_body_length) {}
 
   // Value passed to DidFinishLoading when total encoded data length isn't

third_party/blink/public/platform/web_url_response.h

@@ -247,7 +247,7 @@ class BLINK_PLATFORM_EXPORT WebURLResponse {
 
   // Original size of the response body before decompression.
   int64_t EncodedBodyLength() const;
-  void SetEncodedBodyLength(int64_t);
+  void SetEncodedBodyLength(uint64_t);
 
   void SetIsSignedExchangeInnerResponse(bool);
   void SetWasInPrefetchCache(bool);

third_party/blink/renderer/bindings/core/v8/script_streamer_test.cc

@@ -109,7 +109,7 @@ class NoopLoaderFactory final : public ResourceFetcher::LoaderFactory {
         absl::optional<WebURLError>&,
         WebData&,
         int64_t& encoded_data_length,
-        int64_t& encoded_body_length,
+        uint64_t& encoded_body_length,
         WebBlobInfo& downloaded_blob,
         std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
             resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/core/editing/serializers/serialization.cc

@@ -140,7 +140,7 @@ class FailingLoader final : public WebURLLoader {
       absl::optional<WebURLError>& error,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/core/loader/prefetched_signed_exchange_manager.cc

@@ -93,7 +93,7 @@ class PrefetchedSignedExchangeManager::PrefetchedSignedExchangeLoader
       absl::optional<WebURLError>& error,
       WebData& data,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/core/svg/graphics/svg_image.cc

@@ -113,7 +113,7 @@ class FailingLoader final : public WebURLLoader {
       absl::optional<WebURLError>& error,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/core/testing/no_network_web_url_loader.h

@@ -34,7 +34,7 @@ class NoNetworkWebURLLoader : public WebURLLoader {
       absl::optional<WebURLError>&,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       blink::WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/modules/service_worker/web_embedded_worker_impl_test.cc

@@ -67,7 +67,7 @@ class FakeWebURLLoader final : public WebURLLoader {
       absl::optional<WebURLError>&,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/platform/exported/web_url_response.cc

@@ -179,7 +179,8 @@ WebURLResponse WebURLResponse::Create(
       head.did_service_worker_navigation_preload);
   response.SetIsValidated(head.is_validated);
   response.SetEncodedDataLength(head.encoded_data_length);
-  response.SetEncodedBodyLength(head.encoded_body_length);
+  response.SetEncodedBodyLength(
+      head.encoded_body_length ? head.encoded_body_length->value : 0);
   response.SetWasAlpnNegotiated(head.was_alpn_negotiated);
   response.SetAlpnNegotiatedProtocol(
       WebString::FromUTF8(head.alpn_negotiated_protocol));
@@ -591,7 +592,7 @@ int64_t WebURLResponse::EncodedBodyLength() const {
   return resource_response_->EncodedBodyLength();
 }
 
-void WebURLResponse::SetEncodedBodyLength(int64_t length) {
+void WebURLResponse::SetEncodedBodyLength(uint64_t length) {
   resource_response_->SetEncodedBodyLength(length);
 }
 

third_party/blink/renderer/platform/loader/fetch/resource_loader.cc

@@ -1243,7 +1243,7 @@ void ResourceLoader::DidFinishLoadingFirstPartInMultipart() {
 void ResourceLoader::DidFinishLoading(
     base::TimeTicks response_end_time,
     int64_t encoded_data_length,
-    int64_t encoded_body_length,
+    uint64_t encoded_body_length,
     int64_t decoded_body_length,
     bool should_report_corb_blocking,
     absl::optional<bool> pervasive_payload_requested) {
@@ -1304,7 +1304,7 @@ void ResourceLoader::DidFinishLoading(
 void ResourceLoader::DidFail(const WebURLError& error,
                              base::TimeTicks response_end_time,
                              int64_t encoded_data_length,
-                             int64_t encoded_body_length,
+                             uint64_t encoded_body_length,
                              int64_t decoded_body_length) {
   const ResourceRequestHead& request = resource_->GetResourceRequest();
   response_end_time_for_error_cases_ = response_end_time;
@@ -1393,7 +1393,7 @@ void ResourceLoader::RequestSynchronously(const ResourceRequestHead& request) {
   absl::optional<WebURLError> error_out;
   WebData data_out;
   int64_t encoded_data_length = WebURLLoaderClient::kUnknownEncodedDataLength;
-  int64_t encoded_body_length = 0;
+  uint64_t encoded_body_length = 0;
   WebBlobInfo downloaded_blob;
 
   if (CanHandleDataURLRequestLocally(request)) {

third_party/blink/renderer/platform/loader/fetch/resource_loader.h

@@ -151,15 +151,15 @@ class PLATFORM_EXPORT ResourceLoader final
       mojo::ScopedDataPipeConsumerHandle body) override;
   void DidFinishLoading(base::TimeTicks response_end_time,
                         int64_t encoded_data_length,
-                        int64_t encoded_body_length,
+                        uint64_t encoded_body_length,
                         int64_t decoded_body_length,
                         bool should_report_corb_blocking,
                         absl::optional<bool> pervasive_payload_requested =
                             absl::nullopt) override;
   void DidFail(const WebURLError&,
                base::TimeTicks response_end_time,
                int64_t encoded_data_length,
-               int64_t encoded_body_length,
+               uint64_t encoded_body_length,
                int64_t decoded_body_length) override;
 
   mojom::blink::CodeCacheType GetCodeCacheType() const;

third_party/blink/renderer/platform/loader/fetch/resource_loader_defer_loading_test.cc

@@ -72,7 +72,7 @@ class TestWebURLLoader final : public WebURLLoader {
       absl::optional<WebURLError>&,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override {

third_party/blink/renderer/platform/loader/fetch/resource_response.cc

@@ -473,7 +473,7 @@ void ResourceResponse::SetEncodedDataLength(int64_t value) {
   encoded_data_length_ = value;
 }
 
-void ResourceResponse::SetEncodedBodyLength(int64_t value) {
+void ResourceResponse::SetEncodedBodyLength(uint64_t value) {
   encoded_body_length_ = value;
 }
 

third_party/blink/renderer/platform/loader/fetch/resource_response.h

@@ -350,7 +350,7 @@ class PLATFORM_EXPORT ResourceResponse final {
   void SetEncodedDataLength(int64_t value);
 
   int64_t EncodedBodyLength() const { return encoded_body_length_; }
-  void SetEncodedBodyLength(int64_t value);
+  void SetEncodedBodyLength(uint64_t value);
 
   int64_t DecodedBodyLength() const { return decoded_body_length_; }
   void SetDecodedBodyLength(int64_t value);
@@ -612,7 +612,7 @@ class PLATFORM_EXPORT ResourceResponse final {
   int64_t encoded_data_length_ = 0;
 
   // Size of the response body in bytes prior to decompression.
-  int64_t encoded_body_length_ = 0;
+  uint64_t encoded_body_length_ = 0;
 
   // Sizes of the response body in bytes after any content-encoding is
   // removed.

third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context.cc

@@ -251,7 +251,9 @@ void SyncLoadContext::OnCompletedRequest(
   response_->should_collapse_initiator = status.should_collapse_initiator;
   response_->cors_error = status.cors_error_status;
   response_->head->encoded_data_length = status.encoded_data_length;
-  response_->head->encoded_body_length = status.encoded_body_length;
+  DCHECK_GE(status.encoded_body_length, 0);
+  response_->head->encoded_body_length =
+      network::mojom::EncodedBodyLength::New(status.encoded_body_length);
   if ((blob_response_started_ && !blob_finished_) || body_handle_.is_valid()) {
     // The body is still begin downloaded as a Blob, or being read through the
     // handle. Wait until it's completed.

third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc

@@ -535,7 +535,7 @@ void WebURLLoader::LoadSynchronously(
     absl::optional<WebURLError>& error,
     WebData& data,
     int64_t& encoded_data_length,
-    int64_t& encoded_body_length,
+    uint64_t& encoded_body_length,
     WebBlobInfo& downloaded_blob,
     std::unique_ptr<ResourceLoadInfoNotifierWrapper>
         resource_load_info_notifier_wrapper) {
@@ -585,7 +585,10 @@ void WebURLLoader::LoadSynchronously(
       WebURLResponse::Create(final_url, *sync_load_response.head,
                              has_devtools_request_id, context_->request_id());
   encoded_data_length = sync_load_response.head->encoded_data_length;
-  encoded_body_length = sync_load_response.head->encoded_body_length;
+  encoded_body_length =
+      sync_load_response.head->encoded_body_length
+          ? sync_load_response.head->encoded_body_length->value
+          : 0;
   if (sync_load_response.downloaded_blob) {
     downloaded_blob = WebBlobInfo(
         WebString::FromLatin1(sync_load_response.downloaded_blob->uuid),

third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader_unittest.cc

@@ -30,6 +30,8 @@
 #include "net/url_request/redirect_info.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
+#include "services/network/public/mojom/encoded_body_length.mojom-forward.h"
+#include "services/network/public/mojom/encoded_body_length.mojom.h"
 #include "services/network/public/mojom/fetch_api.mojom-shared.h"
 #include "services/network/public/mojom/url_loader_completion_status.mojom.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
@@ -104,8 +106,9 @@ class MockResourceRequestSender : public WebResourceRequestSender {
       WebBackForwardCacheLoaderHelper back_forward_cache_loader_helper)
       override {
     EXPECT_FALSE(peer_);
-    if (sync_load_response_.head->encoded_body_length != -1)
+    if (sync_load_response_.head->encoded_body_length) {
       EXPECT_TRUE(loader_options & network::mojom::kURLLoadOptionSynchronous);
+    }
     peer_ = std::move(peer);
     return 1;
   }
@@ -247,7 +250,7 @@ class TestWebURLLoaderClient : public WebURLLoaderClient {
   void DidFinishLoading(
       base::TimeTicks finishTime,
       int64_t totalEncodedDataLength,
-      int64_t totalEncodedBodyLength,
+      uint64_t totalEncodedBodyLength,
       int64_t totalDecodedBodyLength,
       bool should_report_corb_blocking,
       absl::optional<bool> pervasive_payload_requested) override {
@@ -263,7 +266,7 @@ class TestWebURLLoaderClient : public WebURLLoaderClient {
   void DidFail(const WebURLError& error,
                base::TimeTicks finishTime,
                int64_t totalEncodedDataLength,
-               int64_t totalEncodedBodyLength,
+               uint64_t totalEncodedBodyLength,
                int64_t totalDecodedBodyLength) override {
     EXPECT_TRUE(loader_);
     EXPECT_FALSE(did_finish_);
@@ -564,7 +567,7 @@ TEST_F(WebURLLoaderTest, SSLInfo) {
 // correctly assigned for sync XHR.
 TEST_F(WebURLLoaderTest, SyncLengths) {
   static const char kBodyData[] = "Today is Thursday";
-  const int kEncodedBodyLength = 30;
+  const uint64_t kEncodedBodyLength = 30;
   const int kEncodedDataLength = 130;
   const KURL url(kTestURL);
 
@@ -579,15 +582,16 @@ TEST_F(WebURLLoaderTest, SyncLengths) {
   sync_load_response.url = GURL(url);
   sync_load_response.data.Assign(WebData(kBodyData));
   ASSERT_EQ(17u, sync_load_response.data.size());
-  sync_load_response.head->encoded_body_length = kEncodedBodyLength;
+  sync_load_response.head->encoded_body_length =
+      network::mojom::EncodedBodyLength::New(kEncodedBodyLength);
   sync_load_response.head->encoded_data_length = kEncodedDataLength;
   sender()->set_sync_load_response(std::move(sync_load_response));
 
   WebURLResponse response;
   absl::optional<WebURLError> error;
   WebData data;
   int64_t encoded_data_length = 0;
-  int64_t encoded_body_length = 0;
+  uint64_t encoded_body_length = 0;
   WebBlobInfo downloaded_blob;
 
   client()->loader()->LoadSynchronously(

third_party/blink/renderer/platform/loader/internet_disconnected_web_url_loader.cc

@@ -53,7 +53,7 @@ void InternetDisconnectedWebURLLoader::LoadSynchronously(
     absl::optional<WebURLError>&,
     WebData&,
     int64_t& encoded_data_length,
-    int64_t& encoded_body_length,
+    uint64_t& encoded_body_length,
     WebBlobInfo& downloaded_blob,
     std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
         resource_load_info_notifier_wrapper) {

third_party/blink/renderer/platform/testing/noop_web_url_loader.cc

@@ -21,7 +21,7 @@ void NoopWebURLLoader::LoadSynchronously(
     absl::optional<WebURLError>&,
     WebData&,
     int64_t& encoded_data_length,
-    int64_t& encoded_body_length,
+    uint64_t& encoded_body_length,
     WebBlobInfo& downloaded_blob,
     std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
         resource_load_info_notifier_wrapper) {

third_party/blink/renderer/platform/testing/noop_web_url_loader.h

@@ -27,7 +27,7 @@ class NoopWebURLLoader final : public WebURLLoader {
       absl::optional<WebURLError>&,
       WebData&,
       int64_t& encoded_data_length,
-      int64_t& encoded_body_length,
+      uint64_t& encoded_body_length,
       WebBlobInfo& downloaded_blob,
       std::unique_ptr<blink::ResourceLoadInfoNotifierWrapper>
           resource_load_info_notifier_wrapper) override;