mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove client_certs from SSLCertRequestInfo.

Browse source 
https://codereview.chromium.org/2838243002
This commit is contained in:
Aleksei Kuzmin 2017-08-05 00:11:01 +03:00 • committed by Cheng Zhao
parent 364c330887
commit b77b67bfbe
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/api/atom_api_app.cc
View file

@ -702,6 +702,7 @@ void App::AllowCertificateError(
void App::SelectClientCertificate( void App::SelectClientCertificate(
content::WebContents* web_contents, content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info, net::SSLCertRequestInfo* cert_request_info,
net::CertificateList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) { std::unique_ptr<content::ClientCertificateDelegate> delegate) {
std::shared_ptr<content::ClientCertificateDelegate> std::shared_ptr<content::ClientCertificateDelegate>
shared_delegate(delegate.release()); shared_delegate(delegate.release());
@ -709,15 +710,14 @@ void App::SelectClientCertificate(
Emit("select-client-certificate", Emit("select-client-certificate",
WebContents::CreateFrom(isolate(), web_contents), WebContents::CreateFrom(isolate(), web_contents),
cert_request_info->host_and_port.ToString(), cert_request_info->host_and_port.ToString(),
cert_request_info->client_certs, std::move(client_certs),
base::Bind(&OnClientCertificateSelected, base::Bind(&OnClientCertificateSelected,
isolate(), isolate(),
shared_delegate)); shared_delegate));
// Default to first certificate from the platform store. // Default to first certificate from the platform store.
if (!prevent_default) if (!prevent_default)
shared_delegate->ContinueWithCertificate( shared_delegate->ContinueWithCertificate(client_certs[0].get());
cert_request_info->client_certs[0].get());
} }
void App::OnGpuProcessCrashed(base::TerminationStatus status) { void App::OnGpuProcessCrashed(base::TerminationStatus status) {

1
atom/browser/api/atom_api_app.h
View file

@ -150,6 +150,7 @@ class App : public AtomBrowserClient::Delegate,
void SelectClientCertificate( void SelectClientCertificate(
content::WebContents* web_contents, content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info, net::SSLCertRequestInfo* cert_request_info,
net::CertificateList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) override; std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
// content::GpuDataManagerObserver: // content::GpuDataManagerObserver:

8
atom/browser/atom_browser_client.cc
View file

@ -316,10 +316,12 @@ void AtomBrowserClient::AllowCertificateError(
void AtomBrowserClient::SelectClientCertificate( void AtomBrowserClient::SelectClientCertificate(
content::WebContents* web_contents, content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info, net::SSLCertRequestInfo* cert_request_info,
net::CertificateList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) { std::unique_ptr<content::ClientCertificateDelegate> delegate) {
if (!cert_request_info->client_certs.empty() && delegate_) { if (!client_certs.empty() && delegate_) {
delegate_->SelectClientCertificate( delegate_->SelectClientCertificate(web_contents, cert_request_info,
web_contents, cert_request_info, std::move(delegate)); std::move(client_certs),
std::move(delegate));
} }
} }

1
atom/browser/atom_browser_client.h
View file

@ -77,6 +77,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
void SelectClientCertificate( void SelectClientCertificate(
content::WebContents* web_contents, content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info, net::SSLCertRequestInfo* cert_request_info,
net::CertificateList client_certs,
std::unique_ptr<content::ClientCertificateDelegate> delegate) override; std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
void ResourceDispatcherHostCreated() override; void ResourceDispatcherHostCreated() override;
bool CanCreateWindow( bool CanCreateWindow(