bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-02 20:26:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1102 changes:

Browse Source 
- Add new CefSettings.ignore_certificate_errors option to ignore errors related to invalid SSL certificates (issue #).


git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1103 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-02-13 23:43:44 +00:00
parent 8645d49c48
commit 1c7e9a7218
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cef3/include/internal/cef_types.h
View File

@ -326,6 +326,15 @@ typedef struct _cef_settings_t {
// switch.
///
int context_safety_implementation;
///
// Set to true (1) to ignore errors related to invalid SSL certificates.
// Enabling this setting can lead to potential security vulnerabilities like
// "man in the middle" attacks. Applications that load content from the
// internet should not enable this setting. Also configurable using the
// "ignore-certificate-errors" command-line switch.
///
bool ignore_certificate_errors;
} cef_settings_t;
///

1
cef3/include/internal/cef_types_wrappers.h
View File

@ -321,6 +321,7 @@ struct CefSettingsTraits {
target->remote_debugging_port = src->remote_debugging_port;
target->uncaught_exception_stack_size = src->uncaught_exception_stack_size;
target->context_safety_implementation = src->context_safety_implementation;
target->ignore_certificate_errors = src->ignore_certificate_errors;
}
};

2
cef3/libcef/browser/browser_context.cc
View File

@ -176,8 +176,6 @@ CefBrowserContext::CefBrowserContext()
: use_osr_next_contents_view_(false) {
// Initialize the request context getter.
url_request_getter_ = new CefURLRequestContextGetter(
false,
GetPath(),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE));
}

10
cef3/libcef/browser/url_request_context_getter.cc
View File

@ -28,6 +28,7 @@
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/net/sqlite_persistent_cookie_store.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
#include "net/base/cert_verifier.h"
#include "net/base/default_server_bound_cert_store.h"
#include "net/base/host_resolver.h"
@ -53,13 +54,9 @@ using content::BrowserThread;
#endif
CefURLRequestContextGetter::CefURLRequestContextGetter(
bool ignore_certificate_errors,
const FilePath& base_path,
MessageLoop* io_loop,
MessageLoop* file_loop)
: ignore_certificate_errors_(ignore_certificate_errors),
base_path_(base_path),
io_loop_(io_loop),
: io_loop_(io_loop),
file_loop_(file_loop) {
// Must first be created on the UI thread.
CEF_REQUIRE_UIT();
@ -155,7 +152,8 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
network_session_params.http_server_properties =
url_request_context_->http_server_properties();
network_session_params.ignore_certificate_errors =
ignore_certificate_errors_;
(settings.ignore_certificate_errors ||
command_line.HasSwitch(switches::kIgnoreCertificateErrors));
net::HttpCache* main_cache = new net::HttpCache(network_session_params,
main_backend);

4
cef3/libcef/browser/url_request_context_getter.h
View File

@ -72,8 +72,6 @@ class URLSecurityManager;
class CefURLRequestContextGetter : public net::URLRequestContextGetter {
public:
CefURLRequestContextGetter(
bool ignore_certificate_errors,
const FilePath& base_path,
MessageLoop* io_loop,
MessageLoop* file_loop);
virtual ~CefURLRequestContextGetter();
@ -98,8 +96,6 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
private:
void CreateProxyConfigService();
bool ignore_certificate_errors_;
FilePath base_path_;
MessageLoop* io_loop_;
MessageLoop* file_loop_;