[webkit-changes] [280225] releases/WebKitGTK/webkit-2.32

Fri, 23 Jul 2021 01:30:18 -0700

Title: [280225] releases/WebKitGTK/webkit-2.32
Revision
280225
Author
[email protected]
Date
2021-07-23 01:29:18 -0700 (Fri, 23 Jul 2021)

Log Message

Merge r275831 - Block loading for port 10080
https://bugs.webkit.org/show_bug.cgi?id=224432

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

* web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt:
* web-platform-tests/fetch/api/request/request-bad-port.any.js:
* web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt:
* 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:

Follow Chrome and Firefox by blocking port 10080.

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

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/ChangeLog (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/ChangeLog	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/ChangeLog	2021-07-23 08:29:18 UTC (rev 280225)
@@ -1,3 +1,17 @@
+2021-04-12  Youenn Fablet  <[email protected]>
+
+        Block loading for port 10080
+        https://bugs.webkit.org/show_bug.cgi?id=224432
+
+        Reviewed by Alex Christensen.
+
+        * web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt:
+        * web-platform-tests/fetch/api/request/request-bad-port.any.js:
+        * web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt:
+        * 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:
+
 2021-02-25  Antoine Quint  <[email protected]>
 
         border-image-outset doesn't handle float values

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any-expected.txt	2021-07-23 08:29:18 UTC (rev 280225)
@@ -75,6 +75,7 @@
 Blocked access to external URL http://example.com:6668/
 Blocked access to external URL http://example.com:6669/
 Blocked access to external URL http://example.com:6697/
+Blocked access to external URL http://example.com:10080/
 
 PASS Request on bad port 1 should throw TypeError.
 PASS Request on bad port 7 should throw TypeError.
@@ -153,4 +154,5 @@
 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.
+PASS Request on bad port 10080 should throw TypeError.

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.js (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.js	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.js	2021-07-23 08:29:18 UTC (rev 280225)
@@ -80,6 +80,7 @@
     6668, // irc (alternate)
     6669, // irc (alternate)
     6697, // irc+tls
+    10080, // amanda
 ];
 
 BLOCKED_PORTS_LIST.map(function(a){

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-bad-port.any.worker-expected.txt	2021-07-23 08:29:18 UTC (rev 280225)
@@ -75,6 +75,7 @@
 Blocked access to external URL http://example.com:6668/
 Blocked access to external URL http://example.com:6669/
 Blocked access to external URL http://example.com:6697/
+Blocked access to external URL http://example.com:10080/
 
 PASS Request on bad port 1 should throw TypeError.
 PASS Request on bad port 7 should throw TypeError.
@@ -153,4 +154,5 @@
 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.
+PASS Request on bad port 10080 should throw TypeError.

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any-expected.txt (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any-expected.txt	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any-expected.txt	2021-07-23 08:29:18 UTC (rev 280225)
@@ -77,4 +77,5 @@
 PASS WebSocket blocked port test 6668
 PASS WebSocket blocked port test 6669
 PASS WebSocket blocked port test 6697
+PASS WebSocket blocked port test 10080

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.js (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.js	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.js	2021-07-23 08:29:18 UTC (rev 280225)
@@ -85,6 +85,7 @@
   6668, // irc (alternate)
   6669, // irc (alternate)
   6697, // irc+tls
+  10080, // amanda
 ].forEach(blockedPort => {
   async_test(t => {
     const ws = CreateWebSocketWithBlockedPort(blockedPort)

Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.worker-expected.txt (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.worker-expected.txt	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/imported/w3c/web-platform-tests/websockets/Create-blocked-port.any.worker-expected.txt	2021-07-23 08:29:18 UTC (rev 280225)
@@ -77,4 +77,5 @@
 PASS WebSocket blocked port test 6668
 PASS WebSocket blocked port test 6669
 PASS WebSocket blocked port test 6697
+PASS WebSocket blocked port test 10080

Modified: releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog	2021-07-23 08:29:18 UTC (rev 280225)
@@ -1,3 +1,15 @@
+2021-04-12  Youenn Fablet  <[email protected]>
+
+        Block loading for port 10080
+        https://bugs.webkit.org/show_bug.cgi?id=224432
+
+        Reviewed by Alex Christensen.
+
+        Follow Chrome and Firefox by blocking port 10080.
+
+        * wtf/URL.cpp:
+        (WTF::portAllowed):
+
 2021-06-01  Adrian Perez de Castro  <[email protected]>
 
         [WPE][GTK] Support building against uClibc

Modified: releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/URL.cpp (280224 => 280225)


--- releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/URL.cpp	2021-07-23 08:17:28 UTC (rev 280224)
+++ releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/URL.cpp	2021-07-23 08:29:18 UTC (rev 280225)
@@ -971,6 +971,7 @@
         6669, // Alternate IRC [Apple addition]
         6679, // Alternate IRC SSL [Apple addition]
         6697, // IRC+SSL [Apple addition]
+        10080, // amanda
     };
 
     // If the port is not in the blocked port list, allow it.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to