Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Side by Side Diff: chrome/browser/safe_browsing/download_protection_service.cc

Issue 10907225: Add API keys to SafeBrowsing client-side phishing and download verdict requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/safe_browsing/download_protection_service.h" 5 #include "chrome/browser/safe_browsing/download_protection_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/sequenced_task_runner_helpers.h" 13 #include "base/sequenced_task_runner_helpers.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/threading/sequenced_worker_pool.h" 18 #include "base/threading/sequenced_worker_pool.h"
19 #include "base/time.h" 19 #include "base/time.h"
20 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 20 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
21 #include "chrome/browser/safe_browsing/signature_util.h" 21 #include "chrome/browser/safe_browsing/signature_util.h"
22 #include "chrome/browser/ui/browser.h" 22 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_list.h" 23 #include "chrome/browser/ui/browser_list.h"
24 #include "chrome/common/safe_browsing/csd.pb.h" 24 #include "chrome/common/safe_browsing/csd.pb.h"
25 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
26 #include "chrome/common/zip_reader.h" 26 #include "chrome/common/zip_reader.h"
27 #include "content/public/browser/browser_thread.h" 27 #include "content/public/browser/browser_thread.h"
28 #include "content/public/browser/download_item.h" 28 #include "content/public/browser/download_item.h"
29 #include "content/public/browser/page_navigator.h" 29 #include "content/public/browser/page_navigator.h"
30 #include "google_apis/google_api_keys.h"
31 #include "net/base/escape.h"
30 #include "net/base/load_flags.h" 32 #include "net/base/load_flags.h"
31 #include "net/base/x509_cert_types.h" 33 #include "net/base/x509_cert_types.h"
32 #include "net/base/x509_certificate.h" 34 #include "net/base/x509_certificate.h"
33 #include "net/http/http_status_code.h" 35 #include "net/http/http_status_code.h"
34 #include "net/url_request/url_fetcher.h" 36 #include "net/url_request/url_fetcher.h"
35 #include "net/url_request/url_fetcher_delegate.h" 37 #include "net/url_request/url_fetcher_delegate.h"
36 #include "net/url_request/url_request_context_getter.h" 38 #include "net/url_request/url_request_context_getter.h"
37 #include "net/url_request/url_request_status.h" 39 #include "net/url_request/url_request_status.h"
38 40
39 using content::BrowserThread; 41 using content::BrowserThread;
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 std::string request_data; 684 std::string request_data;
683 if (!request.SerializeToString(&request_data)) { 685 if (!request.SerializeToString(&request_data)) {
684 RecordImprovedProtectionStats(REASON_INVALID_REQUEST_PROTO); 686 RecordImprovedProtectionStats(REASON_INVALID_REQUEST_PROTO);
685 FinishRequest(SAFE); 687 FinishRequest(SAFE);
686 return; 688 return;
687 } 689 }
688 690
689 VLOG(2) << "Sending a request for URL: " 691 VLOG(2) << "Sending a request for URL: "
690 << info_.download_url_chain.back(); 692 << info_.download_url_chain.back();
691 fetcher_.reset(net::URLFetcher::Create(0 /* ID used for testing */, 693 fetcher_.reset(net::URLFetcher::Create(0 /* ID used for testing */,
692 GURL(kDownloadRequestUrl), 694 GURL(GetDownloadRequestUrl()),
693 net::URLFetcher::POST, 695 net::URLFetcher::POST,
694 this)); 696 this));
695 fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE); 697 fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
696 fetcher_->SetAutomaticallyRetryOn5xx(false); // Don't retry on error. 698 fetcher_->SetAutomaticallyRetryOn5xx(false); // Don't retry on error.
697 fetcher_->SetRequestContext(service_->request_context_getter_.get()); 699 fetcher_->SetRequestContext(service_->request_context_getter_.get());
698 fetcher_->SetUploadData("application/octet-stream", request_data); 700 fetcher_->SetUploadData("application/octet-stream", request_data);
699 fetcher_->Start(); 701 fetcher_->Start();
700 } 702 }
701 703
702 void PostFinishTask(DownloadCheckResult result) { 704 void PostFinishTask(DownloadCheckResult result) {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 } 960 }
959 961
960 std::string issuer_fp = base::HexEncode(issuer.fingerprint().data, 962 std::string issuer_fp = base::HexEncode(issuer.fingerprint().data,
961 sizeof(issuer.fingerprint().data)); 963 sizeof(issuer.fingerprint().data));
962 for (std::set<std::string>::iterator it = paths_to_check.begin(); 964 for (std::set<std::string>::iterator it = paths_to_check.begin();
963 it != paths_to_check.end(); ++it) { 965 it != paths_to_check.end(); ++it) {
964 whitelist_strings->push_back("cert/" + issuer_fp + *it); 966 whitelist_strings->push_back("cert/" + issuer_fp + *it);
965 } 967 }
966 } 968 }
967 969
970 // static
971 std::string DownloadProtectionService::GetDownloadRequestUrl() {
972 std::string url = kDownloadRequestUrl;
973 std::string api_key = google_apis::GetAPIKey();
974 if (!api_key.empty()) {
975 base::StringAppendF(&url, "?key=%s",
976 net::EscapeQueryParamValue(api_key, true).c_str());
977 }
978 return url;
979 }
980
968 } // namespace safe_browsing 981 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698