OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 | 11 |
12 #include <algorithm> | 12 #include <algorithm> |
13 #include <set> | 13 #include <set> |
14 #include <string> | 14 #include <string> |
15 | 15 |
16 #include "webrtc/base/bufferqueue.h" | |
16 #include "webrtc/base/gunit.h" | 17 #include "webrtc/base/gunit.h" |
17 #include "webrtc/base/helpers.h" | 18 #include "webrtc/base/helpers.h" |
18 #include "webrtc/base/scoped_ptr.h" | 19 #include "webrtc/base/scoped_ptr.h" |
19 #include "webrtc/base/ssladapter.h" | 20 #include "webrtc/base/ssladapter.h" |
20 #include "webrtc/base/sslconfig.h" | 21 #include "webrtc/base/sslconfig.h" |
21 #include "webrtc/base/sslidentity.h" | 22 #include "webrtc/base/sslidentity.h" |
22 #include "webrtc/base/sslstreamadapter.h" | 23 #include "webrtc/base/sslstreamadapter.h" |
23 #include "webrtc/base/stream.h" | 24 #include "webrtc/base/stream.h" |
24 #include "webrtc/test/testsupport/gtest_disable.h" | 25 #include "webrtc/test/testsupport/gtest_disable.h" |
25 | 26 |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 "-----END CERTIFICATE-----\n"; | 68 "-----END CERTIFICATE-----\n"; |
68 | 69 |
69 #define MAYBE_SKIP_TEST(feature) \ | 70 #define MAYBE_SKIP_TEST(feature) \ |
70 if (!(rtc::SSLStreamAdapter::feature())) { \ | 71 if (!(rtc::SSLStreamAdapter::feature())) { \ |
71 LOG(LS_INFO) << "Feature disabled... skipping"; \ | 72 LOG(LS_INFO) << "Feature disabled... skipping"; \ |
72 return; \ | 73 return; \ |
73 } | 74 } |
74 | 75 |
75 class SSLStreamAdapterTestBase; | 76 class SSLStreamAdapterTestBase; |
76 | 77 |
77 class SSLDummyStream : public rtc::StreamInterface, | 78 class SSLDummyStreamBase : public rtc::StreamInterface, |
78 public sigslot::has_slots<> { | 79 public sigslot::has_slots<> { |
79 public: | 80 public: |
80 explicit SSLDummyStream(SSLStreamAdapterTestBase *test, | 81 SSLDummyStreamBase(SSLStreamAdapterTestBase* test, |
81 const std::string &side, | 82 const std::string &side) : |
82 rtc::FifoBuffer *in, | 83 test_base_(test), |
83 rtc::FifoBuffer *out) : | |
84 test_(test), | |
85 side_(side), | 84 side_(side), |
86 in_(in), | |
87 out_(out), | |
88 first_packet_(true) { | 85 first_packet_(true) { |
89 in_->SignalEvent.connect(this, &SSLDummyStream::OnEventIn); | |
90 out_->SignalEvent.connect(this, &SSLDummyStream::OnEventOut); | |
91 } | 86 } |
92 | 87 |
93 virtual rtc::StreamState GetState() const { return rtc::SS_OPEN; } | 88 virtual rtc::StreamState GetState() const { return rtc::SS_OPEN; } |
94 | 89 |
90 virtual rtc::StreamResult Write(const void* data, size_t data_len, | |
91 size_t* written, int* error); | |
92 | |
93 virtual rtc::StreamResult WriteData(const void* data, size_t data_len, | |
94 size_t* written, int* error) = 0; | |
95 | |
96 protected: | |
97 SSLStreamAdapterTestBase* test_base_; | |
98 const std::string side_; | |
99 bool first_packet_; | |
100 }; | |
101 | |
102 class SSLDummyStreamTLS : public SSLDummyStreamBase { | |
103 public: | |
104 SSLDummyStreamTLS(SSLStreamAdapterTestBase* test, | |
105 const std::string& side, | |
106 rtc::FifoBuffer* in, | |
107 rtc::FifoBuffer* out) : | |
108 SSLDummyStreamBase(test, side), | |
109 in_(in), | |
110 out_(out) { | |
111 in_->SignalEvent.connect(this, &SSLDummyStreamTLS::OnEventIn); | |
112 out_->SignalEvent.connect(this, &SSLDummyStreamTLS::OnEventOut); | |
113 } | |
114 | |
95 virtual rtc::StreamResult Read(void* buffer, size_t buffer_len, | 115 virtual rtc::StreamResult Read(void* buffer, size_t buffer_len, |
96 size_t* read, int* error) { | 116 size_t* read, int* error) { |
97 rtc::StreamResult r; | 117 rtc::StreamResult r; |
98 | 118 |
99 r = in_->Read(buffer, buffer_len, read, error); | 119 r = in_->Read(buffer, buffer_len, read, error); |
100 if (r == rtc::SR_BLOCK) | 120 if (r == rtc::SR_BLOCK) |
101 return rtc::SR_BLOCK; | 121 return rtc::SR_BLOCK; |
102 if (r == rtc::SR_EOS) | 122 if (r == rtc::SR_EOS) |
103 return rtc::SR_EOS; | 123 return rtc::SR_EOS; |
104 | 124 |
105 if (r != rtc::SR_SUCCESS) { | 125 if (r != rtc::SR_SUCCESS) { |
106 ADD_FAILURE(); | 126 ADD_FAILURE(); |
107 return rtc::SR_ERROR; | 127 return rtc::SR_ERROR; |
108 } | 128 } |
109 | 129 |
110 return rtc::SR_SUCCESS; | 130 return rtc::SR_SUCCESS; |
111 } | 131 } |
112 | 132 |
113 // Catch readability events on in and pass them up. | 133 // Catch readability events on in and pass them up. |
114 virtual void OnEventIn(rtc::StreamInterface *stream, int sig, | 134 virtual void OnEventIn(rtc::StreamInterface *stream, int sig, |
115 int err) { | 135 int err) { |
116 int mask = (rtc::SE_READ | rtc::SE_CLOSE); | 136 int mask = (rtc::SE_READ | rtc::SE_CLOSE); |
117 | 137 |
118 if (sig & mask) { | 138 if (sig & mask) { |
119 LOG(LS_INFO) << "SSLDummyStream::OnEvent side=" << side_ << " sig=" | 139 LOG(LS_INFO) << "SSLDummyStreamTLS::OnEvent side=" << side_ << " sig=" |
120 << sig << " forwarding upward"; | 140 << sig << " forwarding upward"; |
121 PostEvent(sig & mask, 0); | 141 PostEvent(sig & mask, 0); |
122 } | 142 } |
123 } | 143 } |
124 | 144 |
125 // Catch writeability events on out and pass them up. | 145 // Catch writeability events on out and pass them up. |
126 virtual void OnEventOut(rtc::StreamInterface *stream, int sig, | 146 virtual void OnEventOut(rtc::StreamInterface *stream, int sig, |
127 int err) { | 147 int err) { |
128 if (sig & rtc::SE_WRITE) { | 148 if (sig & rtc::SE_WRITE) { |
129 LOG(LS_INFO) << "SSLDummyStream::OnEvent side=" << side_ << " sig=" | 149 LOG(LS_INFO) << "SSLDummyStreamTLS::OnEvent side=" << side_ << " sig=" |
130 << sig << " forwarding upward"; | 150 << sig << " forwarding upward"; |
131 | 151 |
132 PostEvent(sig & rtc::SE_WRITE, 0); | 152 PostEvent(sig & rtc::SE_WRITE, 0); |
133 } | 153 } |
134 } | 154 } |
135 | 155 |
136 // Write to the outgoing FifoBuffer | 156 // Write to the outgoing FifoBuffer |
137 rtc::StreamResult WriteData(const void* data, size_t data_len, | 157 virtual rtc::StreamResult WriteData(const void* data, size_t data_len, |
torbjorng (webrtc)
2015/11/16 14:05:03
Please omit "virtual" for override methods (here a
joachim
2015/11/16 21:30:16
Done.
| |
138 size_t* written, int* error) { | 158 size_t* written, int* error) override { |
139 return out_->Write(data, data_len, written, error); | 159 return out_->Write(data, data_len, written, error); |
140 } | 160 } |
141 | 161 |
142 // Defined later | |
143 virtual rtc::StreamResult Write(const void* data, size_t data_len, | |
144 size_t* written, int* error); | |
145 | |
146 virtual void Close() { | 162 virtual void Close() { |
147 LOG(LS_INFO) << "Closing outbound stream"; | 163 LOG(LS_INFO) << "Closing outbound stream"; |
148 out_->Close(); | 164 out_->Close(); |
149 } | 165 } |
150 | 166 |
151 private: | 167 private: |
152 SSLStreamAdapterTestBase *test_; | 168 rtc::FifoBuffer* in_; |
153 const std::string side_; | 169 rtc::FifoBuffer* out_; |
154 rtc::FifoBuffer *in_; | 170 }; |
155 rtc::FifoBuffer *out_; | 171 |
156 bool first_packet_; | 172 class SSLDummyStreamDTLS : public SSLDummyStreamBase { |
173 public: | |
174 SSLDummyStreamDTLS(SSLStreamAdapterTestBase* test, | |
175 const std::string& side, | |
176 rtc::BufferQueue* in, | |
177 rtc::BufferQueue* out) : | |
178 SSLDummyStreamBase(test, side), | |
179 in_(in), | |
180 out_(out), | |
181 closed_(false) { | |
182 in_->SignalEvent.connect(this, &SSLDummyStreamDTLS::OnEventIn); | |
183 out_->SignalEvent.connect(this, &SSLDummyStreamDTLS::OnEventOut); | |
184 } | |
185 | |
186 virtual rtc::StreamResult Read(void* buffer, size_t buffer_len, | |
187 size_t* read, int* error) { | |
188 if (closed_) { | |
189 return rtc::SR_ERROR; | |
190 } | |
191 if (!in_->ReadFront(buffer, buffer_len, read)) { | |
192 return rtc::SR_BLOCK; | |
193 } | |
194 return rtc::SR_SUCCESS; | |
195 } | |
196 | |
197 // Catch readability events on in and pass them up. | |
198 virtual void OnEventIn(rtc::BufferQueue* queue, int events) { | |
199 if (events & rtc::BQ_READ) { | |
200 LOG(LS_INFO) << "SSLDummyStreamDTLS::OnEvent side=" << side_ | |
201 << " events=" << events << " forwarding upward"; | |
202 PostEvent(rtc::SE_READ, 0); | |
203 } | |
204 } | |
205 | |
206 // Catch writeability events on out and pass them up. | |
207 virtual void OnEventOut(rtc::BufferQueue* queue, int events) { | |
208 if (events & rtc::BQ_WRITE) { | |
209 LOG(LS_INFO) << "SSLDummyStreamDTLS::OnEvent side=" << side_ | |
210 << " events=" << events << " forwarding upward"; | |
211 PostEvent(rtc::SE_WRITE, 0); | |
212 } | |
213 } | |
214 | |
215 // Write to the outgoing BufferQueue | |
216 virtual rtc::StreamResult WriteData(const void* data, size_t data_len, | |
217 size_t* written, int* error) override { | |
218 if (closed_) { | |
219 return rtc::SR_ERROR; | |
220 } | |
221 if (!out_->WriteBack(data, data_len, written)) { | |
222 return rtc::SR_BLOCK; | |
223 } | |
224 return rtc::SR_SUCCESS; | |
225 } | |
226 | |
227 virtual void Close() { | |
228 LOG(LS_INFO) << "Closing outbound stream"; | |
torbjorng (webrtc)
2015/11/16 14:05:03
Nit: Not a stream. :-)
joachim
2015/11/16 21:30:16
That was the comment of the original method, also
| |
229 closed_ = true; | |
230 } | |
231 | |
232 private: | |
233 rtc::BufferQueue* in_; | |
234 rtc::BufferQueue* out_; | |
235 bool closed_; | |
157 }; | 236 }; |
158 | 237 |
159 static const int kFifoBufferSize = 4096; | 238 static const int kFifoBufferSize = 4096; |
239 static const int kBufferCapacity = 1; | |
torbjorng (webrtc)
2015/11/16 14:05:03
I thought capacity >= size should hold for these b
joachim
2015/11/16 21:30:16
It's the size of the BufferQueue. If the caller tr
| |
240 static const size_t kDefaultBufferSize = 2048; | |
160 | 241 |
161 class SSLStreamAdapterTestBase : public testing::Test, | 242 class SSLStreamAdapterTestBase : public testing::Test, |
162 public sigslot::has_slots<> { | 243 public sigslot::has_slots<> { |
163 public: | 244 public: |
164 SSLStreamAdapterTestBase( | 245 SSLStreamAdapterTestBase( |
165 const std::string& client_cert_pem, | 246 const std::string& client_cert_pem, |
166 const std::string& client_private_key_pem, | 247 const std::string& client_private_key_pem, |
167 bool dtls, | 248 bool dtls, |
168 rtc::KeyParams client_key_type = rtc::KeyParams(rtc::KT_DEFAULT), | 249 rtc::KeyParams client_key_type = rtc::KeyParams(rtc::KT_DEFAULT), |
169 rtc::KeyParams server_key_type = rtc::KeyParams(rtc::KT_DEFAULT)) | 250 rtc::KeyParams server_key_type = rtc::KeyParams(rtc::KT_DEFAULT)) |
170 : client_buffer_(kFifoBufferSize), | 251 : client_cert_pem_(client_cert_pem), |
171 server_buffer_(kFifoBufferSize), | 252 client_private_key_pem_(client_private_key_pem), |
172 client_stream_( | 253 client_key_type_(client_key_type), |
173 new SSLDummyStream(this, "c2s", &client_buffer_, &server_buffer_)), | 254 server_key_type_(server_key_type), |
174 server_stream_( | 255 client_stream_(NULL), |
175 new SSLDummyStream(this, "s2c", &server_buffer_, &client_buffer_)), | 256 server_stream_(NULL), |
176 client_ssl_(rtc::SSLStreamAdapter::Create(client_stream_)), | |
177 server_ssl_(rtc::SSLStreamAdapter::Create(server_stream_)), | |
178 client_identity_(NULL), | 257 client_identity_(NULL), |
179 server_identity_(NULL), | 258 server_identity_(NULL), |
180 delay_(0), | 259 delay_(0), |
181 mtu_(1460), | 260 mtu_(1460), |
182 loss_(0), | 261 loss_(0), |
183 lose_first_packet_(false), | 262 lose_first_packet_(false), |
184 damage_(false), | 263 damage_(false), |
185 dtls_(dtls), | 264 dtls_(dtls), |
186 handshake_wait_(5000), | 265 handshake_wait_(5000), |
187 identities_set_(false) { | 266 identities_set_(false) { |
188 // Set use of the test RNG to get predictable loss patterns. | 267 // Set use of the test RNG to get predictable loss patterns. |
189 rtc::SetRandomTestMode(true); | 268 rtc::SetRandomTestMode(true); |
190 | |
191 // Set up the slots | |
192 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); | |
193 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); | |
194 | |
195 if (!client_cert_pem.empty() && !client_private_key_pem.empty()) { | |
196 client_identity_ = rtc::SSLIdentity::FromPEMStrings( | |
197 client_private_key_pem, client_cert_pem); | |
198 } else { | |
199 client_identity_ = rtc::SSLIdentity::Generate("client", client_key_type); | |
200 } | |
201 server_identity_ = rtc::SSLIdentity::Generate("server", server_key_type); | |
202 | |
203 client_ssl_->SetIdentity(client_identity_); | |
204 server_ssl_->SetIdentity(server_identity_); | |
205 } | 269 } |
206 | 270 |
207 ~SSLStreamAdapterTestBase() { | 271 ~SSLStreamAdapterTestBase() { |
208 // Put it back for the next test. | 272 // Put it back for the next test. |
209 rtc::SetRandomTestMode(false); | 273 rtc::SetRandomTestMode(false); |
210 } | 274 } |
211 | 275 |
276 virtual void SetUp() override { | |
277 CreateStreams(); | |
278 | |
279 client_ssl_.reset(rtc::SSLStreamAdapter::Create(client_stream_)); | |
280 server_ssl_.reset(rtc::SSLStreamAdapter::Create(server_stream_)); | |
281 | |
282 // Set up the slots | |
283 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); | |
284 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); | |
285 | |
286 if (!client_cert_pem_.empty() && !client_private_key_pem_.empty()) { | |
287 client_identity_ = rtc::SSLIdentity::FromPEMStrings( | |
288 client_private_key_pem_, client_cert_pem_); | |
289 } else { | |
290 client_identity_ = rtc::SSLIdentity::Generate("client", client_key_type_); | |
291 } | |
292 server_identity_ = rtc::SSLIdentity::Generate("server", server_key_type_); | |
293 | |
294 client_ssl_->SetIdentity(client_identity_); | |
295 server_ssl_->SetIdentity(server_identity_); | |
296 } | |
297 | |
298 virtual void TearDown() override { | |
299 client_ssl_.reset(nullptr); | |
300 server_ssl_.reset(nullptr); | |
301 } | |
302 | |
303 virtual void CreateStreams() = 0; | |
304 | |
212 // Recreate the client/server identities with the specified validity period. | 305 // Recreate the client/server identities with the specified validity period. |
213 // |not_before| and |not_after| are offsets from the current time in number | 306 // |not_before| and |not_after| are offsets from the current time in number |
214 // of seconds. | 307 // of seconds. |
215 void ResetIdentitiesWithValidity(int not_before, int not_after) { | 308 void ResetIdentitiesWithValidity(int not_before, int not_after) { |
216 client_stream_ = | 309 CreateStreams(); |
217 new SSLDummyStream(this, "c2s", &client_buffer_, &server_buffer_); | |
218 server_stream_ = | |
219 new SSLDummyStream(this, "s2c", &server_buffer_, &client_buffer_); | |
220 | 310 |
221 client_ssl_.reset(rtc::SSLStreamAdapter::Create(client_stream_)); | 311 client_ssl_.reset(rtc::SSLStreamAdapter::Create(client_stream_)); |
222 server_ssl_.reset(rtc::SSLStreamAdapter::Create(server_stream_)); | 312 server_ssl_.reset(rtc::SSLStreamAdapter::Create(server_stream_)); |
223 | 313 |
224 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); | 314 client_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); |
225 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); | 315 server_ssl_->SignalEvent.connect(this, &SSLStreamAdapterTestBase::OnEvent); |
226 | 316 |
227 rtc::SSLIdentityParams client_params; | 317 rtc::SSLIdentityParams client_params; |
228 client_params.key_params = rtc::KeyParams(rtc::KT_DEFAULT); | 318 client_params.key_params = rtc::KeyParams(rtc::KT_DEFAULT); |
229 client_params.common_name = "client"; | 319 client_params.common_name = "client"; |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
324 if (expect_success) { | 414 if (expect_success) { |
325 EXPECT_TRUE_WAIT((client_ssl_->GetState() == rtc::SS_OPEN) | 415 EXPECT_TRUE_WAIT((client_ssl_->GetState() == rtc::SS_OPEN) |
326 && (server_ssl_->GetState() == rtc::SS_OPEN), | 416 && (server_ssl_->GetState() == rtc::SS_OPEN), |
327 handshake_wait_); | 417 handshake_wait_); |
328 } else { | 418 } else { |
329 EXPECT_TRUE_WAIT(client_ssl_->GetState() == rtc::SS_CLOSED, | 419 EXPECT_TRUE_WAIT(client_ssl_->GetState() == rtc::SS_CLOSED, |
330 handshake_wait_); | 420 handshake_wait_); |
331 } | 421 } |
332 } | 422 } |
333 | 423 |
334 rtc::StreamResult DataWritten(SSLDummyStream *from, const void *data, | 424 rtc::StreamResult DataWritten(SSLDummyStreamBase *from, const void *data, |
335 size_t data_len, size_t *written, | 425 size_t data_len, size_t *written, |
336 int *error) { | 426 int *error) { |
337 // Randomly drop loss_ percent of packets | 427 // Randomly drop loss_ percent of packets |
338 if (rtc::CreateRandomId() % 100 < static_cast<uint32_t>(loss_)) { | 428 if (rtc::CreateRandomId() % 100 < static_cast<uint32_t>(loss_)) { |
339 LOG(LS_INFO) << "Randomly dropping packet, size=" << data_len; | 429 LOG(LS_INFO) << "Randomly dropping packet, size=" << data_len; |
340 *written = data_len; | 430 *written = data_len; |
341 return rtc::SR_SUCCESS; | 431 return rtc::SR_SUCCESS; |
342 } | 432 } |
343 if (dtls_ && (data_len > mtu_)) { | 433 if (dtls_ && (data_len > mtu_)) { |
344 LOG(LS_INFO) << "Dropping packet > mtu, size=" << data_len; | 434 LOG(LS_INFO) << "Dropping packet > mtu, size=" << data_len; |
345 *written = data_len; | 435 *written = data_len; |
346 return rtc::SR_SUCCESS; | 436 return rtc::SR_SUCCESS; |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
436 use_context, | 526 use_context, |
437 result, result_len); | 527 result, result_len); |
438 } | 528 } |
439 | 529 |
440 // To be implemented by subclasses. | 530 // To be implemented by subclasses. |
441 virtual void WriteData() = 0; | 531 virtual void WriteData() = 0; |
442 virtual void ReadData(rtc::StreamInterface *stream) = 0; | 532 virtual void ReadData(rtc::StreamInterface *stream) = 0; |
443 virtual void TestTransfer(int size) = 0; | 533 virtual void TestTransfer(int size) = 0; |
444 | 534 |
445 protected: | 535 protected: |
446 rtc::FifoBuffer client_buffer_; | 536 std::string client_cert_pem_; |
447 rtc::FifoBuffer server_buffer_; | 537 std::string client_private_key_pem_; |
448 SSLDummyStream *client_stream_; // freed by client_ssl_ destructor | 538 rtc::KeyParams client_key_type_; |
449 SSLDummyStream *server_stream_; // freed by server_ssl_ destructor | 539 rtc::KeyParams server_key_type_; |
540 SSLDummyStreamBase *client_stream_; // freed by client_ssl_ destructor | |
541 SSLDummyStreamBase *server_stream_; // freed by server_ssl_ destructor | |
450 rtc::scoped_ptr<rtc::SSLStreamAdapter> client_ssl_; | 542 rtc::scoped_ptr<rtc::SSLStreamAdapter> client_ssl_; |
451 rtc::scoped_ptr<rtc::SSLStreamAdapter> server_ssl_; | 543 rtc::scoped_ptr<rtc::SSLStreamAdapter> server_ssl_; |
452 rtc::SSLIdentity *client_identity_; // freed by client_ssl_ destructor | 544 rtc::SSLIdentity *client_identity_; // freed by client_ssl_ destructor |
453 rtc::SSLIdentity *server_identity_; // freed by server_ssl_ destructor | 545 rtc::SSLIdentity *server_identity_; // freed by server_ssl_ destructor |
454 int delay_; | 546 int delay_; |
455 size_t mtu_; | 547 size_t mtu_; |
456 int loss_; | 548 int loss_; |
457 bool lose_first_packet_; | 549 bool lose_first_packet_; |
458 bool damage_; | 550 bool damage_; |
459 bool dtls_; | 551 bool dtls_; |
460 int handshake_wait_; | 552 int handshake_wait_; |
461 bool identities_set_; | 553 bool identities_set_; |
462 }; | 554 }; |
463 | 555 |
464 class SSLStreamAdapterTestTLS | 556 class SSLStreamAdapterTestTLS |
465 : public SSLStreamAdapterTestBase, | 557 : public SSLStreamAdapterTestBase, |
466 public WithParamInterface<tuple<rtc::KeyParams, rtc::KeyParams>> { | 558 public WithParamInterface<tuple<rtc::KeyParams, rtc::KeyParams>> { |
467 public: | 559 public: |
468 SSLStreamAdapterTestTLS() | 560 SSLStreamAdapterTestTLS() |
469 : SSLStreamAdapterTestBase("", | 561 : SSLStreamAdapterTestBase("", |
470 "", | 562 "", |
471 false, | 563 false, |
472 ::testing::get<0>(GetParam()), | 564 ::testing::get<0>(GetParam()), |
473 ::testing::get<1>(GetParam())){}; | 565 ::testing::get<1>(GetParam())), |
566 client_buffer_(kFifoBufferSize), | |
567 server_buffer_(kFifoBufferSize) { | |
568 } | |
569 | |
570 virtual void CreateStreams() override { | |
571 client_stream_ = | |
572 new SSLDummyStreamTLS(this, "c2s", &client_buffer_, &server_buffer_); | |
573 server_stream_ = | |
574 new SSLDummyStreamTLS(this, "s2c", &server_buffer_, &client_buffer_); | |
575 } | |
474 | 576 |
475 // Test data transfer for TLS | 577 // Test data transfer for TLS |
476 virtual void TestTransfer(int size) { | 578 virtual void TestTransfer(int size) { |
477 LOG(LS_INFO) << "Starting transfer test with " << size << " bytes"; | 579 LOG(LS_INFO) << "Starting transfer test with " << size << " bytes"; |
478 // Create some dummy data to send. | 580 // Create some dummy data to send. |
479 size_t received; | 581 size_t received; |
480 | 582 |
481 send_stream_.ReserveSize(size); | 583 send_stream_.ReserveSize(size); |
482 for (int i = 0; i < size; ++i) { | 584 for (int i = 0; i < size; ++i) { |
483 char ch = static_cast<char>(i); | 585 char ch = static_cast<char>(i); |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
558 break; | 660 break; |
559 | 661 |
560 ASSERT_EQ(rtc::SR_SUCCESS, r); | 662 ASSERT_EQ(rtc::SR_SUCCESS, r); |
561 LOG(LS_INFO) << "Read " << bread; | 663 LOG(LS_INFO) << "Read " << bread; |
562 | 664 |
563 recv_stream_.Write(buffer, bread, NULL, NULL); | 665 recv_stream_.Write(buffer, bread, NULL, NULL); |
564 } | 666 } |
565 } | 667 } |
566 | 668 |
567 private: | 669 private: |
670 rtc::FifoBuffer client_buffer_; | |
671 rtc::FifoBuffer server_buffer_; | |
568 rtc::MemoryStream send_stream_; | 672 rtc::MemoryStream send_stream_; |
569 rtc::MemoryStream recv_stream_; | 673 rtc::MemoryStream recv_stream_; |
570 }; | 674 }; |
571 | 675 |
572 class SSLStreamAdapterTestDTLS | 676 class SSLStreamAdapterTestDTLS |
573 : public SSLStreamAdapterTestBase, | 677 : public SSLStreamAdapterTestBase, |
574 public WithParamInterface<tuple<rtc::KeyParams, rtc::KeyParams>> { | 678 public WithParamInterface<tuple<rtc::KeyParams, rtc::KeyParams>> { |
575 public: | 679 public: |
576 SSLStreamAdapterTestDTLS() | 680 SSLStreamAdapterTestDTLS() |
577 : SSLStreamAdapterTestBase("", | 681 : SSLStreamAdapterTestBase("", |
578 "", | 682 "", |
579 true, | 683 true, |
580 ::testing::get<0>(GetParam()), | 684 ::testing::get<0>(GetParam()), |
581 ::testing::get<1>(GetParam())), | 685 ::testing::get<1>(GetParam())), |
686 client_buffer_(kBufferCapacity, kDefaultBufferSize), | |
687 server_buffer_(kBufferCapacity, kDefaultBufferSize), | |
582 packet_size_(1000), | 688 packet_size_(1000), |
583 count_(0), | 689 count_(0), |
584 sent_(0) {} | 690 sent_(0) {} |
585 | 691 |
586 SSLStreamAdapterTestDTLS(const std::string& cert_pem, | 692 SSLStreamAdapterTestDTLS(const std::string& cert_pem, |
587 const std::string& private_key_pem) : | 693 const std::string& private_key_pem) : |
588 SSLStreamAdapterTestBase(cert_pem, private_key_pem, true), | 694 SSLStreamAdapterTestBase(cert_pem, private_key_pem, true), |
695 client_buffer_(kBufferCapacity, kDefaultBufferSize), | |
696 server_buffer_(kBufferCapacity, kDefaultBufferSize), | |
589 packet_size_(1000), count_(0), sent_(0) { | 697 packet_size_(1000), count_(0), sent_(0) { |
590 } | 698 } |
591 | 699 |
700 virtual void CreateStreams() override { | |
701 client_stream_ = | |
702 new SSLDummyStreamDTLS(this, "c2s", &client_buffer_, &server_buffer_); | |
703 server_stream_ = | |
704 new SSLDummyStreamDTLS(this, "s2c", &server_buffer_, &client_buffer_); | |
705 } | |
706 | |
592 virtual void WriteData() { | 707 virtual void WriteData() { |
593 unsigned char *packet = new unsigned char[1600]; | 708 unsigned char *packet = new unsigned char[1600]; |
594 | 709 |
595 do { | 710 while (sent_ < count_) { |
596 memset(packet, sent_ & 0xff, packet_size_); | 711 memset(packet, sent_ & 0xff, packet_size_); |
597 *(reinterpret_cast<uint32_t *>(packet)) = sent_; | 712 *(reinterpret_cast<uint32_t *>(packet)) = sent_; |
598 | 713 |
599 size_t sent; | 714 size_t sent; |
600 int rv = client_ssl_->Write(packet, packet_size_, &sent, 0); | 715 int rv = client_ssl_->Write(packet, packet_size_, &sent, 0); |
601 if (rv == rtc::SR_SUCCESS) { | 716 if (rv == rtc::SR_SUCCESS) { |
602 LOG(LS_VERBOSE) << "Sent: " << sent_; | 717 LOG(LS_VERBOSE) << "Sent: " << sent_; |
603 sent_++; | 718 sent_++; |
604 } else if (rv == rtc::SR_BLOCK) { | 719 } else if (rv == rtc::SR_BLOCK) { |
605 LOG(LS_VERBOSE) << "Blocked..."; | 720 LOG(LS_VERBOSE) << "Blocked..."; |
606 break; | 721 break; |
607 } else { | 722 } else { |
608 ADD_FAILURE(); | 723 ADD_FAILURE(); |
609 break; | 724 break; |
610 } | 725 } |
611 } while (sent_ < count_); | 726 } |
612 | 727 |
613 delete [] packet; | 728 delete [] packet; |
614 } | 729 } |
615 | 730 |
616 virtual void ReadData(rtc::StreamInterface *stream) { | 731 virtual void ReadData(rtc::StreamInterface *stream) { |
617 unsigned char buffer[2000]; | 732 unsigned char buffer[2000]; |
618 size_t bread; | 733 size_t bread; |
619 int err2; | 734 int err2; |
620 rtc::StreamResult r; | 735 rtc::StreamResult r; |
621 | 736 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
660 EXPECT_EQ(0U, received_.size()); | 775 EXPECT_EQ(0U, received_.size()); |
661 } else if (loss_ == 0) { | 776 } else if (loss_ == 0) { |
662 EXPECT_EQ_WAIT(static_cast<size_t>(sent_), received_.size(), 1000); | 777 EXPECT_EQ_WAIT(static_cast<size_t>(sent_), received_.size(), 1000); |
663 } else { | 778 } else { |
664 LOG(LS_INFO) << "Sent " << sent_ << " packets; received " << | 779 LOG(LS_INFO) << "Sent " << sent_ << " packets; received " << |
665 received_.size(); | 780 received_.size(); |
666 } | 781 } |
667 }; | 782 }; |
668 | 783 |
669 private: | 784 private: |
785 rtc::BufferQueue client_buffer_; | |
786 rtc::BufferQueue server_buffer_; | |
670 size_t packet_size_; | 787 size_t packet_size_; |
671 int count_; | 788 int count_; |
672 int sent_; | 789 int sent_; |
673 std::set<int> received_; | 790 std::set<int> received_; |
674 }; | 791 }; |
675 | 792 |
676 | 793 |
677 rtc::StreamResult SSLDummyStream::Write(const void* data, size_t data_len, | 794 rtc::StreamResult SSLDummyStreamBase::Write(const void* data, size_t data_len, |
678 size_t* written, int* error) { | 795 size_t* written, int* error) { |
679 *written = data_len; | 796 *written = data_len; |
680 | 797 |
681 LOG(LS_INFO) << "Writing to loopback " << data_len; | 798 LOG(LS_INFO) << "Writing to loopback " << data_len; |
682 | 799 |
683 if (first_packet_) { | 800 if (first_packet_) { |
684 first_packet_ = false; | 801 first_packet_ = false; |
685 if (test_->GetLoseFirstPacket()) { | 802 if (test_base_->GetLoseFirstPacket()) { |
686 LOG(LS_INFO) << "Losing initial packet of length " << data_len; | 803 LOG(LS_INFO) << "Losing initial packet of length " << data_len; |
687 return rtc::SR_SUCCESS; | 804 return rtc::SR_SUCCESS; |
688 } | 805 } |
689 } | 806 } |
690 | 807 |
691 return test_->DataWritten(this, data, data_len, written, error); | 808 return test_base_->DataWritten(this, data, data_len, written, error); |
692 | |
693 return rtc::SR_SUCCESS; | |
694 }; | 809 }; |
695 | 810 |
696 class SSLStreamAdapterTestDTLSFromPEMStrings : public SSLStreamAdapterTestDTLS { | 811 class SSLStreamAdapterTestDTLSFromPEMStrings : public SSLStreamAdapterTestDTLS { |
697 public: | 812 public: |
698 SSLStreamAdapterTestDTLSFromPEMStrings() : | 813 SSLStreamAdapterTestDTLSFromPEMStrings() : |
699 SSLStreamAdapterTestDTLS(kCERT_PEM, kRSA_PRIVATE_KEY_PEM) { | 814 SSLStreamAdapterTestDTLS(kCERT_PEM, kRSA_PRIVATE_KEY_PEM) { |
700 } | 815 } |
701 }; | 816 }; |
702 | 817 |
703 // Basic tests: TLS | 818 // Basic tests: TLS |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
775 // Test a handshake with small MTU | 890 // Test a handshake with small MTU |
776 // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=3910 | 891 // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=3910 |
777 TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSConnectWithSmallMtu) { | 892 TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSConnectWithSmallMtu) { |
778 MAYBE_SKIP_TEST(HaveDtls); | 893 MAYBE_SKIP_TEST(HaveDtls); |
779 SetMtu(700); | 894 SetMtu(700); |
780 SetHandshakeWait(20000); | 895 SetHandshakeWait(20000); |
781 TestHandshake(); | 896 TestHandshake(); |
782 }; | 897 }; |
783 | 898 |
784 // Test transfer -- trivial | 899 // Test transfer -- trivial |
785 // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005 | 900 TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransfer) { |
786 TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransfer) { | |
787 MAYBE_SKIP_TEST(HaveDtls); | 901 MAYBE_SKIP_TEST(HaveDtls); |
788 TestHandshake(); | 902 TestHandshake(); |
789 TestTransfer(100); | 903 TestTransfer(100); |
790 }; | 904 }; |
791 | 905 |
792 // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005 | 906 TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransferWithLoss) { |
793 TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransferWithLoss) { | |
794 MAYBE_SKIP_TEST(HaveDtls); | 907 MAYBE_SKIP_TEST(HaveDtls); |
795 TestHandshake(); | 908 TestHandshake(); |
796 SetLoss(10); | 909 SetLoss(10); |
797 TestTransfer(100); | 910 TestTransfer(100); |
798 }; | 911 }; |
799 | 912 |
800 // Disabled due to https://code.google.com/p/webrtc/issues/detail?id=5005 | 913 TEST_P(SSLStreamAdapterTestDTLS, TestDTLSTransferWithDamage) { |
801 TEST_P(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSTransferWithDamage) { | |
802 MAYBE_SKIP_TEST(HaveDtls); | 914 MAYBE_SKIP_TEST(HaveDtls); |
803 SetDamage(); // Must be called first because first packet | 915 SetDamage(); // Must be called first because first packet |
804 // write happens at end of handshake. | 916 // write happens at end of handshake. |
805 TestHandshake(); | 917 TestHandshake(); |
806 TestTransfer(100); | 918 TestTransfer(100); |
807 }; | 919 }; |
808 | 920 |
809 // Test DTLS-SRTP with all high ciphers | 921 // Test DTLS-SRTP with all high ciphers |
810 TEST_P(SSLStreamAdapterTestDTLS, TestDTLSSrtpHigh) { | 922 TEST_P(SSLStreamAdapterTestDTLS, TestDTLSSrtpHigh) { |
811 MAYBE_SKIP_TEST(HaveDtlsSrtp); | 923 MAYBE_SKIP_TEST(HaveDtlsSrtp); |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1054 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); | 1166 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); |
1055 INSTANTIATE_TEST_CASE_P( | 1167 INSTANTIATE_TEST_CASE_P( |
1056 SSLStreamAdapterTestsDTLS, | 1168 SSLStreamAdapterTestsDTLS, |
1057 SSLStreamAdapterTestDTLS, | 1169 SSLStreamAdapterTestDTLS, |
1058 Combine(Values(rtc::KeyParams::RSA(1024, 65537), | 1170 Combine(Values(rtc::KeyParams::RSA(1024, 65537), |
1059 rtc::KeyParams::RSA(1152, 65537), | 1171 rtc::KeyParams::RSA(1152, 65537), |
1060 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)), | 1172 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)), |
1061 Values(rtc::KeyParams::RSA(1024, 65537), | 1173 Values(rtc::KeyParams::RSA(1024, 65537), |
1062 rtc::KeyParams::RSA(1152, 65537), | 1174 rtc::KeyParams::RSA(1152, 65537), |
1063 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); | 1175 rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)))); |
OLD | NEW |