Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #5212 : Manishearth/servo/ssl-off, r=larsbergstrom

Browse source 
SSL is broken-ish (eg tw.yahoo.com, html.spec.whatwg.org don't work since we don't verify SAN properly), this flag can let devs bypass the protection for testing purposes.
This commit is contained in:
bors-servo 2015-03-14 08:39:48 -06:00
commit 389338c28f
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/http_loader.rs
View file

@ -23,6 +23,7 @@ use std::sync::mpsc::{Sender, channel};
use std::thunk::Invoke; use std::thunk::Invoke;
use util::task::spawn_named; use util::task::spawn_named;
use util::resource_files::resources_dir_path; use util::resource_files::resources_dir_path;
use util::opts;
use url::{Url, UrlParser}; use url::{Url, UrlParser};
use std::borrow::ToOwned; use std::borrow::ToOwned;
@ -89,7 +90,12 @@ fn load(mut load_data: LoadData, start_chan: Sender<TargetedLoadResponse>, cooki
function: \"SSL3_GET_SERVER_CERTIFICATE\", \ function: \"SSL3_GET_SERVER_CERTIFICATE\", \
reason: \"certificate verify failed\" }]"; reason: \"certificate verify failed\" }]";
let mut connector = HttpConnector(Some(box verifier as Box<FnMut(&mut SslContext)>)); let mut connector = if opts::get().nossl {
HttpConnector(None)
} else {
HttpConnector(Some(box verifier as Box<FnMut(&mut SslContext)>))
};
let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) { let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) {
Ok(req) => req, Ok(req) => req,
Err(HttpError::HttpIoError(IoError {kind: IoErrorKind::OtherIoError, Err(HttpError::HttpIoError(IoError {kind: IoErrorKind::OtherIoError,

6
components/util/opts.rs
View file

@ -58,6 +58,8 @@ pub struct Opts {
pub nonincremental_layout: bool, pub nonincremental_layout: bool,
pub nossl: bool,
pub output_file: Option<String>, pub output_file: Option<String>,
pub headless: bool, pub headless: bool,
pub hard_fail: bool, pub hard_fail: bool,
@ -177,6 +179,7 @@ pub fn default_opts() -> Opts {
enable_experimental: false, enable_experimental: false,
layout_threads: 1, layout_threads: 1,
nonincremental_layout: false, nonincremental_layout: false,
nossl: false,
output_file: None, output_file: None,
headless: true, headless: true,
hard_fail: true, hard_fail: true,
@ -216,6 +219,7 @@ pub fn from_cmdline_args(args: &[String]) -> bool {
getopts::optflag("x", "exit", "Exit after load flag"), getopts::optflag("x", "exit", "Exit after load flag"),
getopts::optopt("y", "layout-threads", "Number of threads to use for layout", "1"), getopts::optopt("y", "layout-threads", "Number of threads to use for layout", "1"),
getopts::optflag("i", "nonincremental-layout", "Enable to turn off incremental layout."), getopts::optflag("i", "nonincremental-layout", "Enable to turn off incremental layout."),
getopts::optflag("", "no-ssl", "Disables ssl certificate verification."),
getopts::optflag("z", "headless", "Headless mode"), getopts::optflag("z", "headless", "Headless mode"),
getopts::optflag("f", "hard-fail", "Exit on task failure instead of displaying about:failure"), getopts::optflag("f", "hard-fail", "Exit on task failure instead of displaying about:failure"),
getopts::optflagopt("", "devtools", "Start remote devtools server on port", "6000"), getopts::optflagopt("", "devtools", "Start remote devtools server on port", "6000"),
@ -291,6 +295,7 @@ pub fn from_cmdline_args(args: &[String]) -> bool {
}; };
let nonincremental_layout = opt_match.opt_present("i"); let nonincremental_layout = opt_match.opt_present("i");
let nossl = opt_match.opt_present("no-ssl");
let mut bubble_inline_sizes_separately = debug_options.contains(&"bubble-widths"); let mut bubble_inline_sizes_separately = debug_options.contains(&"bubble-widths");
let trace_layout = debug_options.contains(&"trace-layout"); let trace_layout = debug_options.contains(&"trace-layout");
@ -325,6 +330,7 @@ pub fn from_cmdline_args(args: &[String]) -> bool {
enable_experimental: opt_match.opt_present("e"), enable_experimental: opt_match.opt_present("e"),
layout_threads: layout_threads, layout_threads: layout_threads,
nonincremental_layout: nonincremental_layout, nonincremental_layout: nonincremental_layout,
nossl: nossl,
output_file: opt_match.opt_str("o"), output_file: opt_match.opt_str("o"),
headless: opt_match.opt_present("z"), headless: opt_match.opt_present("z"),
hard_fail: opt_match.opt_present("f"), hard_fail: opt_match.opt_present("f"),