Fix to respect --explicitly-allowed-ports command line option

Source/modules/websockets/DOMWebSocket.cpp

Index: Source/modules/websockets/DOMWebSocket.cpp
diff --git a/Source/modules/websockets/DOMWebSocket.cpp b/Source/modules/websockets/DOMWebSocket.cpp
index 7b768003dd1df6d1d9d4c3e1130275623bb52c4c..cfdbfbbf0ffad4aced1582d2b1bf757713ac3272 100644
--- a/Source/modules/websockets/DOMWebSocket.cpp
+++ b/Source/modules/websockets/DOMWebSocket.cpp
@@ -52,7 +52,6 @@
 #include "platform/Logging.h"
 #include "platform/blob/BlobData.h"
 #include "platform/heap/Handle.h"
-#include "platform/weborigin/KnownPorts.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
@@ -303,7 +302,8 @@ void DOMWebSocket::connect(const String& url, const Vector<String>& protocols, E
         exceptionState.throwDOMException(SyntaxError, "The URL contains a fragment identifier ('" + m_url.fragmentIdentifier() + "'). Fragment identifiers are not allowed in WebSocket URLs.");
         return;
     }
-    if (!portAllowed(m_url)) {
+
+    if (!Platform::current()->portAllowed(m_url.port(), m_url.protocolIs("ftp"))) {

[eroman, 2015/04/10 01:55:56]

A couple things here:

  (1) It is weird to be calling m_url.port() in cases where the URL has no
specified port. In this case it will return 0, and relies on the assumption that
0 is an allowed port to pass. It would be better to only do the test if
m_url.hasPort().

 (2) Is it possible for the URL scheme to be anything other than "ws" or "wss" ?
The test for FTP would make sense in the general case, but it looks weird here.

 (3) The previous implementation of portAllowed() also explicitly checked for
"file" scheme and allowed everything on that. I don't think that is applicable
anymore, but the solution will depend on the answer to (2)

[Paritosh Kumar, 2015/04/10 12:52:35]

Updated in new CL.

 
As on line# 296 we are doing protocol check:
"if (!m_url.protocolIs("ws") && !m_url.protocolIs("wss")) {
    m_state = CLOSED;
    exceptionState.throwDOMException(SyntaxError, "The URL's scheme must be
either 'ws' or 'wss'. '" + m_url.protocol() + "' is not allowed.");
    return;
}"

So, URL scheme cannot be other than "ws" or "wss", here. So, should remove test
for FTP. Thanks.
Agree. No need of checking for file also. As per (2).

         m_state = CLOSED;
         exceptionState.throwSecurityError("The port " + String::number(m_url.port()) + " is not allowed.");
         return;