Merge r269436 - Consider blocking ports 5060 and 5061

https://bugs.webkit.org/show_bug.cgi?id=218557
<rdar://problem/71031479>

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

* web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-bad-port.any.html: Added.
* web-platform-tests/fetch/api/request/request-bad-port.any.js: Added.
(BLOCKED_PORTS_LIST.map):
* web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt: Added.
* web-platform-tests/fetch/api/request/request-bad-port.any.worker.html: Added.
* web-platform-tests/fetch/api/request/request-bad-port.html: Removed.
* web-platform-tests/tools/wptserve/wptserve/utils.py:
(is_bad_port):
* web-platform-tests/websockets/Create-blocked-port.any-expected.txt:
* web-platform-tests/websockets/Create-blocked-port.any.js:
* web-platform-tests/websockets/Create-blocked-port.any.worker-expected.txt:

Source/WTF:

* wtf/URL.cpp:
(WTF::portAllowed):

LayoutTests:

* TestExpectations:

LayoutTests/ChangeLog

@@ -1,3 +1,13 @@
+2020-11-05  Youenn Fablet  <youenn@apple.com>
+
+        Consider blocking ports 5060 and 5061
+        https://bugs.webkit.org/show_bug.cgi?id=218557
+        <rdar://problem/71031479>
+
+        Reviewed by Alex Christensen.
+
+        * TestExpectations:
+
 2020-10-27  Philippe Normand  <pnormand@igalia.com>
 
         [GStreamer] Bad handling of audio files in the ImageDecoder

LayoutTests/TestExpectations

@@ -3030,8 +3030,6 @@ imported/w3c/web-platform-tests/websockets/interfaces/WebSocket/readyState/007.h
 imported/w3c/web-platform-tests/websockets/cookies/001.html [ Pass Failure ]
 
 # Timing out WebSocket tests.
-imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.worker.html [ Skip ]
-imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/binaryType-wrong-value.any.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/binaryType-wrong-value.any.worker.html [ Skip ]
 imported/w3c/web-platform-tests/websockets/bufferedAmount-unchanged-by-sync-xhr.any.html [ Skip ]

LayoutTests/imported/w3c/ChangeLog

@@ -1,3 +1,24 @@
+2020-11-05  Youenn Fablet  <youenn@apple.com>
+
+        Consider blocking ports 5060 and 5061
+        https://bugs.webkit.org/show_bug.cgi?id=218557
+        <rdar://problem/71031479>
+
+        Reviewed by Alex Christensen.
+
+        * web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt: Added.
+        * web-platform-tests/fetch/api/request/request-bad-port.any.html: Added.
+        * web-platform-tests/fetch/api/request/request-bad-port.any.js: Added.
+        (BLOCKED_PORTS_LIST.map):
+        * web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt: Added.
+        * web-platform-tests/fetch/api/request/request-bad-port.any.worker.html: Added.
+        * web-platform-tests/fetch/api/request/request-bad-port.html: Removed.
+        * web-platform-tests/tools/wptserve/wptserve/utils.py:
+        (is_bad_port):
+        * web-platform-tests/websockets/Create-blocked-port.any-expected.txt:
+        * web-platform-tests/websockets/Create-blocked-port.any.js:
+        * web-platform-tests/websockets/Create-blocked-port.any.worker-expected.txt:
+
 2020-08-12  Lauro Moura  <lmoura@igalia.com>
 
         Highpass Biquads use old formulas

LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.html

@@ -0,0 +1 @@
+<!-- This file is required for WebKit test infrastructure to run the templated test -->

LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.js

@@ -0,0 +1,81 @@
+// META: global=window,worker
+
+// list of bad ports according to
+// https://fetch.spec.whatwg.org/#port-blocking
+var BLOCKED_PORTS_LIST = [
+    1,    // tcpmux
+    7,    // echo
+    9,    // discard
+    11,   // systat
+    13,   // daytime
+    15,   // netstat
+    17,   // qotd
+    19,   // chargen
+    20,   // ftp-data
+    21,   // ftp
+    22,   // ssh
+    23,   // telnet
+    25,   // smtp
+    37,   // time
+    42,   // name
+    43,   // nicname
+    53,   // domain
+    77,   // priv-rjs
+    79,   // finger
+    87,   // ttylink
+    95,   // supdup
+    101,  // hostriame
+    102,  // iso-tsap
+    103,  // gppitnp
+    104,  // acr-nema
+    109,  // pop2
+    110,  // pop3
+    111,  // sunrpc
+    113,  // auth
+    115,  // sftp
+    117,  // uucp-path
+    119,  // nntp
+    123,  // ntp
+    135,  // loc-srv / epmap
+    139,  // netbios
+    143,  // imap2
+    179,  // bgp
+    389,  // ldap
+    427,  // afp (alternate)
+    465,  // smtp (alternate)
+    512,  // print / exec
+    513,  // login
+    514,  // shell
+    515,  // printer
+    526,  // tempo
+    530,  // courier
+    531,  // chat
+    532,  // netnews
+    540,  // uucp
+    548,  // afp
+    556,  // remotefs
+    563,  // nntp+ssl
+    587,  // smtp (outgoing)
+    601,  // syslog-conn
+    636,  // ldap+ssl
+    993,  // ldap+ssl
+    995,  // pop3+ssl
+    2049, // nfs
+    3659, // apple-sasl
+    4045, // lockd
+    5060, // sip
+    5061, // sips
+    6000, // x11
+    6665, // irc (alternate)
+    6666, // irc (alternate)
+    6667, // irc (default)
+    6668, // irc (alternate)
+    6669, // irc (alternate)
+    6697, // irc+tls
+];
+
+BLOCKED_PORTS_LIST.map(function(a){
+    promise_test(function(t){
+        return promise_rejects_js(t, TypeError, fetch("http://example.com:" + a))
+    }, 'Request on bad port ' + a + ' should throw TypeError.');
+});