Revert "Add cookie security metrics"
This reverts commit 23e0b326847587e3da819d7dbcdc69f6ab58626f.
Reason for revert: Suspected cause of net_unittests failures on Mac-10.10
Original change's description:
> Add cookie security metrics
>
> Log the degree of protection against cookie theft, split by 1st/3rd
> party.
>
> Includes a bit of TransportSecurityState refactoring (no functional
> change) to provide easy access to HSTS lifetime.
>
> Bug: 749059
> Change-Id: Ib9ab7cff6a7fb4c65e84d7085e70ef13d5c00ba9
> Reviewed-on: https://chromium-review.googlesource.com/978142
> Reviewed-by: Nick Harper <[email protected]>
> Reviewed-by: Ilya Sherman <[email protected]>
> Reviewed-by: Mike West <[email protected]>
> Commit-Queue: Thiemo Nagel <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#551644}
[email protected],[email protected],[email protected],[email protected]
Change-Id: I9e7411956eb5d748b547edcf6aec7f40dde88d8d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 749059
Reviewed-on: https://chromium-review.googlesource.com/1017141
Reviewed-by: Mohsen Izadi <[email protected]>
Commit-Queue: Mohsen Izadi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#551698}diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index ec4eeca..f63b544e 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -66,7 +66,6 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_error_job.h"
-#include "net/url_request/url_request_http_job_histogram.h"
#include "net/url_request/url_request_job_factory.h"
#include "net/url_request/url_request_redirect_job.h"
#include "net/url_request/url_request_throttler_manager.h"
@@ -230,52 +229,6 @@
EPHEMERALITY_MAX);
}
-net::CookieNetworkSecurity HistogramEntryForCookie(
- const net::CanonicalCookie& cookie,
- const net::URLRequest& request,
- const net::HttpRequestInfo& request_info) {
- if (!request_info.url.SchemeIsCryptographic()) {
- return net::CookieNetworkSecurity::k1pNonsecureConnection;
- }
-
- if (cookie.IsSecure()) {
- return net::CookieNetworkSecurity::k1pSecureAttribute;
- }
-
- net::TransportSecurityState* transport_security_state =
- request.context()->transport_security_state();
- net::TransportSecurityState::STSState sts_state;
- const std::string cookie_domain =
- cookie.IsHostCookie() ? request.url().host() : cookie.Domain().substr(1);
- const bool hsts =
- transport_security_state->GetSTSState(cookie_domain, &sts_state) &&
- sts_state.ShouldUpgradeToSSL();
- if (!hsts) {
- return net::CookieNetworkSecurity::k1pSecureConnection;
- }
-
- if (cookie.IsHostCookie()) {
- if (cookie.IsPersistent() && sts_state.expiry >= cookie.ExpiryDate()) {
- return net::CookieNetworkSecurity::k1pHSTSHostCookie;
- } else {
- // Session cookies are assumed to live forever.
- return net::CookieNetworkSecurity::k1pExpiringHSTSHostCookie;
- }
- }
-
- // Domain cookies require HSTS to include subdomains to prevent spoofing.
- if (sts_state.include_subdomains) {
- if (cookie.IsPersistent() && sts_state.expiry >= cookie.ExpiryDate()) {
- return net::CookieNetworkSecurity::k1pHSTSSubdomainsIncluded;
- } else {
- // Session cookies are assumed to live forever.
- return net::CookieNetworkSecurity::k1pExpiringHSTSSubdomainsIncluded;
- }
- }
-
- return net::CookieNetworkSecurity::k1pHSTSSpoofable;
-}
-
void LogCookieUMA(const net::CookieList& cookie_list,
const net::URLRequest& request,
const net::HttpRequestInfo& request_info) {
@@ -293,16 +246,8 @@
(same_site ? "SameSite" : "CrossSite") + "Request";
const int age_in_days = (now - cookie.CreationDate()).InDays();
base::UmaHistogramCounts1000(histogram_name, age_in_days);
- oldest = std::min(cookie.CreationDate(), oldest);
- net::CookieNetworkSecurity entry =
- HistogramEntryForCookie(cookie, request, request_info);
- if (!same_site) {
- entry =
- static_cast<net::CookieNetworkSecurity>(static_cast<int>(entry) | 1);
- }
- UMA_HISTOGRAM_ENUMERATION("Cookie.NetworkSecurity", entry,
- net::CookieNetworkSecurity::kCount);
+ oldest = std::min(cookie.CreationDate(), oldest);
}
const std::string histogram_name =
