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

Merge pull request #10810 from qazbnm456/add_error_code_to_session_set_certificate_verify_proc

Browse source 
Add error code to session.setCertificateVerifyProc
This commit is contained in:
John Kleinschmidt 2017-10-18 09:33:37 -04:00 • committed by GitHub
commit 57537ea10e
5 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/api/atom_api_session.cc
View file

@ -212,6 +212,7 @@ struct Converter<atom::VerifyRequestParams> {
dict.Set("hostname", val.hostname); dict.Set("hostname", val.hostname);
dict.Set("certificate", val.certificate); dict.Set("certificate", val.certificate);
dict.Set("verificationResult", val.default_result); dict.Set("verificationResult", val.default_result);
dict.Set("errorCode", val.error_code);
return dict.GetHandle(); return dict.GetHandle();
} }
}; };

1
atom/browser/net/atom_cert_verifier.cc
View file

@ -92,6 +92,7 @@ class CertVerifierRequest : public AtomCertVerifier::Request {
std::unique_ptr<VerifyRequestParams> request(new VerifyRequestParams()); std::unique_ptr<VerifyRequestParams> request(new VerifyRequestParams());
request->hostname = params_.hostname(); request->hostname = params_.hostname();
request->default_result = net::ErrorToString(error); request->default_result = net::ErrorToString(error);
request->error_code = error;
request->certificate = params_.certificate(); request->certificate = params_.certificate();
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, BrowserThread::UI, FROM_HERE,

1
atom/browser/net/atom_cert_verifier.h
View file

@ -19,6 +19,7 @@ class CertVerifierRequest;
struct VerifyRequestParams { struct VerifyRequestParams {
std::string hostname; std::string hostname;
std::string default_result; std::string default_result;
int error_code;
scoped_refptr<net::X509Certificate> certificate; scoped_refptr<net::X509Certificate> certificate;
}; };

3
docs/api/session.md
View file

@ -253,7 +253,8 @@ the original network configuration.
* `request` Object * `request` Object
* `hostname` String * `hostname` String
* `certificate` [Certificate](structures/certificate.md) * `certificate` [Certificate](structures/certificate.md)
* `error` String - Verification result from chromium. * `verificationResult` String - Verification result from chromium.
* `errorCode` Integer - Error code.
* `callback` Function * `callback` Function
* `verificationResult` Integer - Value can be one of certificate error codes * `verificationResult` Integer - Value can be one of certificate error codes
from [here](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h). from [here](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).

3
spec/api-session-spec.js
View file

@ -572,8 +572,9 @@ describe('session module', function () {
}) })
it('accepts the request when the callback is called with 0', function (done) { it('accepts the request when the callback is called with 0', function (done) {
session.defaultSession.setCertificateVerifyProc(function ({hostname, certificate, verificationResult}, callback) { session.defaultSession.setCertificateVerifyProc(function ({hostname, certificate, verificationResult, errorCode}, callback) {
assert(['net::ERR_CERT_AUTHORITY_INVALID', 'net::ERR_CERT_COMMON_NAME_INVALID'].includes(verificationResult), verificationResult) assert(['net::ERR_CERT_AUTHORITY_INVALID', 'net::ERR_CERT_COMMON_NAME_INVALID'].includes(verificationResult), verificationResult)
assert([-202, -200].includes(errorCode), errorCode)
callback(0) callback(0)
}) })