CSP: Adding the 'upgrade-insecure-requests' directive.

Source/modules/websockets/DOMWebSocketTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/websockets/DOMWebSocket.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
+#include "core/dom/SecurityContext.h"
 #include "core/fileapi/Blob.h"
 #include "core/frame/ConsoleTypes.h"
 #include "core/testing/DummyPageHolder.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/testing/WTFTestHelpers.h"
 #include "wtf/text/WTFString.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <v8.h>
@@ skipping 157 matching lines @@
     subprotocols.append("@subprotocol-|'\"x\x01\x02\x03x");
 
     m_websocket->connect("ws://example.com/", subprotocols, m_exceptionState);
 
     EXPECT_TRUE(m_exceptionState.hadException());
     EXPECT_EQ(SyntaxError, m_exceptionState.code());
     EXPECT_EQ("The subprotocol '@subprotocol-|'\"x\\u0001\\u0002\\u0003x' is invalid.", m_exceptionState.message());
     EXPECT_EQ(DOMWebSocket::CLOSED, m_websocket->readyState());
 }
 
+TEST_F(DOMWebSocketTest, insecureContentUpgrade)
+{
+    {
+        InSequence s;
+        EXPECT_CALL(channel(), connect(KURL(KURL(), "wss://example.com/endpoint"), String())).WillOnce(Return(true));
+    }
+
+    m_pageHolder->document().setInsecureContentPolicy(SecurityContext::InsecureContentUpgrade);
+    m_websocket->connect("ws://example.com/endpoint", Vector<String>(), m_exceptionState);
+
+    EXPECT_FALSE(m_exceptionState.hadException());
+    EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
+    EXPECT_EQ(KURL(KURL(), "wss://example.com/endpoint"), m_websocket->url());
+}
+
+TEST_F(DOMWebSocketTest, insecureContentDoNotUpgrade)
+{
+    {
+        InSequence s;
+        EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/endpoint"), String())).WillOnce(Return(true));
+    }
+
+    m_pageHolder->document().setInsecureContentPolicy(SecurityContext::InsecureContentDoNotUpgrade);
+    m_websocket->connect("ws://example.com/endpoint", Vector<String>(), m_exceptionState);
+
+    EXPECT_FALSE(m_exceptionState.hadException());
+    EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
+    EXPECT_EQ(KURL(KURL(), "ws://example.com/endpoint"), m_websocket->url());
+}
+
+TEST_F(DOMWebSocketTest, insecureContentMonitor)
+{
+    {
+        InSequence s;
+        EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/endpoint"), String())).WillOnce(Return(true));
+    }
+
+    m_pageHolder->document().setInsecureContentPolicy(SecurityContext::InsecureContentMonitor);
+    m_websocket->connect("ws://example.com/endpoint", Vector<String>(), m_exceptionState);
+
+    EXPECT_FALSE(m_exceptionState.hadException());
+    EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
+    EXPECT_EQ(KURL(KURL(), "ws://example.com/endpoint"), m_websocket->url());
+}
+
 TEST_F(DOMWebSocketTest, channelConnectSuccess)
 {
     Vector<String> subprotocols;
     subprotocols.append("aa");
     subprotocols.append("bb");
 
     {
         InSequence s;
         EXPECT_CALL(channel(), connect(KURL(KURL(), "ws://example.com/hoge"), String("aa, bb"))).WillOnce(Return(true));
     }
@@ skipping 497 matching lines @@
     EXPECT_EQ(InvalidAccessError, m_exceptionState.code());
     EXPECT_EQ(String::format("The code must be either 1000, or between 3000 and 4999. %d is neither.", GetParam()), m_exceptionState.message());
     EXPECT_EQ(DOMWebSocket::CONNECTING, m_websocket->readyState());
 }
 
 INSTANTIATE_TEST_CASE_P(DOMWebSocketInvalidClosingCode, DOMWebSocketInvalidClosingCodeTest, ::testing::Values(0, 1, 998, 999, 1001, 2999, 5000, 9999, 65535));
 
 } // namespace
 
 } // namespace blink