Add port 4190 (managesieve) to port blacklist

https://bugs.webkit.org/show_bug.cgi?id=156986
<rdar://problem/9119470>

Reviewed by Daniel Bates.

Source/WebCore:

Tested by security/block-test.html.

* platform/URL.cpp:
(WebCore::portAllowed): Add 4190 to the port blacklist.

LayoutTests:

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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@200056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 05cfdb1..023336d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2016-04-25  Brent Fulgham  <bfulgham@apple.com>
+
+        Add port 4190 (managesieve) to port blacklist
+        https://bugs.webkit.org/show_bug.cgi?id=156986
+        <rdar://problem/9119470>
+
+        Reviewed by Daniel Bates.
+
+        * platform/mac/security/block-test-expected.txt
+        * security/block-test-expected.txt:
+        * security/block-test.html:
+
 2016-04-25  Ryan Haddad  <ryanhaddad@apple.com>
 
         Rebaseline editing tests for ios-simulator-wk1

diff --git a/LayoutTests/platform/mac/security/block-test-expected.txt b/LayoutTests/platform/mac/security/block-test-expected.txt
index 5f83ab9..2b8e02d 100644 (file)
--- a/LayoutTests/platform/mac/security/block-test-expected.txt
+++ b/LayoutTests/platform/mac/security/block-test-expected.txt
@@ -115,6 +115,8 @@ http://255.255.255.255:3659/test.jpg - willSendRequest <NSURLRequest URL http://
 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)

diff --git a/LayoutTests/security/block-test-expected.txt b/LayoutTests/security/block-test-expected.txt
index 5f83ab9..2b8e02d 100644 (file)
--- a/LayoutTests/security/block-test-expected.txt
+++ b/LayoutTests/security/block-test-expected.txt
@@ -115,6 +115,8 @@ http://255.255.255.255:3659/test.jpg - willSendRequest <NSURLRequest URL http://
 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)

diff --git a/LayoutTests/security/block-test.html b/LayoutTests/security/block-test.html
index 2a7e930..5c48ad8 100644 (file)
--- 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,
-      6000, 6665, 6666, 6667, 6668, 6669,
+      4190, 6000, 6665, 6666, 6667, 6668, 6669,
 
       // 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 35b150d..f87927f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2016-04-25  Brent Fulgham  <bfulgham@apple.com>
+
+        Add port 4190 (managesieve) to port blacklist
+        https://bugs.webkit.org/show_bug.cgi?id=156986
+        <rdar://problem/9119470>
+
+        Reviewed by Daniel Bates.
+
+        Tested by security/block-test.html.
+
+        * platform/URL.cpp:
+        (WebCore::portAllowed): Add 4190 to the port blacklist.
+
 2016-04-25  Nan Wang  <n_wang@apple.com>
 
         AX: Crash at -[WebAccessibilityObjectWrapper accessibilityAttributeValue:] + 4391

diff --git a/Source/WebCore/platform/URL.cpp b/Source/WebCore/platform/URL.cpp
index e42e9ec..92b4f35 100644 (file)
--- a/Source/WebCore/platform/URL.cpp
+++ b/Source/WebCore/platform/URL.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008, 2011, 2012, 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2007, 2008, 2011, 2012, 2013, 2015-2016 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -2101,6 +2101,7 @@ bool portAllowed(const URL& url)
         2049, // NFS
         3659, // apple-sasl / PasswordServer [Apple addition]
         4045, // lockd
+        4190, // ManageSieve [Apple addition]
         6000, // X11
         6665, // Alternate IRC [Apple addition]
         6666, // Alternate IRC [Apple addition]