mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Reject websocket protocol requests that don't match https://tools.ietf.org/html/rfc6455#section-4.1 .
This commit is contained in:
parent
cb52cc6658
commit
d385cb701b
8 changed files with 31 additions and 509 deletions
|
@ -96,11 +96,34 @@ impl WebSocket {
|
|||
|
||||
}
|
||||
|
||||
pub fn new(global: GlobalRef, url: DOMString) -> Fallible<Root<WebSocket>> {
|
||||
pub fn new(global: GlobalRef,
|
||||
url: DOMString,
|
||||
protocols: Option<DOMString>)
|
||||
-> Fallible<Root<WebSocket>> {
|
||||
// Step 1.
|
||||
let parsed_url = try!(Url::parse(&url).map_err(|_| Error::Syntax));
|
||||
let url = try!(parse_url(&parsed_url).map_err(|_| Error::Syntax));
|
||||
|
||||
// Step 4.
|
||||
let protocols = protocols.as_slice();
|
||||
|
||||
// Step 5.
|
||||
for (i, protocol) in protocols.iter().enumerate() {
|
||||
// https://tools.ietf.org/html/rfc6455#section-4.1
|
||||
// Handshake requirements, step 10
|
||||
if protocol.is_empty() {
|
||||
return Err(Syntax);
|
||||
}
|
||||
|
||||
if protocols[i+1..].iter().any(|p| p == protocol) {
|
||||
return Err(Syntax);
|
||||
}
|
||||
|
||||
if protocol.chars().any(|c| c < '\u{0021}' || c > '\u{007E}') {
|
||||
return Err(Syntax);
|
||||
}
|
||||
}
|
||||
|
||||
/*TODO: This constructor is only a prototype, it does not accomplish the specs
|
||||
defined here:
|
||||
http://html.spec.whatwg.org
|
||||
|
@ -150,8 +173,11 @@ impl WebSocket {
|
|||
Ok(ws)
|
||||
}
|
||||
|
||||
pub fn Constructor(global: GlobalRef, url: DOMString) -> Fallible<Root<WebSocket>> {
|
||||
WebSocket::new(global, url)
|
||||
pub fn Constructor(global: GlobalRef,
|
||||
url: DOMString,
|
||||
protocols: Option<DOMString>)
|
||||
-> Fallible<Root<WebSocket>> {
|
||||
WebSocket::new(global, url, protocols)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue