Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update WebSocket blocked ports to match the Fetch spec

Browse source
This commit is contained in:
Saurav Sachidanand 2016-03-15 22:27:22 +05:30
parent 183772583f
commit 4ddf4e7bdc
2 changed files with 86 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/websocket.rs
View file

@ -55,8 +55,8 @@ enum WebSocketRequestState {
Closed = 3, Closed = 3,
} }
// list of blacklist ports according to // list of bad ports according to
// http://mxr.mozilla.org/mozilla-central/source/netwerk/base/nsIOService.cpp#87 // https://fetch.spec.whatwg.org/#port-blocking
const BLOCKED_PORTS_LIST: &'static [u16] = &[ const BLOCKED_PORTS_LIST: &'static [u16] = &[
1, // tcpmux 1, // tcpmux
7, // echo 7, // echo
@ -67,7 +67,7 @@ const BLOCKED_PORTS_LIST: &'static [u16] = &[
17, // qotd 17, // qotd
19, // chargen 19, // chargen
20, // ftp-data 20, // ftp-data
21, // ftp-cntl 21, // ftp
22, // ssh 22, // ssh
23, // telnet 23, // telnet
25, // smtp 25, // smtp
@ -90,11 +90,11 @@ const BLOCKED_PORTS_LIST: &'static [u16] = &[
115, // sftp 115, // sftp
117, // uucp-path 117, // uucp-path
119, // nntp 119, // nntp
123, // NTP 123, // ntp
135, // loc-srv / epmap 135, // loc-srv / epmap
139, // netbios 139, // netbios
143, // imap2 143, // imap2
179, // BGP 179, // bgp
389, // ldap 389, // ldap
465, // smtp+ssl 465, // smtp+ssl
512, // print / exec 512, // print / exec
@ -103,19 +103,25 @@ const BLOCKED_PORTS_LIST: &'static [u16] = &[
515, // printer 515, // printer
526, // tempo 526, // tempo
530, // courier 530, // courier
531, // Chat 531, // chat
532, // netnews 532, // netnews
540, // uucp 540, // uucp
556, // remotefs 556, // remotefs
563, // nntp+ssl 563, // nntp+ssl
587, // 587, // smtp
601, // 601, // syslog-conn
636, // ldap+ssl 636, // ldap+ssl
993, // imap+ssl 993, // imap+ssl
995, // pop3+ssl 995, // pop3+ssl
2049, // nfs 2049, // nfs
3659, // apple-sasl
4045, // lockd 4045, // lockd
6000, // x11 6000, // x11
6665, // irc (alternate)
6666, // irc (alternate)
6667, // irc (default)
6668, // irc (alternate)
6669, // irc (alternate)
]; ];
// Close codes defined in https://tools.ietf.org/html/rfc6455#section-7.4.1 // Close codes defined in https://tools.ietf.org/html/rfc6455#section-7.4.1

75
tests/wpt/web-platform-tests/websockets/Create-Secure-blocked-port.htm
View file

@ -10,9 +10,78 @@
<div id="log"></div> <div id="log"></div>
<script> <script>
test(function () { test(function () {
var wsocket; // list of bad ports according to
var blockedPort = 25; // https://fetch.spec.whatwg.org/#port-blocking
assert_throws("SECURITY_ERR", function () { wsocket = CreateWebSocketWithBlockedPort(blockedPort) }); 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
465, // smtp+ssl
512, // print / exec
513, // login
514, // shell
515, // printer
526, // tempo
530, // courier
531, // chat
532, // netnews
540, // uucp
556, // remotefs
563, // nntp+ssl
587, // smtp
601, // syslog-conn
636, // ldap+ssl
993, // imap+ssl
995, // pop3+ssl
2049, // nfs
3659, // apple-sasl
4045, // lockd
6000, // x11
6665, // irc (alternate)
6666, // irc (alternate)
6667, // irc (default)
6668, // irc (alternate)
6669, // irc (alternate)
];
for (var i = 0; i < BLOCKED_PORTS_LIST.length; i++) {
var blockedPort = BLOCKED_PORTS_LIST[i];
assert_throws("SECURITY_ERR", function () { CreateWebSocketWithBlockedPort(blockedPort) });
}
}, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a blocked port - SECURITY_ERR should be thrown") }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a blocked port - SECURITY_ERR should be thrown")
</script> </script>
</body> </body>