diff options
Diffstat (limited to 'chromium/components/security_state')
12 files changed, 11 insertions, 67 deletions
diff --git a/chromium/components/security_state/DEPS b/chromium/components/security_state/DEPS index bc33fd8f67a..7abc0079cab 100644 --- a/chromium/components/security_state/DEPS +++ b/chromium/components/security_state/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/prefs", "+net", "+services/network/public/cpp", "+third_party/blink/public/platform", diff --git a/chromium/components/security_state/content/content_utils.cc b/chromium/components/security_state/content/content_utils.cc index 340928a1955..824106d380f 100644 --- a/chromium/components/security_state/content/content_utils.cc +++ b/chromium/components/security_state/content/content_utils.cc @@ -49,7 +49,6 @@ blink::SecurityStyle SecurityLevelToSecurityStyle( return blink::SecurityStyle::kInsecure; return blink::SecurityStyle::kNeutral; case security_state::SECURE_WITH_POLICY_INSTALLED_CERT: - case security_state::EV_SECURE: case security_state::SECURE: return blink::SecurityStyle::kSecure; case security_state::DANGEROUS: diff --git a/chromium/components/security_state/core/BUILD.gn b/chromium/components/security_state/core/BUILD.gn index 737d3db9a8a..80202ef3536 100644 --- a/chromium/components/security_state/core/BUILD.gn +++ b/chromium/components/security_state/core/BUILD.gn @@ -14,14 +14,11 @@ jumbo_static_library("core") { "insecure_input_event_data.h", "security_state.cc", "security_state.h", - "security_state_pref_names.cc", - "security_state_pref_names.h", ] public_deps = [ ":features", "//base", - "//components/prefs", "//net", "//url", ] diff --git a/chromium/components/security_state/core/security_state.cc b/chromium/components/security_state/core/security_state.cc index 7387eb883a4..85805816ef9 100644 --- a/chromium/components/security_state/core/security_state.cc +++ b/chromium/components/security_state/core/security_state.cc @@ -12,9 +12,7 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "build/build_config.h" -#include "components/prefs/pref_registry_simple.h" #include "components/security_state/core/features.h" -#include "components/security_state/core/security_state_pref_names.h" #include "net/ssl/ssl_cipher_suite_names.h" #include "net/ssl/ssl_connection_status_flags.h" #include "services/network/public/cpp/is_potentially_trustworthy.h" @@ -57,8 +55,6 @@ SecurityLevel GetSecurityLevelForDisplayedMixedContent(bool suppress_warning) { std::string GetHistogramSuffixForSecurityLevel( security_state::SecurityLevel level) { switch (level) { - case EV_SECURE: - return "EV_SECURE"; case SECURE: return "SECURE"; case NONE: @@ -247,10 +243,6 @@ SecurityLevel GetSecurityLevel( return SECURE_WITH_POLICY_INSTALLED_CERT; } - if ((visible_security_state.cert_status & net::CERT_STATUS_IS_EV) && - visible_security_state.certificate) { - return EV_SECURE; - } return SECURE; } @@ -269,11 +261,6 @@ bool HasMajorCertificateError( return is_cryptographic_with_certificate && is_major_cert_error; } -void RegisterProfilePrefs(PrefRegistrySimple* registry) { - registry->RegisterBooleanPref(prefs::kStricterMixedContentTreatmentEnabled, - true); -} - VisibleSecurityState::VisibleSecurityState() : malicious_content_status(MALICIOUS_CONTENT_STATUS_NONE), connection_info_initialized(false), @@ -311,7 +298,7 @@ bool IsOriginLocalhostOrFile(const GURL& url) { } bool IsSslCertificateValid(SecurityLevel security_level) { - return security_level == SECURE || security_level == EV_SECURE || + return security_level == SECURE || security_level == SECURE_WITH_POLICY_INSTALLED_CERT; } diff --git a/chromium/components/security_state/core/security_state.h b/chromium/components/security_state/core/security_state.h index b17bf235b80..3a20acc840d 100644 --- a/chromium/components/security_state/core/security_state.h +++ b/chromium/components/security_state/core/security_state.h @@ -18,8 +18,6 @@ #include "net/cert/x509_certificate.h" #include "url/gurl.h" -class PrefRegistrySimple; - // Provides helper methods and data types that are used to determine the // high-level security information about a page or request. // @@ -55,7 +53,9 @@ enum SecurityLevel { // HTTP_SHOW_WARNING = 1, // HTTPS with valid EV cert. - EV_SECURE = 2, + // DEPRECATED: EV certs no longer receive special UI treatment. + // See https://crbug.com/1006943. + // EV_SECURE = 2, // HTTPS (non-EV) with valid cert. SECURE = 3, @@ -233,16 +233,14 @@ SecurityLevel GetSecurityLevel( bool HasMajorCertificateError( const VisibleSecurityState& visible_security_state); -void RegisterProfilePrefs(PrefRegistrySimple* registry); - // Returns true for a valid |url| with a cryptographic scheme, e.g., HTTPS, WSS. bool IsSchemeCryptographic(const GURL& url); // Returns true for a valid |url| with localhost or file:// scheme origin. bool IsOriginLocalhostOrFile(const GURL& url); -// Returns true if the page has a valid SSL certificate. Only EV_SECURE, -// SECURE, and SECURE_WITH_POLICY_INSTALLED_CERT are considered valid. +// Returns true if the page has a valid SSL certificate. Only SECURE and +// SECURE_WITH_POLICY_INSTALLED_CERT are considered valid. bool IsSslCertificateValid(security_state::SecurityLevel security_level); // Returns the given prefix suffixed with a dot and the current security level. diff --git a/chromium/components/security_state/core/security_state_pref_names.cc b/chromium/components/security_state/core/security_state_pref_names.cc deleted file mode 100644 index 121ab096dae..00000000000 --- a/chromium/components/security_state/core/security_state_pref_names.cc +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2019 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. - -#include "components/security_state/core/security_state_pref_names.h" - -namespace security_state { -namespace prefs { - -const char kStricterMixedContentTreatmentEnabled[] = - "security_state.stricter_mixed_content_treatment_enabled"; - -} // namespace prefs -} // namespace security_state diff --git a/chromium/components/security_state/core/security_state_pref_names.h b/chromium/components/security_state/core/security_state_pref_names.h deleted file mode 100644 index 400522191d5..00000000000 --- a/chromium/components/security_state/core/security_state_pref_names.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2019 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. - -#ifndef COMPONENTS_SECURITY_STATE_CORE_SECURITY_STATE_PREF_NAMES_H_ -#define COMPONENTS_SECURITY_STATE_CORE_SECURITY_STATE_PREF_NAMES_H_ - -namespace security_state { -namespace prefs { - -// Boolean preference used to control whether mixed content should trigger a -// stricter treatment (a 'Not Secure' warning in the URL bar for all passive -// mixed content displayed, and autoupgrades to HTTPS for audio/video content). -extern const char kStricterMixedContentTreatmentEnabled[]; - -} // namespace prefs -} // namespace security_state - -#endif // COMPONENTS_SECURITY_STATE_CORE_SECURITY_STATE_PREF_NAMES_H_ diff --git a/chromium/components/security_state/core/security_state_unittest.cc b/chromium/components/security_state/core/security_state_unittest.cc index 85dcf8be43b..5b304f1fe0b 100644 --- a/chromium/components/security_state/core/security_state_unittest.cc +++ b/chromium/components/security_state/core/security_state_unittest.cc @@ -14,7 +14,6 @@ #include "base/test/scoped_feature_list.h" #include "components/security_state/core/features.h" #include "components/security_state/core/insecure_input_event_data.h" -#include "components/security_state/core/security_state.h" #include "net/cert/x509_certificate.h" #include "net/ssl/ssl_cipher_suite_names.h" #include "net/ssl/ssl_connection_status_flags.h" @@ -433,7 +432,6 @@ TEST(SecurityStateTest, LocalhostOrFileUrl) { // Tests IsSslCertificateValid function. TEST(SecurityStateTest, SslCertificateValid) { EXPECT_TRUE(IsSslCertificateValid(SecurityLevel::SECURE)); - EXPECT_TRUE(IsSslCertificateValid(SecurityLevel::EV_SECURE)); EXPECT_TRUE( IsSslCertificateValid(SecurityLevel::SECURE_WITH_POLICY_INSTALLED_CERT)); diff --git a/chromium/components/security_state/ios/BUILD.gn b/chromium/components/security_state/ios/BUILD.gn index fae14dc9f8f..3243ff0aa75 100644 --- a/chromium/components/security_state/ios/BUILD.gn +++ b/chromium/components/security_state/ios/BUILD.gn @@ -15,8 +15,8 @@ component("ios") { deps = [ "//base", "//components/autofill/ios/form_util", + "//components/safe_browsing/ios/browser:allow_list", "//components/security_state/core", - "//ios/chrome/browser/safe_browsing:allow_list", "//ios/web/common", "//ios/web/public", "//ios/web/public/security", @@ -29,8 +29,8 @@ source_set("unit_tests") { sources = [ "security_state_utils_unittest.mm" ] deps = [ ":ios", + "//components/safe_browsing/ios/browser:allow_list", "//components/security_state/core", - "//ios/chrome/browser/safe_browsing:allow_list", "//ios/web/public/security", "//ios/web/public/test", ] diff --git a/chromium/components/security_state/ios/DEPS b/chromium/components/security_state/ios/DEPS index be3c0e5d193..b7afaad3911 100644 --- a/chromium/components/security_state/ios/DEPS +++ b/chromium/components/security_state/ios/DEPS @@ -1,8 +1,7 @@ include_rules = [ "+components/autofill/ios", "+components/security_state/core", - # TODO(crbug.com/1082521): Move safe browsing into iOS component code. - "+ios/chrome/browser/safe_browsing", + "+components/safe_browsing/ios", "+ios/web/common", "+ios/web/public", "+services/network/public/cpp", diff --git a/chromium/components/security_state/ios/security_state_utils.mm b/chromium/components/security_state/ios/security_state_utils.mm index 35fa426884f..6d3a43e7103 100644 --- a/chromium/components/security_state/ios/security_state_utils.mm +++ b/chromium/components/security_state/ios/security_state_utils.mm @@ -6,9 +6,9 @@ #include <memory> +#import "components/safe_browsing/ios/browser/safe_browsing_url_allow_list.h" #include "components/security_state/core/security_state.h" #include "components/security_state/ios/ssl_status_input_event_data.h" -#import "ios/chrome/browser/safe_browsing/safe_browsing_url_allow_list.h" #include "ios/web/public/navigation/navigation_item.h" #import "ios/web/public/navigation/navigation_manager.h" #include "ios/web/public/security/security_style.h" diff --git a/chromium/components/security_state/ios/security_state_utils_unittest.mm b/chromium/components/security_state/ios/security_state_utils_unittest.mm index dc66ae4fa8b..e6a1544e8b3 100644 --- a/chromium/components/security_state/ios/security_state_utils_unittest.mm +++ b/chromium/components/security_state/ios/security_state_utils_unittest.mm @@ -4,9 +4,9 @@ #include "components/security_state/ios/security_state_utils.h" +#import "components/safe_browsing/ios/browser/safe_browsing_url_allow_list.h" #include "components/security_state/core/security_state.h" #import "components/security_state/ios/insecure_input_tab_helper.h" -#import "ios/chrome/browser/safe_browsing/safe_browsing_url_allow_list.h" #import "ios/web/public/navigation/navigation_item.h" #import "ios/web/public/navigation/navigation_manager.h" #include "ios/web/public/security/ssl_status.h" |