[COOP] reporting: factorize the "sanitized URL" logic.

Sensitive information are removed from URLs sent with COOP. This was
duplicated several time and way more are coming to support
access-reporting.

This patch:
1. Factorize the logic inside SanitizedURL(url)
2. Clear the #fragment part of the URL. Developers need to know the
   document's URL, not which part of it the user scrolled into.
3. Clear non HTTP/HTTPS urls.
4. As in the ReportingServiceImpl, use GetAsReferrer() instead. This is
   slightly more optimized.
5. Remove the useless sanitization in QueueNavigationReport.

Bug: 1090273
Change-Id: I4b2a23dcb3ed218c58d8a940bed1a34fe42a7fc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2401025Reviewed-by: Camille Lamy <clamy@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806703}

content/browser/net/cross_origin_opener_policy_reporter.cc

@@ -113,6 +113,16 @@ FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
   return opener ? opener->frame_tree()->root() : nullptr;
 }
 
+// Remove sensitive data from URL used in reports.
+std::string SanitizedURL(const GURL& url) {
+  // Strip username, password and ref fragment from the URL.
+  // Keep only the valid http/https ones.
+  //
+  // Note: This is the exact same operation used in
+  // ReportingServiceImpl::QueueReport() for the |url|.
+  return url.GetAsReferrer().spec();
+}
+
 }  // namespace
 
 CrossOriginOpenerPolicyReporter::CrossOriginOpenerPolicyReporter(
@@ -137,21 +147,12 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationToCOOPReport(
   if (!endpoint)
     return;
 
-  url::Replacements<char> replacements;
-  replacements.ClearUsername();
-  replacements.ClearPassword();
-  std::string sanitized_previous_url;
-  if (same_origin_with_previous) {
-    sanitized_previous_url =
-        previous_url.ReplaceComponents(replacements).spec();
-  }
-  std::string sanitized_referrer_url =
-      referrer_url.ReplaceComponents(replacements).spec();
   base::DictionaryValue body;
   body.SetString(kDisposition,
                  is_report_only ? kDispositionReporting : kDispositionEnforce);
-  body.SetString(kPreviousURL, sanitized_previous_url);
-  body.SetString(kReferrer, sanitized_referrer_url);
+  body.SetString(kPreviousURL,
+                 same_origin_with_previous ? SanitizedURL(previous_url) : "");
+  body.SetString(kReferrer, SanitizedURL(referrer_url));
   body.SetString(kViolationType, kTypeToResponse);
   QueueNavigationReport(std::move(body), *endpoint, is_report_only);
 }
@@ -167,13 +168,9 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationAwayFromCOOPReport(
   if (!endpoint)
     return;
 
-  url::Replacements<char> replacements;
-  replacements.ClearUsername();
-  replacements.ClearPassword();
   std::string sanitized_next_url;
-  if (is_current_source || same_origin_with_next) {
-    sanitized_next_url = next_url.ReplaceComponents(replacements).spec();
-  }
+  if (is_current_source || same_origin_with_next)
+    sanitized_next_url = SanitizedURL(next_url);
   base::DictionaryValue body;
   body.SetString(kNextURL, sanitized_next_url);
   body.SetString(kViolationType, kTypeFromResponse);
@@ -331,12 +328,8 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
   body.SetString(
       kEffectivePolicy,
       ToString(is_report_only ? coop_.report_only_value : coop_.value));
-  url::Replacements<char> replacements;
-  replacements.ClearUsername();
-  replacements.ClearPassword();
-  GURL sanitized_context_url = context_url_.ReplaceComponents(replacements);
   storage_partition_->GetNetworkContext()->QueueReport(
-      "coop", endpoint, sanitized_context_url, /*user_agent=*/base::nullopt,
+      "coop", endpoint, context_url_, /*user_agent=*/base::nullopt,
       std::move(body));
 }
 

content/browser/net/cross_origin_opener_policy_reporter_unittest.cc

@@ -80,7 +80,8 @@ class CrossOriginOpenerPolicyReporterTest : public testing::Test {
 
 TEST_F(CrossOriginOpenerPolicyReporterTest, Basic) {
   auto reporter = GetReporter();
-  std::string url1 = "https://www1.example.com/y#foo?bar=baz";
+  std::string url1 = "https://www1.example.com/y?bar=baz#foo";
+  std::string url1_report = "https://www1.example.com/y?bar=baz";
   std::string url2 = "https://www1.example.com/";
   std::string url3 = "http://www2.example.com:41/z";
 
@@ -94,7 +95,7 @@ TEST_F(CrossOriginOpenerPolicyReporterTest, Basic) {
   EXPECT_EQ(r1.type, "coop");
   EXPECT_EQ(r1.url, context_url());
   EXPECT_EQ(r1.body.FindKey("disposition")->GetString(), "enforce");
-  EXPECT_EQ(r1.body.FindKey("previousResponseURL")->GetString(), url1);
+  EXPECT_EQ(r1.body.FindKey("previousResponseURL")->GetString(), url1_report);
   EXPECT_EQ(r1.body.FindKey("referrer")->GetString(), url2);
   EXPECT_EQ(r1.body.FindKey("type")->GetString(), "navigation-to-response");
   EXPECT_EQ(r1.body.FindKey("effectivePolicy")->GetString(),
@@ -135,7 +136,8 @@ TEST_F(CrossOriginOpenerPolicyReporterTest, UserAndPassSanitization) {
 
 TEST_F(CrossOriginOpenerPolicyReporterTest, Clone) {
   auto reporter = GetReporter();
-  std::string url1 = "https://www1.example.com/y#foo?bar=baz";
+  std::string url1 = "https://www1.example.com/y?bar=baz#foo";
+  std::string url1_sanitized = "https://www1.example.com/y?bar=baz";
 
   mojo::Remote<network::mojom::CrossOriginOpenerPolicyReporter> remote;
   reporter->Clone(remote.BindNewPipeAndPassReceiver());
@@ -150,8 +152,9 @@ TEST_F(CrossOriginOpenerPolicyReporterTest, Clone) {
   EXPECT_EQ(r1.type, "coop");
   EXPECT_EQ(r1.url, context_url());
   EXPECT_EQ(r1.body.FindKey("disposition")->GetString(), "enforce");
-  EXPECT_EQ(r1.body.FindKey("previousResponseURL")->GetString(), url1);
-  EXPECT_EQ(r1.body.FindKey("referrer")->GetString(), url1);
+  EXPECT_EQ(r1.body.FindKey("previousResponseURL")->GetString(),
+            url1_sanitized);
+  EXPECT_EQ(r1.body.FindKey("referrer")->GetString(), url1_sanitized);
   EXPECT_EQ(r1.body.FindKey("type")->GetString(), "navigation-to-response");
   EXPECT_EQ(r1.body.FindKey("effectivePolicy")->GetString(),
             "same-origin-plus-coep");