diff options
author | lgarron <lgarron@chromium.org> | 2015-05-11 16:14:28 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-11 23:14:48 +0000 |
commit | fe50e76fa445ff8e6fc3d18bb4b8d3a6b1408730 (patch) | |
tree | 78638cb9b9034c8d88c7658a84a0a06c295b19e5 /components/content_settings | |
parent | 988c697aff35b3fd347dec35f2f2ac159c8328a9 (diff) | |
download | chromium_src-fe50e76fa445ff8e6fc3d18bb4b8d3a6b1408730.zip chromium_src-fe50e76fa445ff8e6fc3d18bb4b8d3a6b1408730.tar.gz chromium_src-fe50e76fa445ff8e6fc3d18bb4b8d3a6b1408730.tar.bz2 |
Switch Fizzy //components to use SchemeIsCryptographic() instead of SchemeIsSecure().
We recently introduced SchemeIsCryptographic() and IsOriginSecure(),
which are meant to replace SchemeIsSecure().
IsOriginSecure() roughly means "do we trust this content not to be
tampered with before it reaches the user?" [1] This is a higher-level
definition that corresponds to the new "privileged contexts" spec. [2]
SchemeIsCryptographic() [3] is close to the old definition of
SchemeIsSecure(), and literally just checks if the scheme is a
cryptographic scheme (HTTPS or WSS as of right now). The difference is
that SchemeIsCryptographic() will not consider filesystem URLs secure.
[1] https://code.google.com/p/chromium/codesearch#chromium/src/content/public/common/origin_util.h&sq=package:chromium&type=cs&l=19&rcl=143099866
[2] https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features and https://w3c.github.io/webappsec/specs/powerfulfeatures/
[3] https://code.google.com/p/chromium/codesearch#chromium/src/url/gurl.h&sq=package:chromium&type=cs&l=250&rcl=1430998666
BUG=362214
Review URL: https://codereview.chromium.org/1128363006
Cr-Commit-Position: refs/heads/master@{#329269}
Diffstat (limited to 'components/content_settings')
-rw-r--r-- | components/content_settings/core/browser/host_content_settings_map.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc index 73dd809..0294e3a 100644 --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc @@ -659,7 +659,7 @@ bool HostContentSettingsMap::ShouldAllowAllContent( #endif if (secondary_url.SchemeIs(kChromeUIScheme) && content_type == CONTENT_SETTINGS_TYPE_COOKIES && - primary_url.SchemeIsSecure()) { + primary_url.SchemeIsCryptographic()) { return true; } #if defined(ENABLE_EXTENSIONS) |