fix user proxy support

This commit is contained in:
Carmelo Messina 2022-01-25 16:31:06 +01:00
parent 20c19f1c68
commit 6244613ebf
No known key found for this signature in database
GPG key ID: 968894BE688289FD

View file

@ -3,20 +3,20 @@ Date: Tue, 18 Jan 2022 16:02:06 +0000
Subject: Enable Chrome Certificate Transparency and disable reporting.
---
chrome/browser/about_flags.cc | 5 +++++
chrome/browser/browser_features.cc | 2 +-
.../component_updater/pki_metadata_component_installer.cc | 2 +-
chrome/browser/flag_descriptions.cc | 4 ++++
chrome/browser/flag_descriptions.h | 3 +++
chrome/browser/net/system_network_context_manager.cc | 4 ----
chrome/browser/ssl/sct_reporting_service.cc | 2 +-
chrome/common/chrome_features.cc | 2 +-
net/http/transport_security_state.cc | 7 ++-----
net/url_request/report_sender.cc | 2 +-
services/network/network_context.cc | 6 +++---
services/network/public/cpp/features.gni | 2 +-
services/network/sct_auditing/sct_auditing_cache.cc | 5 +----
13 files changed, 24 insertions(+), 22 deletions(-)
chrome/browser/about_flags.cc | 5 +++++
chrome/browser/browser_features.cc | 2 +-
.../pki_metadata_component_installer.cc | 2 +-
chrome/browser/flag_descriptions.cc | 4 ++++
chrome/browser/flag_descriptions.h | 3 +++
chrome/browser/net/system_network_context_manager.cc | 4 ----
chrome/browser/ssl/sct_reporting_service.cc | 2 +-
chrome/common/chrome_features.cc | 2 +-
net/http/transport_security_state.cc | 9 ++++-----
net/url_request/report_sender.cc | 2 +-
services/network/network_context.cc | 10 +++++++---
services/network/public/cpp/features.gni | 2 +-
services/network/sct_auditing/sct_auditing_cache.cc | 5 +----
13 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
@ -160,6 +160,15 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_
// Check that there no invalid entries in the static HSTS bypass list.
for (auto& host : hsts_host_bypass_list) {
DCHECK(host.find('.') == std::string::npos);
@@ -451,6 +448,8 @@ TransportSecurityState::PKPStatus TransportSecurityState::CheckPublicKeyPins(
if (!HasPublicKeyPins(host_port_pair.host())) {
return PKPStatus::OK;
}
+ if (ct_emergency_disable_)
+ return PKPStatus::OK;
PKPStatus pin_validity = CheckPublicKeyPinsImpl(
host_port_pair, is_issued_by_known_root, public_key_hashes,
diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
--- a/net/url_request/report_sender.cc
+++ b/net/url_request/report_sender.cc
@ -193,8 +202,14 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
LazyCreateExpectCTReporter(result.url_request_context.get());
result.url_request_context->transport_security_state()->SetExpectCTReporter(
expect_ct_reporter_.get());
@@ -2444,7 +2444,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2442,9 +2442,13 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
result.url_request_context->transport_security_state()
->SetRequireCTDelegate(require_ct_delegate_.get());
}
+ else {
+ result.url_request_context->transport_security_state()
+ ->SetCTEmergencyDisabled(true);
+ }
#endif // BUILDFLAG(IS_CT_SUPPORTED)
- if (params_->enable_domain_reliability) {