Network traffic annotation added to safe_browsing

chrome/browser/safe_browsing/threat_details_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Implementation of the ThreatDetails class.
 
 #include "chrome/browser/safe_browsing/threat_details.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/md5.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/threat_details_cache.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using content::BrowserThread;
 
 // Only send small files for now, a better strategy would use the size
 // of the whole report and the user's bandwidth.
 static const uint32_t kMaxBodySizeBytes = 1024;
 
@@ skipping 40 matching lines @@
     AllDone(true);
     return;
   }
 
   if (!request_context_getter_.get()) {
     DVLOG(1) << "Missing request context getter";
     AllDone(false);
     return;
   }
 
-  current_fetch_ = net::URLFetcher::Create(GURL(resources_it_->first),
-                                           net::URLFetcher::GET, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("safe_browsing_cache_collector", R"(
+        semantics {
+          sender: "Threat Details Cache Collector"
+          description:
+            "This request fetches differnt items from safe browsing cache "
+            "and DOES NOT make an actual network request."
+          trigger:
+            "When safe browsing extended report is collecting data."
+          data:
+            "None"
+          destination: OTHER
+        }
+        policy {
+          cookies_allowed: false
+          setting:
+            "Users can enable or disable this feature by stopping sending "
+            "security incident reports to Google via disabling 'Automatically "
+            "report details of possible security incdients to Google.' in "
+            "Chrome's settings under Advanced Settings, Privacy. The feature "
+            "is enabled by default."

[Nathan Parker, 2017/03/06 17:48:54]

is disabled by default

[Ramin Halavati, 2017/03/07 08:24:47]

Done.

+          policy {
+            SafeBrowsingExtendedReportingOptInAllowed {
+              policy_options {mode: MANDATORY}
+              value: false

[Nathan Parker, 2017/03/06 17:48:54]

I'm not sure what "false" means in this context.  If you set the policy to
false, it indeed prevent these requests.

[Ramin Halavati, 2017/03/07 08:24:47]

Here we need the value that disables the feature, hence I think 'false' is
correct.

I also changed |value| as we will use chrome_settings.promo instead of
cloud_policy.promo to parse this part and it has a slightly different notation.

+            }
+          }
+        })");
+
+  current_fetch_ =
+      net::URLFetcher::Create(GURL(resources_it_->first), net::URLFetcher::GET,
+                              this, traffic_annotation);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       current_fetch_.get(),
       data_use_measurement::DataUseUserData::SAFE_BROWSING);
   current_fetch_->SetRequestContext(request_context_getter_.get());
   // Only from cache, and don't save cookies.
   current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE |
                                net::LOAD_SKIP_CACHE_VALIDATION |
                                net::LOAD_DO_NOT_SAVE_COOKIES);
   current_fetch_->SetAutomaticallyRetryOn5xx(false);  // No retries.
   current_fetch_->Start();  // OnURLFetchComplete will be called when done.
@@ skipping 108 matching lines @@
 
 void ThreatDetailsCacheCollector::AllDone(bool success) {
   DVLOG(1) << "AllDone";
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   *result_ = success;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback_);
   callback_.Reset();
 }
 
 }  // namespace safe_browsing