From e8e59d4fd70ff8f2332cbc9f54a57068a95077d3 Mon Sep 17 00:00:00 2001 From: lgarron Date: Mon, 27 Apr 2015 16:07:37 -0700 Subject: [PATCH] Switch SchemeIsSecure to SchemeIsCryptographic for referrer-related code. BUG=362214 Review URL: https://codereview.chromium.org/1098983003 Cr-Commit-Position: refs/heads/master@{#327168} --- chrome/browser/safe_browsing/browser_feature_extractor.cc | 4 ++-- components/sessions/ios/ios_serialized_navigation_driver.cc | 4 ++-- content/child/resource_dispatcher.cc | 4 ++-- content/public/common/referrer.cc | 4 ++-- ios/web/public/referrer_util.cc | 4 ++-- net/base/sdch_manager.cc | 5 +++-- net/url_request/url_request_job.cc | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index ab5bbf47c7a4..bcec8a7b39fc 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -108,7 +108,7 @@ static void AddNavigationFeatures( const std::vector& redirect_chain, ClientPhishingRequest* request) { NavigationEntry* entry = controller.GetEntryAtIndex(index); - bool is_secure_referrer = entry->GetReferrer().url.SchemeIsSecure(); + bool is_secure_referrer = entry->GetReferrer().url.SchemeIsCryptographic(); if (!is_secure_referrer) { AddFeature(base::StringPrintf("%s%s=%s", feature_prefix.c_str(), @@ -150,7 +150,7 @@ static void AddNavigationFeatures( // We skip the last element since it should just be the current url. for (size_t i = 0; i < redirect_chain.size() - 1; i++) { std::string printable_redirect = redirect_chain[i].spec(); - if (redirect_chain[i].SchemeIsSecure()) { + if (redirect_chain[i].SchemeIsCryptographic()) { printable_redirect = features::kSecureRedirectValue; } AddFeature(base::StringPrintf("%s%s[%" PRIuS "]=%s", diff --git a/components/sessions/ios/ios_serialized_navigation_driver.cc b/components/sessions/ios/ios_serialized_navigation_driver.cc index cbc06a585a8f..9f41d8ba37cb 100644 --- a/components/sessions/ios/ios_serialized_navigation_driver.cc +++ b/components/sessions/ios/ios_serialized_navigation_driver.cc @@ -98,8 +98,8 @@ void IOSSerializedNavigationDriver::Sanitize( NOTREACHED(); referrer.policy = web::ReferrerPolicyNever; } - bool is_downgrade = referrer.url.SchemeIsSecure() && - !navigation->virtual_url_.SchemeIsSecure(); + bool is_downgrade = referrer.url.SchemeIsCryptographic() && + !navigation->virtual_url_.SchemeIsCryptographic(); switch (referrer.policy) { case web::ReferrerPolicyDefault: if (is_downgrade) diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc index cf56a77c8a05..baa6f6f65fcc 100644 --- a/content/child/resource_dispatcher.cc +++ b/content/child/resource_dispatcher.cc @@ -766,8 +766,8 @@ scoped_ptr ResourceDispatcher::CreateRequest( if ((request_info.referrer.policy == blink::WebReferrerPolicyDefault || request_info.referrer.policy == blink::WebReferrerPolicyNoReferrerWhenDowngrade) && - request_info.referrer.url.SchemeIsSecure() && - !request_info.url.SchemeIsSecure()) { + request_info.referrer.url.SchemeIsCryptographic() && + !request_info.url.SchemeIsCryptographic()) { LOG(FATAL) << "Trying to send secure referrer for insecure request " << "without an appropriate referrer policy.\n" << "URL = " << request_info.url << "\n" diff --git a/content/public/common/referrer.cc b/content/public/common/referrer.cc index 225df96c94db..183c950673fa 100644 --- a/content/public/common/referrer.cc +++ b/content/public/common/referrer.cc @@ -19,8 +19,8 @@ Referrer Referrer::SanitizeForRequest(const GURL& request, return sanitized_referrer; } - bool is_downgrade = - sanitized_referrer.url.SchemeIsSecure() && !request.SchemeIsSecure(); + bool is_downgrade = sanitized_referrer.url.SchemeIsCryptographic() && + !request.SchemeIsCryptographic(); if (sanitized_referrer.policy < 0 || sanitized_referrer.policy > blink::WebReferrerPolicyLast) { diff --git a/ios/web/public/referrer_util.cc b/ios/web/public/referrer_util.cc index 579ca1b2ace3..7ab2ef1a0afc 100644 --- a/ios/web/public/referrer_util.cc +++ b/ios/web/public/referrer_util.cc @@ -23,8 +23,8 @@ std::string ReferrerHeaderValueForNavigation( const GURL& destination, const web::Referrer& referrer) { std::string referrer_value; - bool leaving_secure_scheme = - referrer.url.SchemeIsSecure() && !destination.SchemeIsSecure(); + bool leaving_secure_scheme = referrer.url.SchemeIsCryptographic() && + !destination.SchemeIsCryptographic(); if (referrer.policy == ReferrerPolicyAlways || (referrer.policy == ReferrerPolicyDefault && !leaving_secure_scheme)) { if (referrer.url.is_valid()) diff --git a/net/base/sdch_manager.cc b/net/base/sdch_manager.cc index 4bf178269df8..c43c8b08c955 100644 --- a/net/base/sdch_manager.cc +++ b/net/base/sdch_manager.cc @@ -249,7 +249,7 @@ SdchProblemCode SdchManager::CanFetchDictionary( referring_url.scheme() != dictionary_url.scheme()) return SDCH_DICTIONARY_LOAD_ATTEMPT_FROM_DIFFERENT_HOST; - if (!secure_scheme_supported() && referring_url.SchemeIsSecure()) + if (!secure_scheme_supported() && referring_url.SchemeIsCryptographic()) return SDCH_DICTIONARY_SELECTED_FOR_SSL; // TODO(jar): Remove this failsafe conservative hack which is more restrictive @@ -298,7 +298,8 @@ SdchManager::GetDictionarySetByHash( if (it == dictionaries_.end()) return result.Pass(); - if (!SdchManager::secure_scheme_supported() && target_url.SchemeIsSecure()) { + if (!SdchManager::secure_scheme_supported() && + target_url.SchemeIsSecure()) { *problem_code = SDCH_DICTIONARY_FOUND_HAS_WRONG_SCHEME; return result.Pass(); } diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 106cb8567f39..5b14b6b28fd1 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc @@ -280,8 +280,8 @@ GURL URLRequestJob::ComputeReferrerForRedirect( const GURL& redirect_destination) { GURL original_referrer(referrer); bool secure_referrer_but_insecure_destination = - original_referrer.SchemeIsSecure() && - !redirect_destination.SchemeIsSecure(); + original_referrer.SchemeIsCryptographic() && + !redirect_destination.SchemeIsCryptographic(); bool same_origin = original_referrer.GetOrigin() == redirect_destination.GetOrigin(); switch (policy) { -- 2.11.4.GIT