mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
Plumb Verify2QwacBinding and hook it up in QwacWebContentsObserver
https://chromium-review.googlesource.com/c/chromium/src/+/6624719
This commit is contained in:
@@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
|
||||
|
||||
} // namespace net
|
||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||
index 9dbef97d2f3119871b91edfd9ce53760d512ff8d..0e004ab1d8ef3248f843f3ee04a58fe25fd9a0eb 100644
|
||||
index 26d5ee5a67ff35f66a9f598891a444aaa9e21eaf..170a552945b6bb10dcd626779074ec85751009e1 100644
|
||||
--- a/services/network/network_context.cc
|
||||
+++ b/services/network/network_context.cc
|
||||
@@ -1858,6 +1858,13 @@ void NetworkContext::SetNetworkConditions(
|
||||
@@ -1870,6 +1870,13 @@ void NetworkContext::SetNetworkConditions(
|
||||
std::move(network_conditions));
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
|
||||
session.setCertificateVerifyCallback.
|
||||
|
||||
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
||||
index 3481539cd28559e85f624d5e7ee3d31983a23a1a..9dbef97d2f3119871b91edfd9ce53760d512ff8d 100644
|
||||
index 3481539cd28559e85f624d5e7ee3d31983a23a1a..26d5ee5a67ff35f66a9f598891a444aaa9e21eaf 100644
|
||||
--- a/services/network/network_context.cc
|
||||
+++ b/services/network/network_context.cc
|
||||
@@ -164,6 +164,11 @@
|
||||
@@ -22,7 +22,7 @@ index 3481539cd28559e85f624d5e7ee3d31983a23a1a..9dbef97d2f3119871b91edfd9ce53760
|
||||
#if BUILDFLAG(IS_CT_SUPPORTED)
|
||||
// gn check does not account for BUILDFLAG(). So, for iOS builds, it will
|
||||
// complain about a missing dependency on the target exposing this header. Add a
|
||||
@@ -618,6 +623,99 @@ void RecordHSTSPreconnectUpgradeReason(HSTSRedirectUpgradeReason reason) {
|
||||
@@ -618,6 +623,111 @@ void RecordHSTSPreconnectUpgradeReason(HSTSRedirectUpgradeReason reason) {
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -80,6 +80,18 @@ index 3481539cd28559e85f624d5e7ee3d31983a23a1a..9dbef97d2f3119871b91edfd9ce53760
|
||||
+ return upstream_->Verify(params, verify_result, std::move(callback2), out_req, net_log);
|
||||
+ }
|
||||
+
|
||||
+ void Verify2QwacBinding(
|
||||
+ const std::string& binding,
|
||||
+ const std::string& hostname,
|
||||
+ const scoped_refptr<net::X509Certificate>& tls_cert,
|
||||
+ base::OnceCallback<void(const scoped_refptr<net::X509Certificate>&)> callback,
|
||||
+ const net::NetLogWithSource& net_log) override {
|
||||
+ // 2-QWAC binding verification isn't cached. This isn't performance
|
||||
+ // critical and if we wanted to cache, it would make more sense to do at
|
||||
+ // the 2-QWAC link header processing layer.
|
||||
+ upstream_->Verify2QwacBinding(binding, hostname, tls_cert,
|
||||
+ std::move(callback), net_log);
|
||||
+ }
|
||||
+
|
||||
+ void SetConfig(const Config& config) override {
|
||||
+ upstream_->SetConfig(config);
|
||||
@@ -122,7 +134,7 @@ index 3481539cd28559e85f624d5e7ee3d31983a23a1a..9dbef97d2f3119871b91edfd9ce53760
|
||||
constexpr uint32_t NetworkContext::kMaxOutstandingRequestsPerProcess;
|
||||
|
||||
NetworkContext::NetworkContextHttpAuthPreferences::
|
||||
@@ -1021,6 +1119,13 @@ void NetworkContext::SetClient(
|
||||
@@ -1021,6 +1131,13 @@ void NetworkContext::SetClient(
|
||||
client_.Bind(std::move(client));
|
||||
}
|
||||
|
||||
@@ -136,7 +148,7 @@ index 3481539cd28559e85f624d5e7ee3d31983a23a1a..9dbef97d2f3119871b91edfd9ce53760
|
||||
void NetworkContext::CreateURLLoaderFactory(
|
||||
mojo::PendingReceiver<mojom::URLLoaderFactory> receiver,
|
||||
mojom::URLLoaderFactoryParamsPtr params) {
|
||||
@@ -2655,6 +2760,10 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
@@ -2655,6 +2772,10 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
|
||||
cert_verifier = std::make_unique<net::CachingCertVerifier>(
|
||||
std::make_unique<net::CoalescingCertVerifier>(
|
||||
std::move(cert_verifier)));
|
||||
|
||||
Reference in New Issue
Block a user