Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Side by Side Diff: net/websockets/websocket_handshake_handler_spdy_unittest.cc

Issue 17570014: [SPDY] Unfork websocket_handshake_handler_spdy{2,3}_unittest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/websockets/websocket_handshake_handler_spdy3_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/websockets/websocket_handshake_handler.h" 5 #include "net/websockets/websocket_handshake_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 #include "net/socket/next_proto.h"
10 #include "net/spdy/spdy_header_block.h" 11 #include "net/spdy/spdy_header_block.h"
12 #include "net/spdy/spdy_websocket_test_util.h"
11 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
12 14
13 namespace net { 15 namespace net {
14 16
15 namespace { 17 namespace {
16 18
17 TEST(WebSocketHandshakeHandlerSpdy2Test, RequestResponse) { 19 class WebSocketHandshakeHandlerSpdyTest
20 : public ::testing::Test,
21 public ::testing::WithParamInterface<NextProto> {
22 protected:
23 WebSocketHandshakeHandlerSpdyTest() : spdy_util_(GetParam()) {}
24
25 SpdyWebSocketTestUtil spdy_util_;
26 };
27
28 INSTANTIATE_TEST_CASE_P(
29 NextProto,
30 WebSocketHandshakeHandlerSpdyTest,
31 testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2));
32
33 TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponse) {
18 WebSocketHandshakeRequestHandler request_handler; 34 WebSocketHandshakeRequestHandler request_handler;
19 35
20 static const char kHandshakeRequestMessage[] = 36 static const char kHandshakeRequestMessage[] =
21 "GET /demo HTTP/1.1\r\n" 37 "GET /demo HTTP/1.1\r\n"
22 "Host: example.com\r\n" 38 "Host: example.com\r\n"
23 "Upgrade: websocket\r\n" 39 "Upgrade: websocket\r\n"
24 "Connection: Upgrade\r\n" 40 "Connection: Upgrade\r\n"
25 "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n" 41 "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
26 "Origin: http://example.com\r\n" 42 "Origin: http://example.com\r\n"
27 "Sec-WebSocket-Protocol: sample\r\n" 43 "Sec-WebSocket-Protocol: sample\r\n"
28 "Sec-WebSocket-Extensions: foo\r\n" 44 "Sec-WebSocket-Extensions: foo\r\n"
29 "Sec-WebSocket-Version: 13\r\n" 45 "Sec-WebSocket-Version: 13\r\n"
30 "\r\n"; 46 "\r\n";
31 47
32 EXPECT_TRUE(request_handler.ParseRequest(kHandshakeRequestMessage, 48 EXPECT_TRUE(request_handler.ParseRequest(kHandshakeRequestMessage,
33 strlen(kHandshakeRequestMessage))); 49 strlen(kHandshakeRequestMessage)));
34 EXPECT_EQ(13, request_handler.protocol_version()); 50 EXPECT_EQ(13, request_handler.protocol_version());
35 51
36 GURL url("ws://example.com/demo"); 52 GURL url("ws://example.com/demo");
37 std::string challenge; 53 std::string challenge;
38 SpdyHeaderBlock headers; 54 SpdyHeaderBlock headers;
39 ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, 55 ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url,
40 &headers, 56 &headers,
41 &challenge, 57 &challenge,
42 2)); 58 spdy_util_.spdy_version()));
43 59
44 EXPECT_EQ(url.path(), headers["path"]); 60 EXPECT_EQ(url.path(), spdy_util_.GetHeader(headers, "path"));
45 EXPECT_TRUE(headers.find("upgrade") == headers.end()); 61 EXPECT_TRUE(spdy_util_.GetHeader(headers, "upgrade").empty());
46 EXPECT_TRUE(headers.find("Upgrade") == headers.end()); 62 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Upgrade").empty());
47 EXPECT_TRUE(headers.find("connection") == headers.end()); 63 EXPECT_TRUE(spdy_util_.GetHeader(headers, "connection").empty());
48 EXPECT_TRUE(headers.find("Connection") == headers.end()); 64 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Connection").empty());
49 EXPECT_TRUE(headers.find("Sec-WebSocket-Key") == headers.end()); 65 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Sec-WebSocket-Key").empty());
50 EXPECT_TRUE(headers.find("sec-websocket-key") == headers.end()); 66 EXPECT_TRUE(spdy_util_.GetHeader(headers, "sec-websocket-key").empty());
51 EXPECT_TRUE(headers.find("Sec-WebSocket-Version") == headers.end()); 67 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Sec-WebSocket-Version").empty());
52 EXPECT_TRUE(headers.find("sec-webSocket-version") == headers.end()); 68 EXPECT_TRUE(spdy_util_.GetHeader(headers, "sec-webSocket-version").empty());
53 EXPECT_EQ("example.com", headers["host"]); 69 EXPECT_EQ("example.com", spdy_util_.GetHeader(headers, "host"));
54 EXPECT_EQ("http://example.com", headers["origin"]); 70 EXPECT_EQ("http://example.com", spdy_util_.GetHeader(headers, "origin"));
55 EXPECT_EQ("sample", headers["sec-websocket-protocol"]); 71 EXPECT_EQ("sample", spdy_util_.GetHeader(headers, "sec-websocket-protocol"));
56 EXPECT_EQ("foo", headers["sec-websocket-extensions"]); 72 EXPECT_EQ("foo", spdy_util_.GetHeader(headers, "sec-websocket-extensions"));
57 EXPECT_EQ("ws", headers["scheme"]); 73 EXPECT_EQ("ws", spdy_util_.GetHeader(headers, "scheme"));
58 EXPECT_EQ("WebSocket/13", headers["version"]); 74 EXPECT_EQ("WebSocket/13", spdy_util_.GetHeader(headers, "version"));
59 75
60 static const char expected_challenge[] = "dGhlIHNhbXBsZSBub25jZQ=="; 76 static const char expected_challenge[] = "dGhlIHNhbXBsZSBub25jZQ==";
61 77
62 EXPECT_EQ(expected_challenge, challenge); 78 EXPECT_EQ(expected_challenge, challenge);
63 79
64 headers.clear(); 80 headers.clear();
65 81
66 headers["status"] = "101 Switching Protocols"; 82 spdy_util_.SetHeader("status", "101 Switching Protocols", &headers);
67 headers["sec-websocket-protocol"] = "sample"; 83 spdy_util_.SetHeader("sec-websocket-protocol", "sample", &headers);
68 headers["sec-websocket-extensions"] = "foo"; 84 spdy_util_.SetHeader("sec-websocket-extensions", "foo", &headers);
69 85
70 WebSocketHandshakeResponseHandler response_handler; 86 WebSocketHandshakeResponseHandler response_handler;
71 response_handler.set_protocol_version(13); 87 response_handler.set_protocol_version(13);
72 EXPECT_TRUE(response_handler.ParseResponseHeaderBlock(headers, 88 EXPECT_TRUE(response_handler.ParseResponseHeaderBlock(
73 challenge, 89 headers, challenge, spdy_util_.spdy_version()));
74 2));
75 EXPECT_TRUE(response_handler.HasResponse()); 90 EXPECT_TRUE(response_handler.HasResponse());
76 91
77 // Note that order of sec-websocket-* is sensitive with hash_map order. 92 // Note that order of sec-websocket-* is sensitive with hash_map order.
78 static const char kHandshakeResponseExpectedMessage[] = 93 static const char kHandshakeResponseExpectedMessage[] =
79 "HTTP/1.1 101 Switching Protocols\r\n" 94 "HTTP/1.1 101 Switching Protocols\r\n"
80 "Upgrade: websocket\r\n" 95 "Upgrade: websocket\r\n"
81 "Connection: Upgrade\r\n" 96 "Connection: Upgrade\r\n"
82 "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n" 97 "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
83 "sec-websocket-extensions: foo\r\n" 98 "sec-websocket-extensions: foo\r\n"
84 "sec-websocket-protocol: sample\r\n" 99 "sec-websocket-protocol: sample\r\n"
85 "\r\n"; 100 "\r\n";
86 101
87 EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse()); 102 EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse());
88 } 103 }
89 104
90 TEST(WebSocketHandshakeHandlerSpdy2Test, RequestResponseWithCookies) { 105 TEST_P(WebSocketHandshakeHandlerSpdyTest, RequestResponseWithCookies) {
91 WebSocketHandshakeRequestHandler request_handler; 106 WebSocketHandshakeRequestHandler request_handler;
92 107
93 // Note that websocket won't use multiple headers in request now. 108 // Note that websocket won't use multiple headers in request now.
94 static const char kHandshakeRequestMessage[] = 109 static const char kHandshakeRequestMessage[] =
95 "GET /demo HTTP/1.1\r\n" 110 "GET /demo HTTP/1.1\r\n"
96 "Host: example.com\r\n" 111 "Host: example.com\r\n"
97 "Upgrade: websocket\r\n" 112 "Upgrade: websocket\r\n"
98 "Connection: Upgrade\r\n" 113 "Connection: Upgrade\r\n"
99 "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n" 114 "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
100 "Origin: http://example.com\r\n" 115 "Origin: http://example.com\r\n"
101 "Sec-WebSocket-Protocol: sample\r\n" 116 "Sec-WebSocket-Protocol: sample\r\n"
102 "Sec-WebSocket-Extensions: foo\r\n" 117 "Sec-WebSocket-Extensions: foo\r\n"
103 "Sec-WebSocket-Version: 13\r\n" 118 "Sec-WebSocket-Version: 13\r\n"
104 "Cookie: WK-websocket-test=1; WK-websocket-test-httponly=1\r\n" 119 "Cookie: WK-websocket-test=1; WK-websocket-test-httponly=1\r\n"
105 "\r\n"; 120 "\r\n";
106 121
107 EXPECT_TRUE(request_handler.ParseRequest(kHandshakeRequestMessage, 122 EXPECT_TRUE(request_handler.ParseRequest(kHandshakeRequestMessage,
108 strlen(kHandshakeRequestMessage))); 123 strlen(kHandshakeRequestMessage)));
109 EXPECT_EQ(13, request_handler.protocol_version()); 124 EXPECT_EQ(13, request_handler.protocol_version());
110 125
111 GURL url("ws://example.com/demo"); 126 GURL url("ws://example.com/demo");
112 std::string challenge; 127 std::string challenge;
113 SpdyHeaderBlock headers; 128 SpdyHeaderBlock headers;
114 ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url, 129 ASSERT_TRUE(request_handler.GetRequestHeaderBlock(url,
115 &headers, 130 &headers,
116 &challenge, 131 &challenge,
117 2)); 132 spdy_util_.spdy_version()));
118 133
119 EXPECT_EQ(url.path(), headers["path"]); 134 EXPECT_EQ(url.path(), spdy_util_.GetHeader(headers, "path"));
120 EXPECT_TRUE(headers.find("upgrade") == headers.end()); 135 EXPECT_TRUE(spdy_util_.GetHeader(headers, "upgrade").empty());
121 EXPECT_TRUE(headers.find("Upgrade") == headers.end()); 136 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Upgrade").empty());
122 EXPECT_TRUE(headers.find("connection") == headers.end()); 137 EXPECT_TRUE(spdy_util_.GetHeader(headers, "connection").empty());
123 EXPECT_TRUE(headers.find("Connection") == headers.end()); 138 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Connection").empty());
124 EXPECT_TRUE(headers.find("Sec-WebSocket-Key") == headers.end()); 139 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Sec-WebSocket-Key").empty());
125 EXPECT_TRUE(headers.find("sec-websocket-key") == headers.end()); 140 EXPECT_TRUE(spdy_util_.GetHeader(headers, "sec-websocket-key").empty());
126 EXPECT_TRUE(headers.find("Sec-WebSocket-Version") == headers.end()); 141 EXPECT_TRUE(spdy_util_.GetHeader(headers, "Sec-WebSocket-Version").empty());
127 EXPECT_TRUE(headers.find("sec-webSocket-version") == headers.end()); 142 EXPECT_TRUE(spdy_util_.GetHeader(headers, "sec-webSocket-version").empty());
128 EXPECT_EQ("example.com", headers["host"]); 143 EXPECT_EQ("example.com", spdy_util_.GetHeader(headers, "host"));
129 EXPECT_EQ("http://example.com", headers["origin"]); 144 EXPECT_EQ("http://example.com", spdy_util_.GetHeader(headers, "origin"));
130 EXPECT_EQ("sample", headers["sec-websocket-protocol"]); 145 EXPECT_EQ("sample", spdy_util_.GetHeader(headers, "sec-websocket-protocol"));
131 EXPECT_EQ("foo", headers["sec-websocket-extensions"]); 146 EXPECT_EQ("foo", spdy_util_.GetHeader(headers, "sec-websocket-extensions"));
132 EXPECT_EQ("ws", headers["scheme"]); 147 EXPECT_EQ("ws", spdy_util_.GetHeader(headers, "scheme"));
133 EXPECT_EQ("WebSocket/13", headers["version"]); 148 EXPECT_EQ("WebSocket/13", spdy_util_.GetHeader(headers, "version"));
134 EXPECT_EQ("WK-websocket-test=1; WK-websocket-test-httponly=1", 149 EXPECT_EQ("WK-websocket-test=1; WK-websocket-test-httponly=1",
135 headers["cookie"]); 150 headers["cookie"]);
136 151
137 const char expected_challenge[] = "dGhlIHNhbXBsZSBub25jZQ=="; 152 const char expected_challenge[] = "dGhlIHNhbXBsZSBub25jZQ==";
138 153
139 EXPECT_EQ(expected_challenge, challenge); 154 EXPECT_EQ(expected_challenge, challenge);
140 155
141 headers.clear(); 156 headers.clear();
142 157
143 headers["status"] = "101 Switching Protocols"; 158 spdy_util_.SetHeader("status", "101 Switching Protocols", &headers);
144 headers["sec-websocket-protocol"] = "sample"; 159 spdy_util_.SetHeader("sec-websocket-protocol", "sample", &headers);
145 headers["sec-websocket-extensions"] = "foo"; 160 spdy_util_.SetHeader("sec-websocket-extensions", "foo", &headers);
146 std::string cookie = "WK-websocket-test=1"; 161 std::string cookie = "WK-websocket-test=1";
147 cookie.append(1, '\0'); 162 cookie.append(1, '\0');
148 cookie += "WK-websocket-test-httponly=1; HttpOnly"; 163 cookie += "WK-websocket-test-httponly=1; HttpOnly";
149 headers["set-cookie"] = cookie; 164 headers["set-cookie"] = cookie;
150 165
151 166
152 WebSocketHandshakeResponseHandler response_handler; 167 WebSocketHandshakeResponseHandler response_handler;
153 response_handler.set_protocol_version(13); 168 response_handler.set_protocol_version(13);
154 EXPECT_TRUE(response_handler.ParseResponseHeaderBlock(headers, 169 EXPECT_TRUE(response_handler.ParseResponseHeaderBlock(
155 challenge, 170 headers, challenge, spdy_util_.spdy_version()));
156 2));
157 EXPECT_TRUE(response_handler.HasResponse()); 171 EXPECT_TRUE(response_handler.HasResponse());
158 172
159 // Note that order of sec-websocket-* is sensitive with hash_map order. 173 // Note that order of sec-websocket-* is sensitive with hash_map order.
160 static const char kHandshakeResponseExpectedMessage[] = 174 static const char kHandshakeResponseExpectedMessage[] =
161 "HTTP/1.1 101 Switching Protocols\r\n" 175 "HTTP/1.1 101 Switching Protocols\r\n"
162 "Upgrade: websocket\r\n" 176 "Upgrade: websocket\r\n"
163 "Connection: Upgrade\r\n" 177 "Connection: Upgrade\r\n"
164 "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n" 178 "Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
165 "sec-websocket-extensions: foo\r\n" 179 "sec-websocket-extensions: foo\r\n"
166 "sec-websocket-protocol: sample\r\n" 180 "sec-websocket-protocol: sample\r\n"
167 "set-cookie: WK-websocket-test=1\r\n" 181 "set-cookie: WK-websocket-test=1\r\n"
168 "set-cookie: WK-websocket-test-httponly=1; HttpOnly\r\n" 182 "set-cookie: WK-websocket-test-httponly=1; HttpOnly\r\n"
169 "\r\n"; 183 "\r\n";
170 184
171 EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse()); 185 EXPECT_EQ(kHandshakeResponseExpectedMessage, response_handler.GetResponse());
172 } 186 }
173 187
174 } // namespace 188 } // namespace
175 189
176 } // namespace net 190 } // namespace net
OLDNEW
« no previous file with comments | « net/websockets/websocket_handshake_handler_spdy3_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698