disallow restricted XMLHttpRequest header prefixes

This commit is contained in:
Chandler Abraham 2016-01-18 18:04:21 -08:00 committed by Josh Matthews
parent aaad24c531
commit c375ad5e95
3 changed files with 20 additions and 24 deletions

View file

@ -423,20 +423,26 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
let name_lower = name.to_lower(); let name_lower = name.to_lower();
let name_str = match name_lower.as_str() { let name_str = match name_lower.as_str() {
Some(s) => { Some(s) => {
match s { // Step 5
// Step 5 // Disallowed headers and header prefixes:
// Disallowed headers // https://www.w3.org/TR/XMLHttpRequest/#the-setrequestheader-method
"accept-charset" | "accept-encoding" | let disallowedHeaders =
"access-control-request-headers" | ["accept-charset", "accept-encoding",
"access-control-request-method" | "access-control-request-headers",
"connection" | "content-length" | "access-control-request-method",
"cookie" | "cookie2" | "date" |"dnt" | "connection", "content-length",
"expect" | "host" | "keep-alive" | "origin" | "cookie", "cookie2", "date", "dnt",
"referer" | "te" | "trailer" | "transfer-encoding" | "expect", "host", "keep-alive", "origin",
"upgrade" | "user-agent" | "via" => { "referer", "te", "trailer", "transfer-encoding",
return Ok(()); "upgrade", "user-agent", "via"];
},
_ => s let disallowedHeaderPrefixes = ["sec-", "proxy-"];
if disallowedHeaders.iter().any(|header| *header == s) ||
disallowedHeaderPrefixes.iter().any(|prefix| s.starts_with(prefix)) {
return Ok(())
} else {
s
} }
}, },
None => unreachable!() None => unreachable!()

View file

@ -1,5 +0,0 @@
[setrequestheader-header-forbidden.htm]
type: testharness
[XMLHttpRequest: setRequestHeader() - headers that are forbidden]
expected: FAIL

View file

@ -1,5 +0,0 @@
[002.html]
type: testharness
[WebSockets: check Sec-WebSocket-Key]
expected: FAIL