[webkit-changes] [222623] trunk

Thu, 28 Sep 2017 12:24:48 -0700

Title: [222623] trunk
Revision
222623
Author
[email protected]
Date
2017-09-28 12:22:47 -0700 (Thu, 28 Sep 2017)

Log Message

Add ports 6679 and 6697 (IRC SSL) to port blacklist
https://bugs.webkit.org/show_bug.cgi?id=177544
<rdar://problem/34666525>

Reviewed by Alex Christensen.

Source/WebCore:

Test: security/block-test.html

* platform/URL.cpp:
(WebCore::portAllowed): Also block port 6679.

LayoutTests:

Update test and expectations for new port.

* security/block-test-expected.txt:
* security/block-test.html:
* platform/gtk/security/block-test-expected.txt:
* platform/mac/security/block-test-expected.txt:
* platform/wpe/security/block-test-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (222622 => 222623)


--- trunk/LayoutTests/ChangeLog	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/LayoutTests/ChangeLog	2017-09-28 19:22:47 UTC (rev 222623)
@@ -1,3 +1,19 @@
+2017-09-28  Brent Fulgham  <[email protected]>
+
+        Add ports 6679 and 6697 (IRC SSL) to port blacklist
+        https://bugs.webkit.org/show_bug.cgi?id=177544
+        <rdar://problem/34666525>
+
+        Reviewed by Alex Christensen.
+
+        Update test and expectations for new port.
+
+        * security/block-test-expected.txt:
+        * security/block-test.html:
+        * platform/gtk/security/block-test-expected.txt:
+        * platform/mac/security/block-test-expected.txt:
+        * platform/wpe/security/block-test-expected.txt:
+
 2017-09-28  Youenn Fablet  <[email protected]>
 
         [mac-wk1] Layout test webrtc/datachannel/bufferedAmountLowThreshold tests are flaky

Modified: trunk/LayoutTests/platform/gtk/security/block-test-expected.txt (222622 => 222623)


--- trunk/LayoutTests/platform/gtk/security/block-test-expected.txt	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/LayoutTests/platform/gtk/security/block-test-expected.txt	2017-09-28 19:22:47 UTC (rev 222623)
@@ -127,6 +127,10 @@
 http://255.255.255.255:6668/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6668/test.jpg">
 http://255.255.255.255:6669/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6669/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6669/test.jpg">
+http://255.255.255.255:6679/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6679/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6679/test.jpg">
+http://255.255.255.255:6697/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6697/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6697/test.jpg">
 http://255.255.255.255:65535/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:65535/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:65535/test.jpg">
 http://255.255.255.255:65536/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:65536/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)

Modified: trunk/LayoutTests/platform/mac/security/block-test-expected.txt (222622 => 222623)


--- trunk/LayoutTests/platform/mac/security/block-test-expected.txt	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/LayoutTests/platform/mac/security/block-test-expected.txt	2017-09-28 19:22:47 UTC (rev 222623)
@@ -129,6 +129,10 @@
 http://255.255.255.255:6668/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6668/test.jpg">
 http://255.255.255.255:6669/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6669/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6669/test.jpg">
+http://255.255.255.255:6679/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6679/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6679/test.jpg">
+http://255.255.255.255:6697/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6697/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6697/test.jpg">
 http://255.255.255.255:65535/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:65535/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:65535/test.jpg">
 http://255.255.255.255:0/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:0/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)

Modified: trunk/LayoutTests/platform/wpe/security/block-test-expected.txt (222622 => 222623)


--- trunk/LayoutTests/platform/wpe/security/block-test-expected.txt	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/LayoutTests/platform/wpe/security/block-test-expected.txt	2017-09-28 19:22:47 UTC (rev 222623)
@@ -129,6 +129,10 @@
 http://255.255.255.255:6668/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6668/test.jpg">
 http://255.255.255.255:6669/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6669/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6669/test.jpg">
+http://255.255.255.255:6679/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6679/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6679/test.jpg">
+http://255.255.255.255:6697/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6697/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6697/test.jpg">
 http://255.255.255.255:65535/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:65535/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:65535/test.jpg">
 http://255.255.255.255:0/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:0/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)

Modified: trunk/LayoutTests/security/block-test-expected.txt (222622 => 222623)


--- trunk/LayoutTests/security/block-test-expected.txt	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/LayoutTests/security/block-test-expected.txt	2017-09-28 19:22:47 UTC (rev 222623)
@@ -129,6 +129,10 @@
 http://255.255.255.255:6668/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6668/test.jpg">
 http://255.255.255.255:6669/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6669/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6669/test.jpg">
+http://255.255.255.255:6679/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6679/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6679/test.jpg">
+http://255.255.255.255:6697/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6697/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6697/test.jpg">
 http://255.255.255.255:65535/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:65535/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:65535/test.jpg">
 http://255.255.255.255:0/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:0/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)

Modified: trunk/LayoutTests/security/block-test.html (222622 => 222623)


--- trunk/LayoutTests/security/block-test.html	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/LayoutTests/security/block-test.html	2017-09-28 19:22:47 UTC (rev 222623)
@@ -6,7 +6,7 @@
       103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 139,
       143, 179, 389, 465, 512, 513, 514, 515, 526, 530, 531, 532,
       540, 556, 563, 587, 601, 636, 993, 995, 2049, 3659, 4045,
-      4190, 6000, 6665, 6666, 6667, 6668, 6669,
+      4190, 6000, 6665, 6666, 6667, 6668, 6669, 6679, 6697,
 
       // Port numbers that we consider to be invalid due to being out of range.
       Math.pow(2, 16) - 1, Math.pow(2, 16), Math.pow(2, 32) - 1, Math.pow(2, 32)];

Modified: trunk/Source/WebCore/ChangeLog (222622 => 222623)


--- trunk/Source/WebCore/ChangeLog	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/Source/WebCore/ChangeLog	2017-09-28 19:22:47 UTC (rev 222623)
@@ -1,3 +1,16 @@
+2017-09-28  Brent Fulgham  <[email protected]>
+
+        Add ports 6679 and 6697 (IRC SSL) to port blacklist
+        https://bugs.webkit.org/show_bug.cgi?id=177544
+        <rdar://problem/34666525>
+
+        Reviewed by Alex Christensen.
+
+        Test: security/block-test.html
+
+        * platform/URL.cpp:
+        (WebCore::portAllowed): Also block port 6679.
+
 2017-09-28  Chris Dumez  <[email protected]>
 
         Unreviewed, speculative Windows build fix after r222613.

Modified: trunk/Source/WebCore/platform/URL.cpp (222622 => 222623)


--- trunk/Source/WebCore/platform/URL.cpp	2017-09-28 18:52:41 UTC (rev 222622)
+++ trunk/Source/WebCore/platform/URL.cpp	2017-09-28 19:22:47 UTC (rev 222623)
@@ -1278,6 +1278,8 @@
         6667, // Standard IRC [Apple addition]
         6668, // Alternate IRC [Apple addition]
         6669, // Alternate IRC [Apple addition]
+        6679, // Alternate IRC SSL [Apple addition]
+        6697, // IRC+SSL [Apple addition]
         invalidPortNumber, // Used to block all invalid port numbers
     };
 

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

Reply via email to