Merge r222623 - 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:

LayoutTests/ChangeLog

@@ -1,3 +1,19 @@
+2017-09-28  Brent Fulgham  <bfulgham@apple.com>
+
+        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-27  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         [REGRESSION] word-spacing property is incorrectly applied

LayoutTests/platform/gtk/security/block-test-expected.txt

@@ -127,6 +127,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest <NSURLRequest URL http://
 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)

LayoutTests/platform/mac/security/block-test-expected.txt

@@ -129,6 +129,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest <NSURLRequest URL http://
 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)

LayoutTests/platform/wpe/security/block-test-expected.txt

@@ -129,6 +129,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest <NSURLRequest URL http://
 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)

LayoutTests/security/block-test-expected.txt

@@ -129,6 +129,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest <NSURLRequest URL http://
 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)

LayoutTests/security/block-test.html

@@ -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)];

Source/WebCore/ChangeLog

@@ -1,3 +1,16 @@
+2017-09-28  Brent Fulgham  <bfulgham@apple.com>
+
+        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  Zalan Bujtas  <zalan@apple.com>
 
         AX: Defer RenderListBox selectionChanged event until after layout is done.

Source/WebCore/platform/URL.cpp

@@ -1268,6 +1268,8 @@ bool portAllowed(const URL& url)
         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
     };