From 19a2516e105f6ac6c4e3d6027c150bd7c06ad89d Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Fri, 31 Mar 2017 15:49:24 +0200 Subject: [PATCH] Disable wss support None of the existing websocket libraries are currently able to cope with openssl 0.9 and be featureful, so we are disabling wss for now to land openssl 0.9. --- components/net/resource_thread.rs | 3 +- components/net/websocket_loader.rs | 62 +++++++------------ .../Create-Secure-extensions-empty.htm.ini | 6 +- ...e-Secure-valid-url-array-protocols.htm.ini | 9 +++ ...e-Secure-valid-url-binaryType-blob.htm.ini | 9 +++ ...re-valid-url-protocol-setCorrectly.htm.ini | 9 +++ ...e-Secure-valid-url-protocol-string.htm.ini | 9 +++ .../Create-Secure-valid-url.htm.ini | 9 +++ .../Secure-Close-1000-reason.htm.ini | 9 +++ .../Secure-Close-1000-verify-code.htm.ini | 9 +++ .../websockets/Secure-Close-1000.htm.ini | 9 +++ .../Secure-Close-1005-verify-code.htm.ini | 9 +++ .../websockets/Secure-Close-1005.htm.ini | 6 ++ .../Secure-Close-2999-reason.htm.ini | 6 ++ .../Secure-Close-3000-reason.htm.ini | 9 +++ .../Secure-Close-3000-verify-code.htm.ini | 9 +++ .../Secure-Close-4999-reason.htm.ini | 9 +++ .../Secure-Close-Reason-124Bytes.htm.ini | 6 ++ ...e-Close-Reason-Unpaired-surrogates.htm.ini | 9 +++ .../Secure-Close-onlyReason.htm.ini | 6 ++ .../Secure-Close-readyState-Closed.htm.ini | 9 +++ .../Secure-Close-readyState-Closing.htm.ini | 6 ++ ...ecure-Close-server-initiated-close.htm.ini | 9 +++ .../websockets/Secure-Close-undefined.htm.ini | 6 ++ .../websockets/Secure-Send-65K-data.htm.ini | 12 ++++ ...Secure-Send-binary-65K-arraybuffer.htm.ini | 12 ++-- .../Secure-Send-binary-arraybuffer.htm.ini | 12 ++-- ...end-binary-arraybufferview-float64.htm.ini | 9 ++- ...-Send-binary-arraybufferview-int32.htm.ini | 9 ++- ...raybufferview-uint16-offset-length.htm.ini | 9 ++- ...nary-arraybufferview-uint32-offset.htm.ini | 9 ++- ...rraybufferview-uint8-offset-length.htm.ini | 9 ++- ...inary-arraybufferview-uint8-offset.htm.ini | 9 ++- .../Secure-Send-binary-blob.htm.ini | 12 ++++ .../websockets/Secure-Send-data.htm.ini | 12 ++++ .../websockets/Secure-Send-null.htm.ini | 12 ++++ .../Secure-Send-paired-surrogates.htm.ini | 12 ++++ .../Secure-Send-unicode-data.htm.ini | 12 ++++ .../Secure-Send-unpaired-surrogates.htm.ini | 12 ++++ .../websockets/binaryType-wrong-value.htm.ini | 9 +++ 40 files changed, 340 insertions(+), 73 deletions(-) create mode 100644 tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.htm.ini create mode 100644 tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.htm.ini create mode 100644 tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm.ini create mode 100644 tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.htm.ini create mode 100644 tests/wpt/metadata/websockets/Create-Secure-valid-url.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-1000-reason.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-1000.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-1005.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-2999-reason.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-3000-reason.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-4999-reason.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-onlyReason.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Close-undefined.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-65K-data.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-binary-blob.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-data.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-null.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-unicode-data.htm.ini create mode 100644 tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.htm.ini create mode 100644 tests/wpt/metadata/websockets/binaryType-wrong-value.htm.ini diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index d216ccbd907..b734058ad65 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -357,7 +357,6 @@ impl CoreResourceManager { resource_grp: &ResourceGroup) { websocket_loader::init(connect, connect_data, - resource_grp.cookie_jar.clone(), - resource_grp.ssl_context.clone()); + resource_grp.cookie_jar.clone()); } } diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs index 87cd83d5437..ae40026614c 100644 --- a/components/net/websocket_loader.rs +++ b/components/net/websocket_loader.rs @@ -11,14 +11,13 @@ use hyper::header::{Accept, CacheControl, CacheDirective, Connection, Connection use hyper::header::{Headers, Host, SetCookie, Pragma, Protocol, ProtocolName, Upgrade}; use hyper::http::h1::{LINE_ENDING, parse_response}; use hyper::method::Method; -use hyper::net::{HttpStream, HttpsStream}; +use hyper::net::HttpStream; use hyper::status::StatusCode; use hyper::version::HttpVersion; use net_traits::{CookieSource, MessageData, NetworkError, WebSocketCommunicate, WebSocketConnectData}; use net_traits::{WebSocketDomAction, WebSocketNetworkEvent}; use net_traits::hosts::replace_host; use net_traits::request::Type; -use openssl::ssl::{SslContext, SslStream}; use servo_url::ServoUrl; use std::ascii::AsciiExt; use std::io::{self, Write}; @@ -35,14 +34,12 @@ use websocket::sender::Sender; pub fn init(connect: WebSocketCommunicate, connect_data: WebSocketConnectData, - cookie_jar: Arc>, - ssl_context: Arc) { + cookie_jar: Arc>) { thread::Builder::new().name(format!("WebSocket connection to {}", connect_data.resource_url)).spawn(move || { let channel = establish_a_websocket_connection(&connect_data.resource_url, connect_data.origin, connect_data.protocols, - cookie_jar, - ssl_context); + cookie_jar); let (ws_sender, mut receiver) = match channel { Ok((protocol_in_use, sender, receiver)) => { let _ = connect.event_sender.send(WebSocketNetworkEvent::ConnectionEstablished { protocol_in_use }); @@ -117,11 +114,10 @@ pub fn init(connect: WebSocketCommunicate, }).expect("Thread spawning failed"); } -type Stream = HttpsStream>; +type Stream = HttpStream; // https://fetch.spec.whatwg.org/#concept-websocket-connection-obtain -fn obtain_a_websocket_connection(url: &ServoUrl, ssl_context: Arc) - -> Result { +fn obtain_a_websocket_connection(url: &ServoUrl) -> Result { // Step 1. let host = url.host_str().unwrap(); @@ -137,27 +133,23 @@ fn obtain_a_websocket_connection(url: &ServoUrl, ssl_context: Arc) _ => panic!("URL's scheme should be ws or wss"), }; + if secure { + return Err(NetworkError::Internal("WSS is disabled for now.".into())); + } + // Steps 4-5. let host = replace_host(host); let tcp_stream = TcpStream::connect((&*host, port)).map_err(|e| { NetworkError::Internal(format!("Could not connect to host: {}", e)) })?; - let http_stream = HttpStream(tcp_stream); - if !secure { - return Ok(HttpsStream::Http(http_stream)); - } - let ssl_stream = SslStream::connect(&*ssl_context, http_stream).map_err(|e| { - NetworkError::from_ssl_error(url, &e) - })?; - Ok(HttpsStream::Https(ssl_stream)) + Ok(HttpStream(tcp_stream)) } // https://fetch.spec.whatwg.org/#concept-websocket-establish fn establish_a_websocket_connection(resource_url: &ServoUrl, origin: String, protocols: Vec, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result<(Option, Sender, Receiver), @@ -192,7 +184,7 @@ fn establish_a_websocket_connection(resource_url: &ServoUrl, // TODO: handle permessage-deflate extension. // Step 11 and network error check from step 12. - let response = fetch(resource_url, origin, headers, cookie_jar, ssl_context)?; + let response = fetch(resource_url, origin, headers, cookie_jar)?; // Step 12, the status code check. if response.status != StatusCode::SwitchingProtocols { @@ -279,8 +271,7 @@ struct Response { fn fetch(url: &ServoUrl, origin: String, mut headers: Headers, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result { // Step 1. // TODO: handle request's window. @@ -324,15 +315,14 @@ fn fetch(url: &ServoUrl, } // Step 8. - main_fetch(url, origin, headers, cookie_jar, ssl_context) + main_fetch(url, origin, headers, cookie_jar) } // https://fetch.spec.whatwg.org/#concept-main-fetch fn main_fetch(url: &ServoUrl, origin: String, mut headers: Headers, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result { // Step 1. let mut response = None; @@ -375,7 +365,7 @@ fn main_fetch(url: &ServoUrl, // doesn't need to be filtered at all. // Step 12.2. - basic_fetch(url, origin, &mut headers, cookie_jar, ssl_context) + basic_fetch(url, origin, &mut headers, cookie_jar) }); // Step 13. @@ -413,19 +403,17 @@ fn main_fetch(url: &ServoUrl, fn basic_fetch(url: &ServoUrl, origin: String, headers: &mut Headers, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result { // In the case of a WebSocket request, HTTP fetch is always used. - http_fetch(url, origin, headers, cookie_jar, ssl_context) + http_fetch(url, origin, headers, cookie_jar) } // https://fetch.spec.whatwg.org/#concept-http-fetch fn http_fetch(url: &ServoUrl, origin: String, headers: &mut Headers, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result { // Step 1. // Not applicable: with step 3 being useless here, this one is too. @@ -446,7 +434,7 @@ fn http_fetch(url: &ServoUrl, // Not applicable: request's redirect mode is "error". // Step 4.3. - let response = http_network_or_cache_fetch(url, origin, headers, cookie_jar, ssl_context); + let response = http_network_or_cache_fetch(url, origin, headers, cookie_jar); // Step 4.4. // Not applicable: CORS flag is unset. @@ -475,8 +463,7 @@ fn http_fetch(url: &ServoUrl, fn http_network_or_cache_fetch(url: &ServoUrl, origin: String, headers: &mut Headers, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result { // Steps 1-3. // Not applicable: we don't even have a request yet, and there is no body @@ -552,7 +539,7 @@ fn http_network_or_cache_fetch(url: &ServoUrl, // Not applicable: cache mode is "no-store". // Step 22.2. - let forward_response = http_network_fetch(url, headers, cookie_jar, ssl_context); + let forward_response = http_network_fetch(url, headers, cookie_jar); // Step 22.3. // Not applicable: request's method is not unsafe. @@ -581,15 +568,14 @@ fn http_network_or_cache_fetch(url: &ServoUrl, // https://fetch.spec.whatwg.org/#concept-http-network-fetch fn http_network_fetch(url: &ServoUrl, headers: &Headers, - cookie_jar: Arc>, - ssl_context: Arc) + cookie_jar: Arc>) -> Result { // Step 1. // Not applicable: credentials flag is set. // Steps 2-3. // Request's mode is "websocket". - let connection = obtain_a_websocket_connection(url, ssl_context)?; + let connection = obtain_a_websocket_connection(url)?; // Step 4. // Not applicable: request’s body is null. diff --git a/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.htm.ini b/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.htm.ini index 8eb0ae65a7c..e346fdb349d 100644 --- a/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.htm.ini +++ b/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.htm.ini @@ -2,8 +2,8 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened] - expected: FAIL - - [W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed] expected: NOTRUN + [W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.htm.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.htm.ini new file mode 100644 index 00000000000..f1617ea3c85 --- /dev/null +++ b/tests/wpt/metadata/websockets/Create-Secure-valid-url-array-protocols.htm.ini @@ -0,0 +1,9 @@ +[Create-Secure-valid-url-array-protocols.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.htm.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.htm.ini new file mode 100644 index 00000000000..592d426f5b9 --- /dev/null +++ b/tests/wpt/metadata/websockets/Create-Secure-valid-url-binaryType-blob.htm.ini @@ -0,0 +1,9 @@ +[Create-Secure-valid-url-binaryType-blob.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm.ini new file mode 100644 index 00000000000..028882a7e6c --- /dev/null +++ b/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-setCorrectly.htm.ini @@ -0,0 +1,9 @@ +[Create-Secure-valid-url-protocol-setCorrectly.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.htm.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.htm.ini new file mode 100644 index 00000000000..6584c7f4bce --- /dev/null +++ b/tests/wpt/metadata/websockets/Create-Secure-valid-url-protocol-string.htm.ini @@ -0,0 +1,9 @@ +[Create-Secure-valid-url-protocol-string.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Check readyState is 1] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Create-Secure-valid-url.htm.ini b/tests/wpt/metadata/websockets/Create-Secure-valid-url.htm.ini new file mode 100644 index 00000000000..9b59b18aa14 --- /dev/null +++ b/tests/wpt/metadata/websockets/Create-Secure-valid-url.htm.ini @@ -0,0 +1,9 @@ +[Create-Secure-valid-url.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-1000-reason.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-1000-reason.htm.ini new file mode 100644 index 00000000000..d24e2785205 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-1000-reason.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-1000-reason.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.htm.ini new file mode 100644 index 00000000000..fa15a492ae1 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-1000-verify-code.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-1000-verify-code.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close'] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-1000.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-1000.htm.ini new file mode 100644 index 00000000000..cfe9b1955de --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-1000.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-1000.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.htm.ini new file mode 100644 index 00000000000..f9f92433578 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-1005-verify-code.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-1005-verify-code.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-1005.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-1005.htm.ini new file mode 100644 index 00000000000..618133c4a71 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-1005.htm.ini @@ -0,0 +1,6 @@ +[Secure-Close-1005.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5. The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt] + expected: NOTRUN + diff --git a/tests/wpt/metadata/websockets/Secure-Close-2999-reason.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-2999-reason.htm.ini new file mode 100644 index 00000000000..f1195cfb63f --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-2999-reason.htm.ini @@ -0,0 +1,6 @@ +[Secure-Close-2999-reason.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown] + expected: NOTRUN + diff --git a/tests/wpt/metadata/websockets/Secure-Close-3000-reason.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-3000-reason.htm.ini new file mode 100644 index 00000000000..63a80322366 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-3000-reason.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-3000-reason.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.htm.ini new file mode 100644 index 00000000000..a5caea6b348 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-3000-verify-code.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-3000-verify-code.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-4999-reason.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-4999-reason.htm.ini new file mode 100644 index 00000000000..fdd3eca19a8 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-4999-reason.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-4999-reason.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.htm.ini new file mode 100644 index 00000000000..8c8a0b30597 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-Reason-124Bytes.htm.ini @@ -0,0 +1,6 @@ +[Secure-Close-Reason-124Bytes.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown] + expected: NOTRUN + diff --git a/tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.htm.ini new file mode 100644 index 00000000000..35f9e302c1b --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-Reason-Unpaired-surrogates.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-Reason-Unpaired-surrogates.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-onlyReason.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-onlyReason.htm.ini new file mode 100644 index 00000000000..65caa5fc292 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-onlyReason.htm.ini @@ -0,0 +1,6 @@ +[Secure-Close-onlyReason.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown] + expected: NOTRUN + diff --git a/tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.htm.ini new file mode 100644 index 00000000000..7308d35ddbe --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-readyState-Closed.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-readyState-Closed.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.htm.ini new file mode 100644 index 00000000000..42bde612fd3 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-readyState-Closing.htm.ini @@ -0,0 +1,6 @@ +[Secure-Close-readyState-Closing.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called] + expected: NOTRUN + diff --git a/tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.htm.ini new file mode 100644 index 00000000000..666d661f212 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-server-initiated-close.htm.ini @@ -0,0 +1,9 @@ +[Secure-Close-server-initiated-close.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Close-undefined.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-undefined.htm.ini new file mode 100644 index 00000000000..1cdd7f0fbed --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Close-undefined.htm.ini @@ -0,0 +1,6 @@ +[Secure-Close-undefined.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Close Secure WebSocket - Code is undefined] + expected: NOTRUN + diff --git a/tests/wpt/metadata/websockets/Secure-Send-65K-data.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-65K-data.htm.ini new file mode 100644 index 00000000000..8a222b53689 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-65K-data.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-65K-data.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send 65K data on a Secure WebSocket - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.htm.ini index db648771b60..cf3ef21a4fa 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-65K-arraybuffer.htm.ini @@ -2,11 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened] - expected: FAIL - - [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed] expected: NOTRUN + [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.htm.ini index 5b5e73cf363..b108cc90ad9 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybuffer.htm.ini @@ -2,11 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened] - expected: FAIL - - [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed] expected: NOTRUN + [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.htm.ini index 8f3f255ba65..770890e314f 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-float64.htm.ini @@ -2,8 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed] + expected: FAIL + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened] expected: NOTRUN diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.htm.ini index c7f8c7bc3e1..f837e0dfeeb 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-int32.htm.ini @@ -2,8 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed] + expected: FAIL + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened] expected: NOTRUN diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm.ini index aa29d8ef6fa..f7ccae7f33c 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.htm.ini @@ -2,8 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed] + expected: FAIL + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened] expected: NOTRUN diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm.ini index 09fabbd2f09..845165049d1 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint32-offset.htm.ini @@ -2,8 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed] + expected: FAIL + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened] expected: NOTRUN diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm.ini index d6c25b35e51..b3fc5eee805 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.htm.ini @@ -2,8 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed] + expected: FAIL + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened] expected: NOTRUN diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm.ini index 52128fbd3bd..b72b37663c6 100644 --- a/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm.ini +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-arraybufferview-uint8-offset.htm.ini @@ -2,8 +2,11 @@ type: testharness expected: TIMEOUT [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received] - expected: FAIL - - [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed] + expected: FAIL + + [W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened] expected: NOTRUN diff --git a/tests/wpt/metadata/websockets/Secure-Send-binary-blob.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-binary-blob.htm.ini new file mode 100644 index 00000000000..98a1e9ed730 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-binary-blob.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-binary-blob.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-data.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-data.htm.ini new file mode 100644 index 00000000000..03e423b8a58 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-data.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-data.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send data on a Secure WebSocket - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send data on a Secure WebSocket - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send data on a Secure WebSocket - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-null.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-null.htm.ini new file mode 100644 index 00000000000..8d09d47b317 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-null.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-null.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send null data on a Secure WebSocket - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.htm.ini new file mode 100644 index 00000000000..5075d823173 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-paired-surrogates.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-paired-surrogates.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-unicode-data.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-unicode-data.htm.ini new file mode 100644 index 00000000000..05e61bfb337 --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-unicode-data.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-unicode-data.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send unicode data on a Secure WebSocket - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.htm.ini b/tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.htm.ini new file mode 100644 index 00000000000..6e4bffbf4fb --- /dev/null +++ b/tests/wpt/metadata/websockets/Secure-Send-unpaired-surrogates.htm.ini @@ -0,0 +1,12 @@ +[Secure-Send-unpaired-surrogates.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Message should be received] + expected: NOTRUN + + [W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be closed] + expected: FAIL + diff --git a/tests/wpt/metadata/websockets/binaryType-wrong-value.htm.ini b/tests/wpt/metadata/websockets/binaryType-wrong-value.htm.ini new file mode 100644 index 00000000000..d307c32b021 --- /dev/null +++ b/tests/wpt/metadata/websockets/binaryType-wrong-value.htm.ini @@ -0,0 +1,9 @@ +[binaryType-wrong-value.htm] + type: testharness + expected: TIMEOUT + [W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened] + expected: NOTRUN + + [W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed] + expected: FAIL +