Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-16 10:55:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add command-line argument to use a custom SSL certificate database.

Browse source
This commit is contained in:
Josh Matthews 2017-04-05 16:34:16 -04:00
parent d7fb2cc27f
commit dc99104f55
7 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/unit/net/fetch.rs
View file

@ -530,7 +530,8 @@ fn test_fetch_with_hsts() {
//takes an address and something that implements hyper::net::Ssl
let mut server = Server::https("0.0.0.0:0", ssl).unwrap().handle_threads(handler, 1).unwrap();
let ssl_client = create_ssl_client("self_signed_certificate_for_testing.crt");
let ca_file = resources_dir_path().unwrap().join("self_signed_certificate_for_testing.crt");
let ssl_client = create_ssl_client(&ca_file);
let connector = create_http_connector(ssl_client);
let context = FetchContext {

4
tests/unit/net/lib.rs
View file

@ -42,6 +42,7 @@ use net::test::HttpState;
use net_traits::FetchTaskTarget;
use net_traits::request::Request;
use net_traits::response::Response;
use servo_config::resource_files::resources_dir_path;
use servo_url::ServoUrl;
use std::sync::Arc;
use std::sync::mpsc::{Sender, channel};
@ -53,7 +54,8 @@ struct FetchResponseCollector {
}
fn new_fetch_context(dc: Option<Sender<DevtoolsControlMsg>>) -> FetchContext {
let ssl_client = create_ssl_client("certs");
let ca_file = resources_dir_path().unwrap().join("certs");
let ssl_client = create_ssl_client(&ca_file);
let connector = create_http_connector(ssl_client);
FetchContext {
state: Arc::new(HttpState::new()),

9
tests/wpt/harness/wptrunner/browsers/servo.py
View file

@ -32,7 +32,8 @@ def browser_kwargs(**kwargs):
"debug_info": kwargs["debug_info"],
"binary_args": kwargs["binary_args"],
"user_stylesheets": kwargs.get("user_stylesheets"),
"render_backend": kwargs.get("servo_backend")}
"render_backend": kwargs.get("servo_backend"),
"ca_certificate_path": kwargs["ssl_env"].ca_cert_path()}
def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
@ -65,17 +66,19 @@ def render_arg(render_backend):
class ServoBrowser(NullBrowser):
def __init__(self, logger, binary, debug_info=None, binary_args=None,
user_stylesheets=None, render_backend="webrender"):
user_stylesheets=None, render_backend="webrender", ca_certificate_path=None):
NullBrowser.__init__(self, logger)
self.binary = binary
self.debug_info = debug_info
self.binary_args = binary_args or []
self.user_stylesheets = user_stylesheets or []
self.render_backend = render_backend
self.ca_certificate_path = ca_certificate_path
def executor_browser(self):
return ExecutorBrowser, {"binary": self.binary,
"debug_info": self.debug_info,
"binary_args": self.binary_args,
"user_stylesheets": self.user_stylesheets,
"render_backend": self.render_backend}
"render_backend": self.render_backend,
"ca_certificate_path": self.ca_certificate_path}

5
tests/wpt/harness/wptrunner/executors/executorservo.py
View file

@ -86,6 +86,8 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
args += ["--user-stylesheet", stylesheet]
for pref, value in test.environment.get('prefs', {}).iteritems():
args += ["--pref", "%s=%s" % (pref, value)]
if self.browser.ca_certificate_path:
args += ["--certificate-path", self.browser.ca_certificate_path]
args += self.browser.binary_args
debug_args, command = browser_command(self.binary, args, self.debug_info)
@ -226,6 +228,9 @@ class ServoRefTestExecutor(ProcessTestExecutor):
command += ["--resolution", viewport_size or "800x600"]
if self.browser.ca_certificate_path:
command += ["--certificate-path", self.browser.ca_certificate_path]
if dpi:
command += ["--device-pixel-ratio", dpi]