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

Create AtomCertVerifier on IO thread

Browse source
This commit is contained in:
Cheng Zhao 2016-07-13 12:05:57 +09:00
parent 12d646a48b
commit 24c60019b7
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -285,6 +285,14 @@ void SetProxyInIO(net::URLRequestContextGetter* getter,
RunCallbackInUI(callback); RunCallbackInUI(callback);
} }
void SetCertVerifyProcInIO(
const scoped_refptr<net::URLRequestContextGetter>& context_getter,
const AtomCertVerifier::VerifyProc& proc) {
auto request_context = context_getter->GetURLRequestContext();
static_cast<AtomCertVerifier*>(request_context->cert_verifier())->
SetVerifyProc(proc);
}
void ClearHostResolverCacheInIO( void ClearHostResolverCacheInIO(
const scoped_refptr<net::URLRequestContextGetter>& context_getter, const scoped_refptr<net::URLRequestContextGetter>& context_getter,
const base::Closure& callback) { const base::Closure& callback) {
@ -434,7 +442,10 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
return; return;
} }
browser_context_->cert_verifier()->SetVerifyProc(proc); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(&SetCertVerifyProcInIO,
make_scoped_refptr(browser_context_->GetRequestContext()),
proc));
} }
void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val, void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,

3
atom/browser/atom_browser_context.cc
View file

@ -66,7 +66,6 @@ std::string RemoveWhitespace(const std::string& str) {
AtomBrowserContext::AtomBrowserContext(const std::string& partition, AtomBrowserContext::AtomBrowserContext(const std::string& partition,
bool in_memory) bool in_memory)
: brightray::BrowserContext(partition, in_memory), : brightray::BrowserContext(partition, in_memory),
cert_verifier_(new AtomCertVerifier),
network_delegate_(new AtomNetworkDelegate) { network_delegate_(new AtomNetworkDelegate) {
// Construct user agent string. // Construct user agent string.
Browser* browser = Browser::Get(); Browser* browser = Browser::Get();
@ -174,7 +173,7 @@ content::PermissionManager* AtomBrowserContext::GetPermissionManager() {
} }
std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() { std::unique_ptr<net::CertVerifier> AtomBrowserContext::CreateCertVerifier() {
return make_scoped_ptr(cert_verifier_); return std::unique_ptr<net::CertVerifier>(new AtomCertVerifier);
} }
net::SSLConfigService* AtomBrowserContext::CreateSSLConfigService() { net::SSLConfigService* AtomBrowserContext::CreateSSLConfigService() {

3
atom/browser/atom_browser_context.h
View file

@ -12,7 +12,6 @@
namespace atom { namespace atom {
class AtomDownloadManagerDelegate; class AtomDownloadManagerDelegate;
class AtomCertVerifier;
class AtomNetworkDelegate; class AtomNetworkDelegate;
class AtomPermissionManager; class AtomPermissionManager;
class WebViewManager; class WebViewManager;
@ -42,7 +41,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
// brightray::BrowserContext: // brightray::BrowserContext:
void RegisterPrefs(PrefRegistrySimple* pref_registry) override; void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
AtomCertVerifier* cert_verifier() const { return cert_verifier_; }
AtomNetworkDelegate* network_delegate() const { return network_delegate_; } AtomNetworkDelegate* network_delegate() const { return network_delegate_; }
private: private:
@ -52,7 +50,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
std::string user_agent_; std::string user_agent_;
// Managed by brightray::BrowserContext. // Managed by brightray::BrowserContext.
AtomCertVerifier* cert_verifier_;
AtomNetworkDelegate* network_delegate_; AtomNetworkDelegate* network_delegate_;
DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext); DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);