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

Added time input sanitization:

Browse source 
- Implemented is_valid_time_string for DOMString.
- Use is_valid_time_string for sanitize_value with time input.
- Improved input type change test
This commit is contained in:
Simon Wörner 2017-11-26 15:13:02 +01:00 • committed by Simon Wörner
parent ac6e04ebfb
commit a999239f28
8 changed files with 228 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

71
components/script/dom/bindings/str.rs
View file

@ -208,6 +208,77 @@ impl DOMString {
self.0.truncate(last_non_whitespace);
let _ = self.0.splice(0..first_non_whitespace, "");
}
/// Validates this `DOMString` is a time string according to
/// <https://html.spec.whatwg.org/multipage/#valid-time-string>.
pub fn is_valid_time_string(&self) -> bool {
enum State {
HourHigh,
HourLow09,
HourLow03,
MinuteColon,
MinuteHigh,
MinuteLow,
SecondColon,
SecondHigh,
SecondLow,
MilliStop,
MilliHigh,
MilliMiddle,
MilliLow,
Done,
Error,
}
let next_state = |valid: bool, next: State| -> State { if valid { next } else { State::Error } };
let state = self.chars().fold(State::HourHigh, |state, c| {
match state {
// Step 1 "HH"
State::HourHigh => {
match c {
'0' | '1' => State::HourLow09,
'2' => State::HourLow03,
_ => State::Error,
}
},
State::HourLow09 => next_state(c.is_digit(10), State::MinuteColon),
State::HourLow03 => next_state(c.is_digit(4), State::MinuteColon),
// Step 2 ":"
State::MinuteColon => next_state(c == ':', State::MinuteHigh),
// Step 3 "mm"
State::MinuteHigh => next_state(c.is_digit(6), State::MinuteLow),
State::MinuteLow => next_state(c.is_digit(10), State::SecondColon),
// Step 4.1 ":"
State::SecondColon => next_state(c == ':', State::SecondHigh),
// Step 4.2 "ss"
State::SecondHigh => next_state(c.is_digit(6), State::SecondLow),
State::SecondLow => next_state(c.is_digit(10), State::MilliStop),
// Step 4.3.1 "."
State::MilliStop => next_state(c == '.', State::MilliHigh),
// Step 4.3.2 "SSS"
State::MilliHigh => next_state(c.is_digit(6), State::MilliMiddle),
State::MilliMiddle => next_state(c.is_digit(10), State::MilliLow),
State::MilliLow => next_state(c.is_digit(10), State::Done),
_ => State::Error,
}
});
match state {
State::Done |
// Step 4 (optional)
State::SecondColon |
// Step 4.3 (optional)
State::MilliStop |
// Step 4.3.2 (only 1 digit required)
State::MilliMiddle | State::MilliLow => true,
_ => false
}
}
}
impl Borrow<str> for DOMString {

7
components/script/dom/htmlinputelement.rs
View file

@ -895,6 +895,13 @@ impl HTMLInputElement {
textinput.set_content("#000000".into());
}
}
atom!("time") => {
let mut textinput = self.textinput.borrow_mut();
if ! textinput.single_line_content().is_valid_time_string() {
*textinput.single_line_content_mut() = "".into();
}
}
// TODO: Implement more value sanitization algorithms for different types of inputs
_ => ()
}

2
tests/wpt/metadata/MANIFEST.json
View file

@ -543020,7 +543020,7 @@
"testharness"
],
"html/semantics/forms/the-input-element/type-change-state.html": [
"95e8bfd7d2f14068b0d3e41e3f017da3647bc382",
"d731573ee091b7e658ea0b1ded46a764e8165f6c",
"testharness"
],
"html/semantics/forms/the-input-element/url.html": [

23
tests/wpt/metadata/html/semantics/forms/the-input-element/time-2.html.ini
View file

@ -1,23 +0,0 @@
[time-2.html]
type: testharness
[Invalid value: fraction should have one, two or three ASCII digits. Value should be empty]
expected: FAIL
[Invalid value: hour should have two ASCII digits. Value should be empty]
expected: FAIL
[Invalid value: minutes should have two ASCII digits. Value should be empty]
expected: FAIL
[Invalid value: seconds should have two ASCII digits. Value should be empty]
expected: FAIL
[Invalid value: hour > 23. Value should be empty]
expected: FAIL
[Invalid value: minute > 59. Value should be empty]
expected: FAIL
[Invalid value: second > 59. Value should be empty]
expected: FAIL

3
tests/wpt/metadata/html/semantics/forms/the-input-element/time.html.ini
View file

@ -69,9 +69,6 @@
[ empty value of stepUp]
expected: FAIL
[set value on not time format value]
expected: FAIL
[stepUp on step value with fractional seconds]
expected: FAIL

222
tests/wpt/metadata/html/semantics/forms/the-input-element/type-change-state.html.ini
View file

@ -15,9 +15,6 @@
[change state from hidden to week]
expected: FAIL
[change state from hidden to time]
expected: FAIL
[change state from hidden to number]
expected: FAIL
@ -39,9 +36,6 @@
[change state from text to week]
expected: FAIL
[change state from text to time]
expected: FAIL
[change state from text to number]
expected: FAIL
@ -63,9 +57,6 @@
[change state from search to week]
expected: FAIL
[change state from search to time]
expected: FAIL
[change state from search to number]
expected: FAIL
@ -87,9 +78,6 @@
[change state from tel to week]
expected: FAIL
[change state from tel to time]
expected: FAIL
[change state from tel to number]
expected: FAIL
@ -120,9 +108,6 @@
[change state from url to week]
expected: FAIL
[change state from url to time]
expected: FAIL
[change state from url to number]
expected: FAIL
@ -162,9 +147,6 @@
[change state from email to week]
expected: FAIL
[change state from email to time]
expected: FAIL
[change state from email to number]
expected: FAIL
@ -186,9 +168,6 @@
[change state from password to week]
expected: FAIL
[change state from password to time]
expected: FAIL
[change state from password to number]
expected: FAIL
@ -222,9 +201,6 @@
[change state from datetime to week]
expected: FAIL
[change state from datetime to time]
expected: FAIL
[change state from datetime to number]
expected: FAIL
@ -264,9 +240,6 @@
[change state from date to week]
expected: FAIL
[change state from date to time]
expected: FAIL
[change state from date to number]
expected: FAIL
@ -306,9 +279,6 @@
[change state from month to week]
expected: FAIL
[change state from month to time]
expected: FAIL
[change state from month to number]
expected: FAIL
@ -348,57 +318,12 @@
[change state from week to month]
expected: FAIL
[change state from week to time]
expected: FAIL
[change state from week to number]
expected: FAIL
[change state from week to range]
expected: FAIL
[change state from time to hidden]
expected: FAIL
[change state from time to checkbox]
expected: FAIL
[change state from time to radio]
expected: FAIL
[change state from time to submit]
expected: FAIL
[change state from time to image]
expected: FAIL
[change state from time to reset]
expected: FAIL
[change state from time to button]
expected: FAIL
[change state from time to email]
expected: FAIL
[change state from time to datetime]
expected: FAIL
[change state from time to date]
expected: FAIL
[change state from time to month]
expected: FAIL
[change state from time to week]
expected: FAIL
[change state from time to number]
expected: FAIL
[change state from time to range]
expected: FAIL
[change state from number to hidden]
expected: FAIL
@ -435,9 +360,6 @@
[change state from number to week]
expected: FAIL
[change state from number to time]
expected: FAIL
[change state from number to range]
expected: FAIL
@ -477,9 +399,6 @@
[change state from range to week]
expected: FAIL
[change state from range to time]
expected: FAIL
[change state from range to number]
expected: FAIL
@ -498,9 +417,6 @@
[change state from checkbox to week]
expected: FAIL
[change state from checkbox to time]
expected: FAIL
[change state from checkbox to number]
expected: FAIL
@ -522,9 +438,6 @@
[change state from radio to week]
expected: FAIL
[change state from radio to time]
expected: FAIL
[change state from radio to number]
expected: FAIL
@ -546,9 +459,6 @@
[change state from submit to week]
expected: FAIL
[change state from submit to time]
expected: FAIL
[change state from submit to number]
expected: FAIL
@ -570,9 +480,6 @@
[change state from image to week]
expected: FAIL
[change state from image to time]
expected: FAIL
[change state from image to number]
expected: FAIL
@ -594,9 +501,6 @@
[change state from reset to week]
expected: FAIL
[change state from reset to time]
expected: FAIL
[change state from reset to number]
expected: FAIL
@ -618,9 +522,6 @@
[change state from button to week]
expected: FAIL
[change state from button to time]
expected: FAIL
[change state from button to number]
expected: FAIL
@ -681,9 +582,6 @@
[change state from datetime-local to week]
expected: FAIL
[change state from datetime-local to time]
expected: FAIL
[change state from datetime-local to number]
expected: FAIL
@ -699,9 +597,6 @@
[change state from week to datetime-local]
expected: FAIL
[change state from time to datetime-local]
expected: FAIL
[change state from number to datetime-local]
expected: FAIL
@ -726,3 +621,120 @@
[change state from button to datetime-local]
expected: FAIL
[change state from datetime-local to text]
expected: FAIL
[change state from datetime-local to search]
expected: FAIL
[change state from datetime-local to tel]
expected: FAIL
[change state from datetime-local to url]
expected: FAIL
[change state from datetime-local to password]
expected: FAIL
[change state from date to text]
expected: FAIL
[change state from date to search]
expected: FAIL
[change state from date to tel]
expected: FAIL
[change state from date to url]
expected: FAIL
[change state from date to password]
expected: FAIL
[change state from month to text]
expected: FAIL
[change state from month to search]
expected: FAIL
[change state from month to tel]
expected: FAIL
[change state from month to url]
expected: FAIL
[change state from month to password]
expected: FAIL
[change state from week to text]
expected: FAIL
[change state from week to search]
expected: FAIL
[change state from week to tel]
expected: FAIL
[change state from week to url]
expected: FAIL
[change state from week to password]
expected: FAIL
[change state from number to text]
expected: FAIL
[change state from number to search]
expected: FAIL
[change state from number to tel]
expected: FAIL
[change state from number to url]
expected: FAIL
[change state from number to password]
expected: FAIL
[change state from color to datetime-local]
expected: FAIL
[change state from color to date]
expected: FAIL
[change state from color to month]
expected: FAIL
[change state from color to week]
expected: FAIL
[change state from color to number]
expected: FAIL
[change state from color to range]
expected: FAIL
[change state from time to range]
expected: FAIL
[change state from range to text]
expected: FAIL
[change state from range to search]
expected: FAIL
[change state from range to tel]
expected: FAIL
[change state from range to url]
expected: FAIL
[change state from range to password]
expected: FAIL

6
tests/wpt/metadata/html/semantics/forms/the-input-element/valueMode.html.ini
View file

@ -24,12 +24,6 @@
[value IDL attribute of input type week with value attribute]
expected: FAIL
[value IDL attribute of input type time without value attribute]
expected: FAIL
[value IDL attribute of input type time with value attribute]
expected: FAIL
[value IDL attribute of input type number without value attribute]
expected: FAIL

51
tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/type-change-state.html
View file

@ -15,16 +15,16 @@
{ type: "url", sanitizedValue: "foobar" },
{ type: "email", sanitizedValue: "foobar" },
{ type: "password", sanitizedValue: " foobar " },
{ type: "datetime-local", sanitizedValue: "" },
{ type: "date", sanitizedValue: "" },
{ type: "month", sanitizedValue: "" },
{ type: "week", sanitizedValue: "" },
{ type: "time", sanitizedValue: "" },
{ type: "number", sanitizedValue: "" },
{ type: "range", sanitizedValue: "50" },
{ type: "color", sanitizedValue: "#000000" },
{ type: "checkbox" },
{ type: "radio" },
{ type: "datetime-local", sanitizedValue: "", overridesSanitization: true },
{ type: "date", sanitizedValue: "", overridesSanitization: true },
{ type: "month", sanitizedValue: "", overridesSanitization: true },
{ type: "week", sanitizedValue: "", overridesSanitization: true },
{ type: "time", sanitizedValue: "", overridesSanitization: true },
{ type: "number", sanitizedValue: "", overridesSanitization: true },
{ type: "range", sanitizedValue: "50", overridesSanitization: true },
{ type: "color", sanitizedValue: "#000000", overridesSanitization: true },
{ type: "checkbox", defaultValue: "on" },
{ type: "radio", defaultValue: "on" },
{ type: "file" },
{ type: "submit" },
{ type: "image" },
@ -36,26 +36,39 @@
if (types[i] != types[j]) {
test(function() {
var input = document.createElement("input");
var expected = " foo\rbar ";
input.type = types[i].type;
if (types[i].type === "file") {
assert_throws("INVALID_STATE_ERR", function() {
input.value = " foo\rbar ";
input.value = expected;
});
assert_equals(input.value, "");
} else if (types[j].type === "file") {
input.value = " foo\rbar ";
input.value = expected;
input.type = types[j].type; // change state
assert_equals(input.value, "");
} else {
input.value = " foo\rbar ";
input.value = expected;
input.type = types[j].type; // change state
if (types[i].type !== "color" && (types[j].sanitizedValue || types[j].sanitizedValue === "")) {
assert_equals(input.value, types[j].sanitizedValue, "input.value should be " + types[j].sanitizedValue + " after change of state");
} else if (types[i].sanitizedValue || types[i].sanitizedValue === "") {
assert_equals(input.value, types[i].sanitizedValue, "input.value should be " + types[i].sanitizedValue + " after change of state");
} else {
assert_equals(input.value, " foo\rbar ", "input.value should be ' foo\\rbar ' after change of state");
// type[i] sanitization
if (types[i].sanitizedValue || types[i].sanitizedValue === "") {
expected = types[i].sanitizedValue;
}
// type[j] sanitization
if (types[j].sanitizedValue || types[j].sanitizedValue === "") {
if ((expected !== "" && !types[i].overridesSanitization) || types[j].overridesSanitization) {
expected = types[j].sanitizedValue;
}
}
// type[j] defaultValue
if (expected === "" && types[j].defaultValue) {
expected = types[j].defaultValue;
}
assert_equals(input.value, expected, "input.value should be '" + expected + "' after change of state");
}
}, "change state from " + types[i].type + " to " + types[j].type);
}