Network traffic annotation added to safe_browsing.

Network traffic annotation added to four files in Safe Browsing.

BUG=656607

Review-Url: https://codereview.chromium.org/2697193003
Cr-Commit-Position: refs/heads/master@{#455737}

chrome/browser/safe_browsing/download_feedback.cc

@@ -128,12 +128,48 @@ void DownloadFeedbackImpl::Start(const base::Closure& finish_callback) {
   std::string metadata_string;
   bool ok = report_metadata.SerializeToString(&metadata_string);
   DCHECK(ok);
+
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("safe_browsing_feedback", R"(
+        semantics {
+          sender: "Safe Browsing Download Protection Feedback"
+          description:
+            "When a user downloads a binary that Safe Browsing declares as "
+            "suspicious, opted-in clients may upload that binary to Safe "
+            "Browsing to improve the classification. This helps protect users "
+            "from malware and unwanted software."
+          trigger:
+            "The browser will upload the binary to Google when a "
+            "download-protection verdict is 'Not Safe', and the user is opted "
+            "in to extended reporting."
+          data:
+            "The suspicious binary file."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: true
+          cookies_store: "Safe Browsing Cookie Store"
+          setting:
+            "Users can enable or disable this feature by stopping sending "
+            "security incident reports to Google via disabling 'Automatically "
+            "report details of possible security incidents to Google.' in "
+            "Chrome's settings under Advanced Settings, Privacy. The feature "
+            "is disabled by default."
+          chrome_policy {
+            SafeBrowsingExtendedReportingOptInAllowed {
+              policy_options {mode: MANDATORY}
+              SafeBrowsingExtendedReportingOptInAllowed: false
+            }
+          }
+        })");
+
   uploader_ = TwoPhaseUploader::Create(
       request_context_getter_.get(), file_task_runner_.get(),
       GURL(kSbFeedbackURL), metadata_string, file_path_,
       TwoPhaseUploader::ProgressCallback(),
       base::Bind(&DownloadFeedbackImpl::FinishedUpload, base::Unretained(this),
-                 finish_callback));
+                 finish_callback),
+      traffic_annotation);
   uploader_->Start();
 }
 

chrome/browser/safe_browsing/download_feedback_unittest.cc

@@ -14,6 +14,7 @@
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -75,7 +76,8 @@ class FakeUploaderFactory : public TwoPhaseUploaderFactory {
       const std::string& metadata,
       const base::FilePath& file_path,
       const TwoPhaseUploader::ProgressCallback& progress_callback,
-      const TwoPhaseUploader::FinishCallback& finish_callback) override;
+      const TwoPhaseUploader::FinishCallback& finish_callback,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation) override;
 
   FakeUploader* uploader_;
 };
@@ -87,7 +89,8 @@ std::unique_ptr<TwoPhaseUploader> FakeUploaderFactory::CreateTwoPhaseUploader(
     const std::string& metadata,
     const base::FilePath& file_path,
     const TwoPhaseUploader::ProgressCallback& progress_callback,
-    const TwoPhaseUploader::FinishCallback& finish_callback) {
+    const TwoPhaseUploader::FinishCallback& finish_callback,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   EXPECT_FALSE(uploader_);
 
   uploader_ = new FakeUploader(url_request_context_getter, file_task_runner,

chrome/browser/safe_browsing/threat_details_cache.cc

@@ -21,6 +21,7 @@
 #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"
@@ -81,8 +82,38 @@ void ThreatDetailsCacheCollector::OpenEntry() {
     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 different 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 disabled by default."
+          chrome_policy {
+            SafeBrowsingExtendedReportingOptInAllowed {
+              policy_options {mode: MANDATORY}
+              SafeBrowsingExtendedReportingOptInAllowed: false
+            }
+          }
+        })");
+
+  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);

chrome/browser/safe_browsing/two_phase_uploader.cc

@@ -33,13 +33,15 @@ const char kUploadContentType[] = "application/octet-stream";
 class TwoPhaseUploaderImpl : public net::URLFetcherDelegate,
                              public TwoPhaseUploader {
  public:
-  TwoPhaseUploaderImpl(net::URLRequestContextGetter* url_request_context_getter,
-                       base::TaskRunner* file_task_runner,
-                       const GURL& base_url,
-                       const std::string& metadata,
-                       const base::FilePath& file_path,
-                       const ProgressCallback& progress_callback,
-                       const FinishCallback& finish_callback);
+  TwoPhaseUploaderImpl(
+      net::URLRequestContextGetter* url_request_context_getter,
+      base::TaskRunner* file_task_runner,
+      const GURL& base_url,
+      const std::string& metadata,
+      const base::FilePath& file_path,
+      const ProgressCallback& progress_callback,
+      const FinishCallback& finish_callback,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
   ~TwoPhaseUploaderImpl() override;
 
   // Begins the upload process.
@@ -65,6 +67,7 @@ class TwoPhaseUploaderImpl : public net::URLFetcherDelegate,
   const base::FilePath file_path_;
   ProgressCallback progress_callback_;
   FinishCallback finish_callback_;
+  net::NetworkTrafficAnnotationTag traffic_annotation_;
 
   std::unique_ptr<net::URLFetcher> url_fetcher_;
 
@@ -78,7 +81,8 @@ TwoPhaseUploaderImpl::TwoPhaseUploaderImpl(
     const std::string& metadata,
     const base::FilePath& file_path,
     const ProgressCallback& progress_callback,
-    const FinishCallback& finish_callback)
+    const FinishCallback& finish_callback,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation)
     : state_(STATE_NONE),
       url_request_context_getter_(url_request_context_getter),
       file_task_runner_(file_task_runner),
@@ -86,7 +90,8 @@ TwoPhaseUploaderImpl::TwoPhaseUploaderImpl(
       metadata_(metadata),
       file_path_(file_path),
       progress_callback_(progress_callback),
-      finish_callback_(finish_callback) {
+      finish_callback_(finish_callback),
+      traffic_annotation_(traffic_annotation) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 }
 
@@ -168,8 +173,9 @@ void TwoPhaseUploaderImpl::OnURLFetchUploadProgress(
 void TwoPhaseUploaderImpl::UploadMetadata() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   state_ = UPLOAD_METADATA;
-  url_fetcher_ =
-      net::URLFetcher::Create(base_url_, net::URLFetcher::POST, this);
+  url_fetcher_ = net::URLFetcher::Create(base_url_, net::URLFetcher::POST, this,
+                                         traffic_annotation_);
+
   data_use_measurement::DataUseUserData::AttachToFetcher(
       url_fetcher_.get(), data_use_measurement::DataUseUserData::SAFE_BROWSING);
   url_fetcher_->SetRequestContext(url_request_context_getter_.get());
@@ -182,8 +188,8 @@ void TwoPhaseUploaderImpl::UploadFile() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   state_ = UPLOAD_FILE;
 
-  url_fetcher_ =
-      net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT, this);
+  url_fetcher_ = net::URLFetcher::Create(upload_url_, net::URLFetcher::PUT,
+                                         this, traffic_annotation_);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       url_fetcher_.get(), data_use_measurement::DataUseUserData::SAFE_BROWSING);
   url_fetcher_->SetRequestContext(url_request_context_getter_.get());
@@ -213,13 +219,14 @@ std::unique_ptr<TwoPhaseUploader> TwoPhaseUploader::Create(
     const std::string& metadata,
     const base::FilePath& file_path,
     const ProgressCallback& progress_callback,
-    const FinishCallback& finish_callback) {
+    const FinishCallback& finish_callback,
+    const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   if (!factory_) {
     return base::WrapUnique(new TwoPhaseUploaderImpl(
         url_request_context_getter, file_task_runner, base_url, metadata,
-        file_path, progress_callback, finish_callback));
+        file_path, progress_callback, finish_callback, traffic_annotation));
   }
   return TwoPhaseUploader::factory_->CreateTwoPhaseUploader(
       url_request_context_getter, file_task_runner, base_url, metadata,
-      file_path, progress_callback, finish_callback);
+      file_path, progress_callback, finish_callback, traffic_annotation);
 }

chrome/browser/safe_browsing/two_phase_uploader.h

@@ -12,6 +12,7 @@
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
@@ -69,7 +70,8 @@ class TwoPhaseUploader {
       const std::string& metadata,
       const base::FilePath& file_path,
       const ProgressCallback& progress_callback,
-      const FinishCallback& finish_callback);
+      const FinishCallback& finish_callback,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation);
 
   // Makes the passed |factory| the factory used to instantiate
   // a TwoPhaseUploader. Useful for tests.
@@ -97,7 +99,8 @@ class TwoPhaseUploaderFactory {
       const std::string& metadata,
       const base::FilePath& file_path,
       const TwoPhaseUploader::ProgressCallback& progress_callback,
-      const TwoPhaseUploader::FinishCallback& finish_callback) = 0;
+      const TwoPhaseUploader::FinishCallback& finish_callback,
+      const net::NetworkTrafficAnnotationTag& traffic_annotation) = 0;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_TWO_PHASE_UPLOADER_H_

chrome/browser/safe_browsing/two_phase_uploader_unittest.cc

@@ -12,6 +12,7 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
+#include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -84,7 +85,8 @@ TEST_F(TwoPhaseUploaderTest, UploadFile) {
       test_server.GetURL("start"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+                 runner),
+      TRAFFIC_ANNOTATION_FOR_TESTS));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::STATE_SUCCESS, delegate.state_);
@@ -108,7 +110,8 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseOneResponse) {
       test_server.GetURL("start?p1code=500"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+                 runner),
+      TRAFFIC_ANNOTATION_FOR_TESTS));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
@@ -128,7 +131,8 @@ TEST_F(TwoPhaseUploaderTest, BadPhaseTwoResponse) {
       test_server.GetURL("start?p2code=500"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+                 runner),
+      TRAFFIC_ANNOTATION_FOR_TESTS));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
@@ -152,7 +156,8 @@ TEST_F(TwoPhaseUploaderTest, PhaseOneConnectionClosed) {
       test_server.GetURL("start?p1close=1"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+                 runner),
+      TRAFFIC_ANNOTATION_FOR_TESTS));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_METADATA, delegate.state_);
@@ -172,7 +177,8 @@ TEST_F(TwoPhaseUploaderTest, PhaseTwoConnectionClosed) {
       test_server.GetURL("start?p2close=1"), "metadata", GetTestFilePath(),
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(&Delegate::FinishCallback, base::Unretained(&delegate),
-                 runner)));
+                 runner),
+      TRAFFIC_ANNOTATION_FOR_TESTS));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);