Title: [238604] trunk
Revision
238604
Author
[email protected]
Date
2018-11-28 00:28:12 -0800 (Wed, 28 Nov 2018)

Log Message

Block more ports (427, 548, 6697)
https://bugs.webkit.org/show_bug.cgi?id=186092

Reviewed by Frédéric Wang.

Update request-bad-port.html to latest version.

* web-platform-tests/fetch/api/request/request-bad-port-expected.txt:
* web-platform-tests/fetch/api/request/request-bad-port.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (238603 => 238604)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2018-11-28 06:53:58 UTC (rev 238603)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2018-11-28 08:28:12 UTC (rev 238604)
@@ -1,3 +1,15 @@
+2018-11-27  Rob Buis  <[email protected]>
+
+        Block more ports (427, 548, 6697)
+        https://bugs.webkit.org/show_bug.cgi?id=186092
+
+        Reviewed by Frédéric Wang.
+
+        Update request-bad-port.html to latest version.
+
+        * web-platform-tests/fetch/api/request/request-bad-port-expected.txt:
+        * web-platform-tests/fetch/api/request/request-bad-port.html:
+
 2018-11-27  Chris Dumez  <[email protected]>
 
         Resync service-workers web platform tests from upstream

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port-expected.txt (238603 => 238604)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port-expected.txt	2018-11-28 06:53:58 UTC (rev 238603)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port-expected.txt	2018-11-28 08:28:12 UTC (rev 238604)
@@ -1,131 +1,137 @@
 Blocked access to external URL http://example.com:1/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:1/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:1/ due to access control checks.
 Blocked access to external URL http://example.com:7/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:7/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:7/ due to access control checks.
 Blocked access to external URL http://example.com:9/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:9/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:9/ due to access control checks.
 Blocked access to external URL http://example.com:11/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:11/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:11/ due to access control checks.
 Blocked access to external URL http://example.com:13/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:13/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:13/ due to access control checks.
 Blocked access to external URL http://example.com:15/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:15/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:15/ due to access control checks.
 Blocked access to external URL http://example.com:17/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:17/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:17/ due to access control checks.
 Blocked access to external URL http://example.com:19/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:19/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:19/ due to access control checks.
 Blocked access to external URL http://example.com:20/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:20/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:20/ due to access control checks.
 Blocked access to external URL http://example.com:21/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:21/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:21/ due to access control checks.
 Blocked access to external URL http://example.com:22/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:22/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:22/ due to access control checks.
 Blocked access to external URL http://example.com:23/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:23/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:23/ due to access control checks.
 Blocked access to external URL http://example.com:25/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:25/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:25/ due to access control checks.
 Blocked access to external URL http://example.com:37/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:37/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:37/ due to access control checks.
 Blocked access to external URL http://example.com:42/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:42/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:42/ due to access control checks.
 Blocked access to external URL http://example.com:43/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:43/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:43/ due to access control checks.
 Blocked access to external URL http://example.com:53/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:53/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:53/ due to access control checks.
 Blocked access to external URL http://example.com:77/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:77/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:77/ due to access control checks.
 Blocked access to external URL http://example.com:79/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:79/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:79/ due to access control checks.
 Blocked access to external URL http://example.com:87/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:87/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:87/ due to access control checks.
 Blocked access to external URL http://example.com:95/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:95/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:95/ due to access control checks.
 Blocked access to external URL http://example.com:101/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:101/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:101/ due to access control checks.
 Blocked access to external URL http://example.com:102/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:102/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:102/ due to access control checks.
 Blocked access to external URL http://example.com:103/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:103/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:103/ due to access control checks.
 Blocked access to external URL http://example.com:104/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:104/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:104/ due to access control checks.
 Blocked access to external URL http://example.com:109/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:109/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:109/ due to access control checks.
 Blocked access to external URL http://example.com:110/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:110/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:110/ due to access control checks.
 Blocked access to external URL http://example.com:111/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:111/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:111/ due to access control checks.
 Blocked access to external URL http://example.com:113/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:113/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:113/ due to access control checks.
 Blocked access to external URL http://example.com:115/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:115/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:115/ due to access control checks.
 Blocked access to external URL http://example.com:117/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:117/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:117/ due to access control checks.
 Blocked access to external URL http://example.com:119/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:119/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:119/ due to access control checks.
 Blocked access to external URL http://example.com:123/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:123/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:123/ due to access control checks.
 Blocked access to external URL http://example.com:135/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:135/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:135/ due to access control checks.
 Blocked access to external URL http://example.com:139/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:139/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:139/ due to access control checks.
 Blocked access to external URL http://example.com:143/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:143/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:143/ due to access control checks.
 Blocked access to external URL http://example.com:179/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:179/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:179/ due to access control checks.
 Blocked access to external URL http://example.com:389/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:389/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:389/ due to access control checks.
+Blocked access to external URL http://example.com:427/
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:427/ due to access control checks.
 Blocked access to external URL http://example.com:465/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:465/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:465/ due to access control checks.
 Blocked access to external URL http://example.com:512/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:512/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:512/ due to access control checks.
 Blocked access to external URL http://example.com:513/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:513/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:513/ due to access control checks.
 Blocked access to external URL http://example.com:514/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:514/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:514/ due to access control checks.
 Blocked access to external URL http://example.com:515/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:515/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:515/ due to access control checks.
 Blocked access to external URL http://example.com:526/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:526/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:526/ due to access control checks.
 Blocked access to external URL http://example.com:530/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:530/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:530/ due to access control checks.
 Blocked access to external URL http://example.com:531/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:531/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:531/ due to access control checks.
 Blocked access to external URL http://example.com:532/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:532/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:532/ due to access control checks.
 Blocked access to external URL http://example.com:540/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:540/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:540/ due to access control checks.
+Blocked access to external URL http://example.com:548/
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:548/ due to access control checks.
 Blocked access to external URL http://example.com:556/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:556/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:556/ due to access control checks.
 Blocked access to external URL http://example.com:563/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:563/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:563/ due to access control checks.
 Blocked access to external URL http://example.com:587/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:587/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:587/ due to access control checks.
 Blocked access to external URL http://example.com:601/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:601/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:601/ due to access control checks.
 Blocked access to external URL http://example.com:636/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:636/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:636/ due to access control checks.
 Blocked access to external URL http://example.com:993/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:993/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:993/ due to access control checks.
 Blocked access to external URL http://example.com:995/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:995/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:995/ due to access control checks.
 Blocked access to external URL http://example.com:2049/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:2049/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:2049/ due to access control checks.
 Blocked access to external URL http://example.com:3659/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:3659/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:3659/ due to access control checks.
 Blocked access to external URL http://example.com:4045/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:4045/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:4045/ due to access control checks.
 Blocked access to external URL http://example.com:6000/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:6000/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6000/ due to access control checks.
 Blocked access to external URL http://example.com:6665/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:6665/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6665/ due to access control checks.
 Blocked access to external URL http://example.com:6666/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:6666/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6666/ due to access control checks.
 Blocked access to external URL http://example.com:6667/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:6667/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6667/ due to access control checks.
 Blocked access to external URL http://example.com:6668/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:6668/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6668/ due to access control checks.
 Blocked access to external URL http://example.com:6669/
-CONSOLE MESSAGE: line 79: Fetch API cannot load http://example.com:6669/ due to access control checks.
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6669/ due to access control checks.
+Blocked access to external URL http://example.com:6697/
+CONSOLE MESSAGE: line 80: Fetch API cannot load http://example.com:6697/ due to access control checks.
 
 PASS Request on bad port 1 should throw TypeError. 
 PASS Request on bad port 7 should throw TypeError. 
@@ -165,6 +171,7 @@
 PASS Request on bad port 143 should throw TypeError. 
 PASS Request on bad port 179 should throw TypeError. 
 PASS Request on bad port 389 should throw TypeError. 
+PASS Request on bad port 427 should throw TypeError. 
 PASS Request on bad port 465 should throw TypeError. 
 PASS Request on bad port 512 should throw TypeError. 
 PASS Request on bad port 513 should throw TypeError. 
@@ -175,6 +182,7 @@
 PASS Request on bad port 531 should throw TypeError. 
 PASS Request on bad port 532 should throw TypeError. 
 PASS Request on bad port 540 should throw TypeError. 
+PASS Request on bad port 548 should throw TypeError. 
 PASS Request on bad port 556 should throw TypeError. 
 PASS Request on bad port 563 should throw TypeError. 
 PASS Request on bad port 587 should throw TypeError. 
@@ -191,4 +199,5 @@
 PASS Request on bad port 6667 should throw TypeError. 
 PASS Request on bad port 6668 should throw TypeError. 
 PASS Request on bad port 6669 should throw TypeError. 
+PASS Request on bad port 6697 should throw TypeError. 
 

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.html (238603 => 238604)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.html	2018-11-28 06:53:58 UTC (rev 238603)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.html	2018-11-28 08:28:12 UTC (rev 238604)
@@ -4,7 +4,6 @@
 <script src=""
 <script src=""
 <script>
-
     // list of bad ports according to
     // https://fetch.spec.whatwg.org/#port-blocking
     var BLOCKED_PORTS_LIST = [
@@ -46,7 +45,8 @@
         143,  // imap2
         179,  // bgp
         389,  // ldap
-        465,  // smtp+ssl
+        427,  // afp (alternate)
+        465,  // smtp (alternate)
         512,  // print / exec
         513,  // login
         514,  // shell
@@ -56,12 +56,13 @@
         531,  // chat
         532,  // netnews
         540,  // uucp
+        548,  // afp
         556,  // remotefs
         563,  // nntp+ssl
-        587,  // smtp
+        587,  // smtp (outgoing)
         601,  // syslog-conn
         636,  // ldap+ssl
-        993,  // imap+ssl
+        993,  // ldap+ssl
         995,  // pop3+ssl
         2049, // nfs
         3659, // apple-sasl
@@ -72,8 +73,8 @@
         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(t, new TypeError(), fetch("http://example.com:" + a))

Modified: trunk/Source/WebCore/ChangeLog (238603 => 238604)


--- trunk/Source/WebCore/ChangeLog	2018-11-28 06:53:58 UTC (rev 238603)
+++ trunk/Source/WebCore/ChangeLog	2018-11-28 08:28:12 UTC (rev 238604)
@@ -1,3 +1,20 @@
+2018-11-27  Rob Buis  <[email protected]>
+
+        Block more ports (427, 548, 6697)
+        https://bugs.webkit.org/show_bug.cgi?id=186092
+
+        Reviewed by Frédéric Wang.
+
+        Block port 427, ports 548 and 6697 are aleady blocked and
+        are tested by the updated request-bad-port.html wpt test.
+
+        Behavior matches Firefox and Chrome.
+
+        Test: web-platform-tests/fetch/api/request/request-bad-port.html
+
+        * platform/URL.cpp:
+        (WebCore::portAllowed):
+
 2018-11-27  Youenn Fablet  <[email protected]>
 
         Log WebRTC stats in inspector console only when setting is verbose

Modified: trunk/Source/WebCore/platform/URL.cpp (238603 => 238604)


--- trunk/Source/WebCore/platform/URL.cpp	2018-11-28 06:53:58 UTC (rev 238603)
+++ trunk/Source/WebCore/platform/URL.cpp	2018-11-28 08:28:12 UTC (rev 238604)
@@ -919,6 +919,7 @@
         143,  // IMAP2
         179,  // BGP
         389,  // LDAP
+        427,  // SLP (Also used by Apple Filing Protocol)
         465,  // SMTP+SSL
         512,  // print / exec
         513,  // login
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to