[webkit-changes] [231050] trunk

Thu, 26 Apr 2018 10:13:17 -0700

Title: [231050] trunk
Revision
231050
Author
[email protected]
Date
2018-04-26 10:12:46 -0700 (Thu, 26 Apr 2018)

Log Message

Add port 548 (afpovertcp) to port blacklist
https://bugs.webkit.org/show_bug.cgi?id=185000
<rdar://problem/39540481>

Reviewed by David Kilzer.

Source/WebCore:

Tested by security/block-test.html.

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

LayoutTests:

Update test and expectations for new port.

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

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (231049 => 231050)


--- trunk/LayoutTests/ChangeLog	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/LayoutTests/ChangeLog	2018-04-26 17:12:46 UTC (rev 231050)
@@ -1,3 +1,19 @@
+2018-04-25  Brent Fulgham  <[email protected]>
+
+        Add port 548 (afpovertcp) to port blacklist
+        https://bugs.webkit.org/show_bug.cgi?id=185000
+        <rdar://problem/39540481>
+
+        Reviewed by David Kilzer.
+
+        Update test and expectations for new port.
+
+        * platform/gtk/security/block-test-expected.txt:
+        * platform/mac/security/block-test-expected.txt:
+        * platform/wpe/security/block-test-expected.txt:
+        * security/block-test-expected.txt:
+        * security/block-test.html:
+
 2018-04-26  Carlos Alberto Lopez Perez  <[email protected]>
 
         [WPE] Gardening of tests for the WPE Debug bot.

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


--- trunk/LayoutTests/platform/gtk/security/block-test-expected.txt	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/LayoutTests/platform/gtk/security/block-test-expected.txt	2018-04-26 17:12:46 UTC (rev 231050)
@@ -1,5 +1,5 @@
 http://255.255.255.255:1/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:1/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
+block-test.html - didFinishLoading
 http://255.255.255.255:1/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:1/test.jpg">
 http://255.255.255.255:7/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:7/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:7/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:7/test.jpg">
@@ -95,6 +95,8 @@
 http://255.255.255.255:532/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:532/test.jpg">
 http://255.255.255.255:540/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:540/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:540/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:540/test.jpg">
+http://255.255.255.255:548/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:548/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:548/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:548/test.jpg">
 http://255.255.255.255:556/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:556/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:556/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:556/test.jpg">
 http://255.255.255.255:563/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:563/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
@@ -115,6 +117,8 @@
 http://255.255.255.255:3659/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:3659/test.jpg">
 http://255.255.255.255:4045/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:4045/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:4045/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:4045/test.jpg">
+http://255.255.255.255:4190/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:4190/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:4190/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:4190/test.jpg">
 http://255.255.255.255:6000/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6000/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:6000/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:6000/test.jpg">
 http://255.255.255.255:6665/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:6665/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
@@ -133,24 +137,18 @@
 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)
-http://255.255.255.255:65536/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:65536/test.jpg">
-http://255.255.255.255:4294967295/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:4294967295/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255:4294967295/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:4294967295/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)
+http://255.255.255.255:0/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255:0/test.jpg">
 http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code 4, failing URL "http://255.255.255.255:4294967296/test.jpg">
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
 http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code 4, failing URL "http://255.255.255.255:0/test.jpg">
-http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code 4, failing URL "http://255.255.255.255/test.jpg">
-http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code 4, failing URL "http://255.255.255.255/test.jpg">
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
 ftp://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255:22/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255:22/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255:22/test.jpg">
+ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255:22/test.jpg">
 This test attempts to change the src of an IMG tag to all black listed ports to confirm that WebKit returns the correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree

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


--- trunk/LayoutTests/platform/mac/security/block-test-expected.txt	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/LayoutTests/platform/mac/security/block-test-expected.txt	2018-04-26 17:12:46 UTC (rev 231050)
@@ -95,6 +95,8 @@
 http://255.255.255.255:532/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:532/test.jpg">
 http://255.255.255.255:540/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:540/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:540/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:540/test.jpg">
+http://255.255.255.255:548/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:548/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:548/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:548/test.jpg">
 http://255.255.255.255:556/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:556/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:556/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:556/test.jpg">
 http://255.255.255.255:563/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:563/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)

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


--- trunk/LayoutTests/platform/wpe/security/block-test-expected.txt	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/LayoutTests/platform/wpe/security/block-test-expected.txt	2018-04-26 17:12:46 UTC (rev 231050)
@@ -95,6 +95,8 @@
 http://255.255.255.255:532/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:532/test.jpg">
 http://255.255.255.255:540/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:540/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:540/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:540/test.jpg">
+http://255.255.255.255:548/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:548/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:548/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:548/test.jpg">
 http://255.255.255.255:556/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:556/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:556/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:556/test.jpg">
 http://255.255.255.255:563/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:563/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
@@ -136,17 +138,17 @@
 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)
-http://255.255.255.255:0/test.jpg - didFailLoadingWithError: <NSError domain soup_http_error_quark, code 4, failing URL "http://255.255.255.255/test.jpg">
+http://255.255.255.255:0/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255:0/test.jpg">
 http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain soup_http_error_quark, code 4, failing URL "http://255.255.255.255/test.jpg">
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
 http://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain soup_http_error_quark, code 4, failing URL "http://255.255.255.255/test.jpg">
+http://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1004, failing URL "http://255.255.255.255/test.jpg">
 ftp://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255/test.jpg">
+ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255:22/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255:22/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
-ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255:22/test.jpg">
+ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255:22/test.jpg">
 This test attempts to change the src of an IMG tag to all black listed ports to confirm that WebKit returns the correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree

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


--- trunk/LayoutTests/security/block-test-expected.txt	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/LayoutTests/security/block-test-expected.txt	2018-04-26 17:12:46 UTC (rev 231050)
@@ -95,6 +95,8 @@
 http://255.255.255.255:532/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:532/test.jpg">
 http://255.255.255.255:540/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:540/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:540/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:540/test.jpg">
+http://255.255.255.255:548/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:548/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
+http://255.255.255.255:548/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:548/test.jpg">
 http://255.255.255.255:556/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:556/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 http://255.255.255.255:556/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 103, failing URL "http://255.255.255.255:556/test.jpg">
 http://255.255.255.255:563/test.jpg - willSendRequest <NSURLRequest URL http://255.255.255.255:563/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)

Modified: trunk/LayoutTests/security/block-test.html (231049 => 231050)


--- trunk/LayoutTests/security/block-test.html	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/LayoutTests/security/block-test.html	2018-04-26 17:12:46 UTC (rev 231050)
@@ -5,7 +5,7 @@
       21, 22, 23, 25, 37, 42, 43, 53, 77, 79, 87, 95, 101, 102,
       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,
+      540, 548, 556, 563, 587, 601, 636, 993, 995, 2049, 3659, 4045,
       4190, 6000, 6665, 6666, 6667, 6668, 6669, 6679, 6697,
 
       // Port numbers that we consider to be invalid due to being out of range.

Modified: trunk/Source/WebCore/ChangeLog (231049 => 231050)


--- trunk/Source/WebCore/ChangeLog	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/Source/WebCore/ChangeLog	2018-04-26 17:12:46 UTC (rev 231050)
@@ -1,3 +1,16 @@
+2018-04-25  Brent Fulgham  <[email protected]>
+
+        Add port 548 (afpovertcp) to port blacklist
+        https://bugs.webkit.org/show_bug.cgi?id=185000
+        <rdar://problem/39540481>
+
+        Reviewed by David Kilzer.
+
+        Tested by security/block-test.html.
+
+        * platform/URL.cpp:
+        (WebCore::portAllowed):Also block port 548.
+
 2018-04-26  Andy VanWagoner  <[email protected]>
 
         [INTL] Implement Intl.PluralRules

Modified: trunk/Source/WebCore/platform/URL.cpp (231049 => 231050)


--- trunk/Source/WebCore/platform/URL.cpp	2018-04-26 16:48:45 UTC (rev 231049)
+++ trunk/Source/WebCore/platform/URL.cpp	2018-04-26 17:12:46 UTC (rev 231050)
@@ -983,6 +983,7 @@
         531,  // Chat
         532,  // netnews
         540,  // UUCP
+        548,  // afpovertcp [Apple addition]
         556,  // remotefs
         563,  // NNTP+SSL
         587,  // ESMTP

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

Reply via email to