Bug 1797449 - [websocket] Allow relative URLs and http(s) scheme r=va…

…lentin

Add support to WebSocket for http: and https: URLs,
as well as having them be relative to a base URI.

Spec: whatwg/websockets#20

Passes new WPT tests for this in /websockets, with other tests unaffected.

Also updated our tests to expect these URLs to be successful instead of fail.

Differential Revision: https://phabricator.services.mozilla.com/D160330

UltraBlame original commit: e57780f6a56b73423be1fc35ef431877957bccae

dom/websocket/WebSocket.cpp

@@ -552,6 +552,13 @@ nsIWebSocketImpl
 h
 "
 #
+include
+"
+nsIURIMutator
+.
+h
+"
+#
 define
 OPEN_EVENT_STRING
 u
@@ -887,6 +894,9 @@ const
 nsAString
 &
 aURL
+nsIURI
+*
+aBaseURI
 )
 ;
 nsresult
@@ -4733,6 +4743,17 @@ return
 true
 ;
 }
+nsIPrincipal
+*
+principal
+=
+mWorkerPrivate
+-
+>
+GetPrincipal
+(
+)
+;
 mErrorCode
 =
 mImpl
@@ -4745,12 +4766,7 @@ jsapi
 cx
 (
 )
-mWorkerPrivate
--
->
-GetPrincipal
-(
-)
+principal
 -
 >
 SchemeIs
@@ -4759,12 +4775,7 @@ SchemeIs
 https
 "
 )
-doc
--
->
-NodePrincipal
-(
-)
+principal
 mClientInfo
 mWorkerPrivate
 -
@@ -7217,11 +7228,25 @@ IsSystemPrincipal
 (
 )
 ;
+nsCOMPtr
+<
+nsIURI
+>
+baseURI
+=
+aPrincipal
+-
+>
+GetURI
+(
+)
+;
 rv
 =
 ParseURL
 (
 aURL
+baseURI
 )
 ;
 NS_ENSURE_SUCCESS
@@ -9239,6 +9264,9 @@ const
 nsAString
 &
 aURL
+nsIURI
+*
+aBaseURI
 )
 {
 AssertIsOnMainThread
@@ -9297,6 +9325,8 @@ getter_AddRefs
 uri
 )
 aURL
+nullptr
+aBaseURI
 )
 ;
 NS_ENSURE_SUCCESS
@@ -9324,18 +9354,17 @@ rv
 NS_ERROR_DOM_SYNTAX_ERR
 )
 ;
-bool
-hasRef
+nsAutoCString
+scheme
 ;
 rv
 =
 parsedURL
 -
 >
-GetHasRef
+GetScheme
 (
-&
-hasRef
+scheme
 )
 ;
 NS_ENSURE_TRUE
@@ -9347,21 +9376,92 @@ rv
 &
 &
 !
-hasRef
+scheme
+.
+IsEmpty
+(
+)
 NS_ERROR_DOM_SYNTAX_ERR
 )
 ;
-nsAutoCString
+if
+(
 scheme
+=
+=
+"
+http
+"
+|
+|
+scheme
+=
+=
+"
+https
+"
+)
+{
+scheme
+=
+scheme
+=
+=
+"
+https
+"
+?
+"
+wss
+"
+_ns
+:
+"
+ws
+"
+_ns
+;
+NS_MutateURI
+mutator
+(
+parsedURL
+)
+;
+mutator
+.
+SetScheme
+(
+scheme
+)
+;
+rv
+=
+mutator
+.
+Finalize
+(
+parsedURL
+)
+;
+NS_ENSURE_SUCCESS
+(
+rv
+NS_ERROR_DOM_SYNTAX_ERR
+)
+;
+}
+bool
+hasRef
 ;
 rv
 =
 parsedURL
 -
 >
-GetScheme
+GetHasRef
 (
-scheme
+&
+hasRef
 )
 ;
 NS_ENSURE_TRUE
@@ -9373,11 +9473,7 @@ rv
 &
 &
 !
-scheme
-.
-IsEmpty
-(
-)
+hasRef
 NS_ERROR_DOM_SYNTAX_ERR
 )
 ;

dom/websocket/tests/file_websocket_wsh.py

@@ -278,6 +278,48 @@
 "
 test
 -
+1
+"
+or
+request
+.
+ws_protocol
+=
+=
+"
+test
+-
+4
+"
+:
+
+msgutil
+.
+send_message
+(
+request
+"
+server
+data
+"
+)
+
+msgutil
+.
+close_connection
+(
+request
+)
+
+elif
+request
+.
+ws_protocol
+=
+=
+"
+test
+-
 2
 .
 1