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

focus on the self-signed certificate flow here

Browse source
This commit is contained in:
Brendan Forster 2017-04-27 15:06:23 +10:00
parent 5151107c28
commit a1599cf881
1 changed files with 10 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

55
atom/browser/ui/certificate_trust_win.cc
View file

@ -12,24 +12,6 @@
namespace certificate_trust { namespace certificate_trust {
BOOL AddCertificate(const HCERTSTORE certStore,
const PCCERT_CONTEXT certContext,
const scoped_refptr<net::X509Certificate>& cert) {
auto result = CertAddCertificateContextToStore(
certStore,
certContext,
CERT_STORE_ADD_REPLACE_EXISTING,
NULL);
if (result) {
// force Chromium to reload it's database for this certificate
auto cert_db = net::CertDatabase::GetInstance();
cert_db->NotifyObserversCertDBChanged(cert.get());
}
return result;
}
// Add the provided certificate to the Trusted Root Certificate Authorities // Add the provided certificate to the Trusted Root Certificate Authorities
// store for the current user. // store for the current user.
// //
@ -47,31 +29,19 @@ BOOL AddToTrustedRootStore(const PCCERT_CONTEXT certContext,
return false; return false;
} }
auto result = AddCertificate(rootCertStore, certContext, cert); auto result = CertAddCertificateContextToStore(
rootCertStore,
certContext,
CERT_STORE_ADD_REPLACE_EXISTING,
NULL);
CertCloseStore(rootCertStore, CERT_CLOSE_STORE_FORCE_FLAG); if (result) {
// force Chromium to reload it's database for this certificate
return result; auto cert_db = net::CertDatabase::GetInstance();
} cert_db->NotifyObserversCertDBChanged(cert.get());
// Add the provided certificate to the Personal
// certificate store for the current user.
BOOL AddToPersonalStore(const PCCERT_CONTEXT certContext,
const scoped_refptr<net::X509Certificate>& cert) {
auto userCertStore = CertOpenStore(
CERT_STORE_PROV_SYSTEM,
0,
NULL,
CERT_SYSTEM_STORE_CURRENT_USER,
L"My");
if (userCertStore == NULL) {
return false;
} }
auto result = AddCertificate(userCertStore, certContext, cert); CertCloseStore(rootCertStore, CERT_CLOSE_STORE_FORCE_FLAG);
CertCloseStore(userCertStore, CERT_CLOSE_STORE_FORCE_FLAG);
return result; return result;
} }
@ -111,11 +81,6 @@ void ShowCertificateTrust(atom::NativeWindow* parent_window,
NULL, NULL,
&chainContext)) { &chainContext)) {
switch (chainContext->TrustStatus.dwErrorStatus) { switch (chainContext->TrustStatus.dwErrorStatus) {
case CERT_TRUST_NO_ERROR:
AddToPersonalStore(pCertContext, cert);
break;
case CERT_TRUST_IS_UNTRUSTED_ROOT:
case CERT_TRUST_IS_SELF_SIGNED: case CERT_TRUST_IS_SELF_SIGNED:
AddToTrustedRootStore(pCertContext, cert); AddToTrustedRootStore(pCertContext, cert);
break; break;