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

Create a new CertVerifierRequest for each request

Browse source 
It greatly simplifies the code.
This commit is contained in:
Cheng Zhao 2015-11-17 19:44:55 +08:00
parent ea1e4160ea
commit e3517b701e
3 changed files with 48 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,89 +5,64 @@
#ifndef ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
#define ATOM_BROWSER_NET_ATOM_CERT_VERIFIER_H_
#include <set>
#include <string>
#include <vector>
#include "base/memory/ref_counted.h"
#include "net/base/hash_value.h"
#include "net/cert/cert_verifier.h"
#include "net/cert/crl_set.h"
#include "net/cert/x509_certificate.h"
#include "net/log/net_log.h"
namespace atom {
class AtomCertVerifier : public net::CertVerifier {
public:
struct RequestParams {
RequestParams(
const net::SHA1HashValue cert_fingerprint,
const net::SHA1HashValue ca_fingerprint,
const std::string& hostname_arg,
const std::string& ocsp_response,
int flags);
~RequestParams() {}
bool operator<(const RequestParams& other) const;
std::string hostname;
std::string ocsp_response;
int flags;
std::vector<net::SHA1HashValue> hash_values;
};
class CertVerifyRequest
: public base::RefCountedThreadSafe<CertVerifyRequest> {
public:
CertVerifyRequest(
AtomCertVerifier* cert_verifier,
const RequestParams& key,
scoped_refptr<net::X509Certificate> cert,
scoped_refptr<net::CRLSet> crl_set,
net::CertVerifyResult* verify_result,
scoped_ptr<Request>* out_req,
const net::BoundNetLog& net_log)
CertVerifyRequest(AtomCertVerifier* cert_verifier,
net::X509Certificate* cert,
const std::string& hostname,
const std::string& ocsp_response,
int flags,
net::CRLSet* crl_set,
net::CertVerifyResult* verify_result,
const net::CompletionCallback& callback,
scoped_ptr<Request>* out_req,
const net::BoundNetLog& net_log)
: cert_verifier_(cert_verifier),
key_(key),
certificate_(cert),
cert_(cert),
hostname_(hostname),
ocsp_response_(ocsp_response),
flags_(flags),
crl_set_(crl_set),
verify_result_(verify_result),
callback_(callback),
out_req_(out_req),
net_log_(net_log),
handled_(false) {
}
void RunResult(int result);
void DelegateToDefaultVerifier();
void ContinueWithResult(int result);
void AddCompletionCallback(net::CompletionCallback callback) {
callbacks_.push_back(callback);
}
const RequestParams key() const { return key_; }
std::string hostname() const { return key_.hostname; }
scoped_refptr<net::X509Certificate> certificate() const {
return certificate_;
}
const std::string& hostname() const { return hostname_; }
net::X509Certificate* cert() const { return cert_.get(); }
private:
friend class base::RefCountedThreadSafe<CertVerifyRequest>;
~CertVerifyRequest() {}
AtomCertVerifier* cert_verifier_;
const RequestParams key_;
void DelegateToDefaultVerifier();
scoped_refptr<net::X509Certificate> certificate_;
AtomCertVerifier* cert_verifier_;
scoped_refptr<net::X509Certificate> cert_;
std::string hostname_;
std::string ocsp_response_;
int flags_;
scoped_refptr<net::CRLSet> crl_set_;
net::CertVerifyResult* verify_result_;
net::CompletionCallback callback_;
scoped_ptr<Request>* out_req_;
const net::BoundNetLog net_log_;
const net::BoundNetLog& net_log_;
std::vector<net::CompletionCallback> callbacks_;
bool handled_;
DISALLOW_COPY_AND_ASSIGN(CertVerifyRequest);
@ -95,7 +70,6 @@ class AtomCertVerifier : public net::CertVerifier {
class Delegate {
public:
Delegate() {}
virtual ~Delegate() {}
// Called on UI thread.
@ -123,35 +97,10 @@ class AtomCertVerifier : public net::CertVerifier {
const net::BoundNetLog& net_log) override;
bool SupportsOCSPStapling() override;
net::CertVerifier* default_cert_verifier() const {
return default_cert_verifier_.get();
}
private:
CertVerifyRequest* FindRequest(const RequestParams& key);
void RemoveRequest(CertVerifyRequest* request);
struct CertVerifyRequestToRequestParamsComparator {
bool operator()(const scoped_refptr<CertVerifyRequest> request,
const RequestParams& key) const {
return request->key() < key;
}
};
struct CertVerifyRequestComparator {
bool operator()(const scoped_refptr<CertVerifyRequest> req1,
const scoped_refptr<CertVerifyRequest> req2) const {
return req1->key() < req2->key();
}
};
using ActiveRequestSet =
std::set<scoped_refptr<CertVerifyRequest>,
CertVerifyRequestComparator>;
ActiveRequestSet requests_;
friend class CertVerifyRequest;
Delegate* delegate_;
scoped_ptr<net::CertVerifier> default_cert_verifier_;
DISALLOW_COPY_AND_ASSIGN(AtomCertVerifier);