Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2909 as far as WPT is concerned, not full data-url class integration

Browse source
This commit is contained in:
Patrick Shaughnessy 2019-11-26 09:49:30 -05:00
parent 799057f1e6
commit 7363db31db
4 changed files with 17 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -1021,6 +1021,15 @@ dependencies = [
"syn 1.0.3",
]
[[package]]
name = "data-url"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d33fe99ccedd6e84bc035f1931bb2e6be79739d6242bd895e7311c886c50dc9c"
dependencies = [
"matches",
]
[[package]]
name = "dbus"
version = "0.6.3"
@ -3460,6 +3469,7 @@ dependencies = [
"content-security-policy",
"cookie",
"crossbeam-channel",
"data-url",
"devtools_traits",
"embedder_traits",
"flate2",

1
components/net/Cargo.toml
View file

@ -20,6 +20,7 @@ bytes = "0.4"
content-security-policy = {version = "0.3.0", features = ["serde"]}
cookie_rs = {package = "cookie", version = "0.11"}
crossbeam-channel = "0.3"
data-url = "0.1.0"
devtools_traits = {path = "../devtools_traits"}
embedder_traits = { path = "../embedder_traits" }
flate2 = "1"

14
components/net/data_loader.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use base64;
use data_url::forgiving_base64;
use mime::Mime;
use percent_encoding::percent_decode;
use servo_url::ServoUrl;
@ -16,6 +16,10 @@ pub enum DecodeError {
pub type DecodeData = (Mime, Vec<u8>);
pub fn decode(url: &ServoUrl) -> Result<DecodeData, DecodeError> {
// data_url could do all of this work for us,
// except that it currently (Nov 2019) parses mime types into a
// different Mime class than other code expects
assert_eq!(url.scheme(), "data");
// Split out content type and data.
let parts: Vec<&str> = url[Position::BeforePath..Position::AfterQuery]
@ -44,13 +48,7 @@ pub fn decode(url: &ServoUrl) -> Result<DecodeData, DecodeError> {
let mut bytes = percent_decode(parts[1].as_bytes()).collect::<Vec<_>>();
if is_base64 {
// FIXME(#2909): It’s unclear what to do with non-alphabet characters,
// but Acid 3 apparently depends on spaces being ignored.
bytes = bytes
.into_iter()
.filter(|&b| b != b' ')
.collect::<Vec<u8>>();
match base64::decode_config(&bytes, base64::STANDARD.decode_allow_trailing_bits(true)) {
match forgiving_base64::decode_to_vec(&bytes) {
Err(..) => return Err(DecodeError::NonBase64DataUri),
Ok(data) => bytes = data,
}

33
tests/wpt/metadata/fetch/data-urls/base64.any.js.ini
View file

@ -1,33 +0,0 @@
[base64.any.worker.html]
[data: URL base64 handling: "ab="]
expected: FAIL
[data: URL base64 handling: "ab\\fcd"]
expected: FAIL
[data: URL base64 handling: "ab\\t\\n\\f\\r cd"]
expected: FAIL
[data: URL base64 handling: " \\t\\n\\f\\r ab\\t\\n\\f\\r cd\\t\\n\\f\\r "]
expected: FAIL
[data: URL base64 handling: "ab\\t\\n\\f\\r =\\t\\n\\f\\r =\\t\\n\\f\\r "]
expected: FAIL
[base64.any.html]
[data: URL base64 handling: "ab="]
expected: FAIL
[data: URL base64 handling: "ab\\fcd"]
expected: FAIL
[data: URL base64 handling: "ab\\t\\n\\f\\r cd"]
expected: FAIL
[data: URL base64 handling: " \\t\\n\\f\\r ab\\t\\n\\f\\r cd\\t\\n\\f\\r "]
expected: FAIL
[data: URL base64 handling: "ab\\t\\n\\f\\r =\\t\\n\\f\\r =\\t\\n\\f\\r "]
expected: FAIL