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

Make new test use local resources only.

Browse source
This commit is contained in:
Josh Matthews 2016-03-09 12:33:33 -05:00
parent 16096f1a9c
commit d888ed368d
12 changed files with 121 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/net/chrome_loader.rs Normal file
View file

@ -0,0 +1,47 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use file_loader;
use mime_classifier::MIMEClassifier;
use net_traits::{LoadConsumer, LoadData, NetworkError};
use resource_thread::{CancellationListener, send_error};
use std::path::Path;
use std::sync::Arc;
use url::Url;
use util::resource_files::resources_dir_path;
pub fn resolve_chrome_url(url: &Url) -> Result<Url, ()> {
assert_eq!(url.scheme, "chrome");
// Skip the initial //
let non_relative_scheme_data = &url.non_relative_scheme_data().unwrap()[2..];
let relative_path = Path::new(non_relative_scheme_data);
// Don't allow chrome URLs access to files outside of the resources directory.
if non_relative_scheme_data.find("..").is_some() ||
relative_path.is_absolute() ||
relative_path.has_root() {
return Err(());
}
let mut path = resources_dir_path();
path.push(non_relative_scheme_data);
assert!(path.exists());
return Ok(Url::from_file_path(&*path).unwrap());
}
pub fn factory(mut load_data: LoadData,
start_chan: LoadConsumer,
classifier: Arc<MIMEClassifier>,
cancel_listener: CancellationListener) {
let file_url = match resolve_chrome_url(&load_data.url) {
Ok(url) => url,
Err(_) => {
send_error(load_data.url,
NetworkError::Internal("Invalid chrome URL.".to_owned()),
start_chan);
return;
}
};
load_data.url = file_url;
file_loader::factory(load_data, start_chan, classifier, cancel_listener)
}

1
components/net/lib.rs
View file

@ -39,6 +39,7 @@ extern crate webrender_traits;
extern crate websocket; extern crate websocket;
pub mod about_loader; pub mod about_loader;
pub mod chrome_loader;
pub mod cookie; pub mod cookie;
pub mod cookie_storage; pub mod cookie_storage;
pub mod data_loader; pub mod data_loader;

2
components/net/resource_thread.rs
View file

@ -5,6 +5,7 @@
//! A thread that takes a URL and streams back the binary data. //! A thread that takes a URL and streams back the binary data.
use about_loader; use about_loader;
use chrome_loader;
use cookie; use cookie;
use cookie_storage::CookieStorage; use cookie_storage::CookieStorage;
use data_loader; use data_loader;
@ -332,6 +333,7 @@ impl ResourceManager {
let cancel_listener = CancellationListener::new(cancel_resource); let cancel_listener = CancellationListener::new(cancel_resource);
let loader = match &*load_data.url.scheme { let loader = match &*load_data.url.scheme {
"chrome" => from_factory(chrome_loader::factory),
"file" => from_factory(file_loader::factory), "file" => from_factory(file_loader::factory),
"http" | "https" | "view-source" => { "http" | "https" | "view-source" => {
let http_state = HttpState { let http_state = HttpState {

2
resources/badcert.html
View file

@ -3,6 +3,6 @@
<title>Certificate error</title> <title>Certificate error</title>
</head> </head>
<body> <body>
<img src="badcert.jpg"> <img src="chrome://badcert.jpg">
</body> </body>
</html> </html>

46
tests/unit/net/chrome_loader.rs Normal file
View file

@ -0,0 +1,46 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use net::chrome_loader::resolve_chrome_url;
use url::Url;
#[test]
fn test_relative() {
let url = Url::parse("chrome://../something").unwrap();
assert!(resolve_chrome_url(&url).is_err());
}
#[test]
fn test_relative_2() {
let url = Url::parse("chrome://subdir/../something").unwrap();
assert!(resolve_chrome_url(&url).is_err());
}
#[test]
#[cfg(not(target_os = "windows"))]
fn test_absolute() {
let url = Url::parse("chrome:///etc/passwd").unwrap();
assert!(resolve_chrome_url(&url).is_err());
}
#[test]
#[cfg(target_os = "windows")]
fn test_absolute_2() {
let url = Url::parse("chrome://C:\\Windows").unwrap();
assert!(resolve_chrome_url(&url).is_err());
}
#[test]
#[cfg(target_os = "windows")]
fn test_absolute_3() {
let url = Url::parse("chrome://\\\\server/C$").unwrap();
assert!(resolve_chrome_url(&url).is_err());
}
#[test]
fn test_valid() {
let url = Url::parse("chrome://badcert.jpg").unwrap();
let resolved = resolve_chrome_url(&url).unwrap();
assert_eq!(resolved.scheme, "file");
}

2
tests/unit/net/http_loader.rs
View file

@ -23,7 +23,7 @@ use net::hsts::HstsEntry;
use net::http_loader::LoadErrorType; use net::http_loader::LoadErrorType;
use net::http_loader::{load, LoadError, HttpRequestFactory, HttpRequest, HttpResponse, UIProvider, HttpState}; use net::http_loader::{load, LoadError, HttpRequestFactory, HttpRequest, HttpResponse, UIProvider, HttpState};
use net::resource_thread::{AuthCacheEntry, CancellationListener}; use net::resource_thread::{AuthCacheEntry, CancellationListener};
use net_traits::{LoadData, CookieSource, LoadContext, NetworkError, IncludeSubdomains}; use net_traits::{LoadData, CookieSource, LoadContext, IncludeSubdomains};
use std::borrow::Cow; use std::borrow::Cow;
use std::io::{self, Write, Read, Cursor}; use std::io::{self, Write, Read, Cursor};
use std::sync::mpsc::Receiver; use std::sync::mpsc::Receiver;

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

@ -18,6 +18,7 @@ extern crate unicase;
extern crate url; extern crate url;
extern crate util; extern crate util;
#[cfg(test)] mod chrome_loader;
#[cfg(test)] mod cookie; #[cfg(test)] mod cookie;
#[cfg(test)] mod data_loader; #[cfg(test)] mod data_loader;
#[cfg(test)] mod file_loader; #[cfg(test)] mod file_loader;

18
tests/wpt/mozilla/tests/mozilla/bad_cert_detected.html
View file

@ -10,18 +10,14 @@ var t = async_test("Invalid SSL cert noticed");
t.step(function() { t.step(function() {
var target = location.href.replace(HTTP_ORIGIN, HTTPS_ORIGIN) var target = location.href.replace(HTTP_ORIGIN, HTTPS_ORIGIN)
.replace('bad_cert_detected.html', .replace('bad_cert_detected.html',
'resources/origin_helpers.js'); 'resources/worker_success.js');
// Servo currently lacks the ability to introspect any content that is blocked
// due to a cert error, so we use a roundabout method to infer that that's happened.
// When the worker has a cert failure, that translates into attempting to evaluate the
// contents of badcert.html as JS, which triggers an exception that currently does not
// propagate to the parent scope. If we _do_ get an error event in the parent scope,
// that means that the cert verification was treated no different than any other
// network error, since we dispatch an error event in that case.
var w = new Worker(target); var w = new Worker(target);
w.addEventListener('error', t.unreached_func("cert not detected as invalid"), false); // If the script executes successfully, it should send a message. That indicates that
// We infer that we detected an invalid cert if nothing happens for a few seconds. // there was no validation failure, which is bad.
setTimeout(function() { t.done() }, 3000); w.addEventListener('message', t.unreached_func("cert not detected as invalid"), true);
// When the worker has a cert failure, that translates into an early error that is reported
// to the Worker object.
w.addEventListener('error', t.step_func_done(), true);
}); });
</script> </script>
</body> </body>

2
tests/wpt/mozilla/tests/mozilla/resources/origin_helpers.js
View file

@ -1,5 +1,5 @@
var HTTP_PORT = '{{ports[http][0]}}'; var HTTP_PORT = '{{ports[http][0]}}';
var HTTPS_PORT = '{{ports[https][0]}}'; var HTTPS_PORT = '{{ports[https][0]}}';
var ORIGINAL_HOST = '\'{{host}}\''; var ORIGINAL_HOST = '{{host}}';
var HTTP_ORIGIN = 'http://' + ORIGINAL_HOST + ':' + HTTP_PORT; var HTTP_ORIGIN = 'http://' + ORIGINAL_HOST + ':' + HTTP_PORT;
var HTTPS_ORIGIN = 'https://' + ORIGINAL_HOST + ':' + HTTPS_PORT; var HTTPS_ORIGIN = 'https://' + ORIGINAL_HOST + ':' + HTTPS_PORT;

5
tests/wpt/mozilla/tests/mozilla/resources/ssl.https.html Normal file
View file

@ -0,0 +1,5 @@
<html>
<body>
this should be a secure connection
</body>
</html>

1
tests/wpt/mozilla/tests/mozilla/resources/worker_success.js Normal file
View file

@ -0,0 +1 @@
postMessage('load succeeded');

9
tests/wpt/mozilla/tests/mozilla/sslfail.html
View file

@ -3,8 +3,15 @@
<meta charset=utf-8> <meta charset=utf-8>
<title>SSL Failure</title> <title>SSL Failure</title>
<link rel=match href=sslfail-ref.html> <link rel=match href=sslfail-ref.html>
<script src="resources/origin_helpers.js?pipe=sub"></script>
</head> </head>
<body> <body>
<iframe src="https://somesite.org/blah"></iframe> <script>
var iframe = document.createElement('iframe');
document.body.appendChild(iframe);
iframe.src = location.href
.replace(HTTP_ORIGIN, HTTPS_ORIGIN)
.replace('sslfail.html', 'resources/ssl.https.html');
</script>
</body> </body>
</html> </html>