From c99869ba12bf151ce7f83382a0ce55f07da0d77f Mon Sep 17 00:00:00 2001 From: Brent Fulgham Date: Tue, 17 Oct 2017 07:50:57 +0000 Subject: [PATCH] Merge r222623 - Add ports 6679 and 6697 (IRC SSL) to port blacklist https://bugs.webkit.org/show_bug.cgi?id=177544 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 | 16 ++++++++++++++++ .../gtk/security/block-test-expected.txt | 4 ++++ .../mac/security/block-test-expected.txt | 4 ++++ .../wpe/security/block-test-expected.txt | 4 ++++ LayoutTests/security/block-test-expected.txt | 4 ++++ LayoutTests/security/block-test.html | 2 +- Source/WebCore/ChangeLog | 13 +++++++++++++ Source/WebCore/platform/URL.cpp | 2 ++ 8 files changed, 48 insertions(+), 1 deletion(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index c86e28df6895..dd43b7ad4949 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,19 @@ +2017-09-28 Brent Fulgham + + Add ports 6679 and 6697 (IRC SSL) to port blacklist + https://bugs.webkit.org/show_bug.cgi?id=177544 + + + 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 [REGRESSION] word-spacing property is incorrectly applied diff --git a/LayoutTests/platform/gtk/security/block-test-expected.txt b/LayoutTests/platform/gtk/security/block-test-expected.txt index 7dbd29762bc3..afaa9f64c804 100644 --- a/LayoutTests/platform/gtk/security/block-test-expected.txt +++ b/LayoutTests/platform/gtk/security/block-test-expected.txt @@ -127,6 +127,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest http://255.255.255.255:6669/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6679/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6697/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: http://255.255.255.255:65535/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: http://255.255.255.255:65536/test.jpg - willSendRequest redirectResponse (null) diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt index 580a4c6c39ed..605f12b9a15f 100644 --- a/LayoutTests/platform/mac/security/block-test-expected.txt +++ b/LayoutTests/platform/mac/security/block-test-expected.txt @@ -129,6 +129,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest http://255.255.255.255:6669/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6679/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6697/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: http://255.255.255.255:65535/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: http://255.255.255.255:0/test.jpg - willSendRequest redirectResponse (null) diff --git a/LayoutTests/platform/wpe/security/block-test-expected.txt b/LayoutTests/platform/wpe/security/block-test-expected.txt index 945dc036331d..7fb444c77e01 100644 --- a/LayoutTests/platform/wpe/security/block-test-expected.txt +++ b/LayoutTests/platform/wpe/security/block-test-expected.txt @@ -129,6 +129,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest http://255.255.255.255:6669/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6679/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6697/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: http://255.255.255.255:65535/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: http://255.255.255.255:0/test.jpg - willSendRequest redirectResponse (null) diff --git a/LayoutTests/security/block-test-expected.txt b/LayoutTests/security/block-test-expected.txt index 580a4c6c39ed..605f12b9a15f 100644 --- a/LayoutTests/security/block-test-expected.txt +++ b/LayoutTests/security/block-test-expected.txt @@ -129,6 +129,10 @@ http://255.255.255.255:6668/test.jpg - willSendRequest http://255.255.255.255:6669/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:6669/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6679/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6679/test.jpg - didFailLoadingWithError: +http://255.255.255.255:6697/test.jpg - willSendRequest redirectResponse (null) +http://255.255.255.255:6697/test.jpg - didFailLoadingWithError: http://255.255.255.255:65535/test.jpg - willSendRequest redirectResponse (null) http://255.255.255.255:65535/test.jpg - didFailLoadingWithError: http://255.255.255.255:0/test.jpg - willSendRequest redirectResponse (null) diff --git a/LayoutTests/security/block-test.html b/LayoutTests/security/block-test.html index 5c48ad8d067c..edde932b7e97 100644 --- a/LayoutTests/security/block-test.html +++ b/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)]; diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 5094e2e07d6f..cab609061f84 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2017-09-28 Brent Fulgham + + Add ports 6679 and 6697 (IRC SSL) to port blacklist + https://bugs.webkit.org/show_bug.cgi?id=177544 + + + Reviewed by Alex Christensen. + + Test: security/block-test.html + + * platform/URL.cpp: + (WebCore::portAllowed): Also block port 6679. + 2017-09-28 Zalan Bujtas AX: Defer RenderListBox selectionChanged event until after layout is done. diff --git a/Source/WebCore/platform/URL.cpp b/Source/WebCore/platform/URL.cpp index 1ef5555020eb..9d87b7fee721 100644 --- a/Source/WebCore/platform/URL.cpp +++ b/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 };