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

Side by Side Diff: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc

Issue 8949056: This adds support for encrypted ONC import (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More Review Changes Created 8 years, 11 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/chromeos/cros/onc_network_parser.h" 5 #include "chrome/browser/chromeos/cros/onc_network_parser.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <keyhi.h> 8 #include <keyhi.h>
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 10
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 " \"NetworkConfigurations\": [{" 252 " \"NetworkConfigurations\": [{"
253 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\"," 253 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\","
254 " \"Type\": \"WiFi\"," 254 " \"Type\": \"WiFi\","
255 " \"WiFi\": {" 255 " \"WiFi\": {"
256 " \"Security\": \"WEP-PSK\"," 256 " \"Security\": \"WEP-PSK\","
257 " \"SSID\": \"ssid\"," 257 " \"SSID\": \"ssid\","
258 " \"Passphrase\": \"pass\"," 258 " \"Passphrase\": \"pass\","
259 " }" 259 " }"
260 " }]" 260 " }]"
261 "}"); 261 "}");
262 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 262 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
263 263
264 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 264 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
265 EXPECT_EQ(0, parser.GetCertificatesSize()); 265 EXPECT_EQ(0, parser.GetCertificatesSize());
266 scoped_ptr<Network> network(parser.ParseNetwork(0)); 266 scoped_ptr<Network> network(parser.ParseNetwork(0));
267 ASSERT_TRUE(network.get()); 267 ASSERT_TRUE(network.get());
268 268
269 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 269 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
270 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 270 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
271 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP); 271 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP);
272 CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurityWep); 272 CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurityWep);
273 EXPECT_EQ(wifi->name(), "ssid"); 273 EXPECT_EQ(wifi->name(), "ssid");
274 CheckStringProperty(wifi, PROPERTY_INDEX_SSID, "ssid"); 274 CheckStringProperty(wifi, PROPERTY_INDEX_SSID, "ssid");
275 EXPECT_EQ(wifi->auto_connect(), false); 275 EXPECT_EQ(wifi->auto_connect(), false);
276 EXPECT_EQ(wifi->passphrase(), "pass"); 276 EXPECT_EQ(wifi->passphrase(), "pass");
277 CheckStringProperty(wifi, PROPERTY_INDEX_PASSPHRASE, "pass"); 277 CheckStringProperty(wifi, PROPERTY_INDEX_PASSPHRASE, "pass");
278 } 278 }
279 279
280 TEST_F(OncNetworkParserTest, TestLoadEncryptedOnc) {
281 std::string test_blob(
282 "{"
283 " \"IV\": \"gQY+S44xHuIvATPYoSkx8A==\","
284 " \"Salt\": \"tX5gQnnxWMg=\","
285 " \"Cipher\": \"AES256\","
286 " \"Stretch\": \"PBKDF2\","
287 " \"HMACMethod\": \"SHA1\","
288 " \"HMAC\": \"s9671bsjZm7cWX2KtDTWa1G3Ee4=\","
289 " \"Iterations\": 10000,"
290 " \"Ciphertext\": \"iGV7M4usugq9JxD4qULtxyGgdbFitRqNLIVIjGmImWHGbaF7G"
291 "EVZmDRoDtHOypAwbEYEHzDrHAqv/8WGNb5WvuLIl36VR1IuqL+OeRmljCN9ylMkrZfydj"
292 "mVI35OHapwonGdWZdPQCVq+7/YL7OC7sfwVTYpbcnPN3+qznDOFc9BMvgdXyEbJIBzk0A"
293 "nt6BSw0a1tGhSXQ0tguq+VGlbIcvW8eeuCrNQkf1JY7RSrHadWjcgLnrlbvD4qIfrYrRi"
294 "rnlH8dmb6vlpJ5iToRslh1SKoKAOlpyxBmp1Vn8uGSIb8XPnJGxrN2Ke/E40m7d5GpdN4"
295 "1TjvH0rY4Zqlnp5uP/PT+XB2IGsnFamLZv8yEiw6gZim26VG+nZeWcruXJELLPLPwEaAk"
296 "4jTpEEDW56mT1nXc3ak0bj5y8zzoCQMWO8vwHZ55zvyKTEw78EvhoI\""
297 "}");
298 OncNetworkParser parser(test_blob,
299 "test0000",
300 NetworkUIData::ONC_SOURCE_USER_IMPORT);
301 ASSERT_TRUE(parser.parse_error().empty());
302 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
303 EXPECT_EQ(0, parser.GetCertificatesSize());
304 Network* network = parser.ParseNetwork(0);
305 ASSERT_TRUE(network);
306
307 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
308 WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
309 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_NONE);
310 EXPECT_EQ(wifi->name(), "WirelessNetwork");
311 EXPECT_EQ(wifi->auto_connect(), false);
312 EXPECT_EQ(wifi->passphrase(), "");
313 }
314
315
280 TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) { 316 TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) {
281 std::string test_blob( 317 std::string test_blob(
282 "{" 318 "{"
283 " \"NetworkConfigurations\": [{" 319 " \"NetworkConfigurations\": [{"
284 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\"," 320 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\","
285 " \"Type\": \"WiFi\"," 321 " \"Type\": \"WiFi\","
286 " \"WiFi\": {" 322 " \"WiFi\": {"
287 " \"Security\": \"WPA-EAP\"," 323 " \"Security\": \"WPA-EAP\","
288 " \"SSID\": \"ssid\"," 324 " \"SSID\": \"ssid\","
289 " \"AutoConnect\": true," 325 " \"AutoConnect\": true,"
290 " \"EAP\": {" 326 " \"EAP\": {"
291 " \"Outer\": \"PEAP\"," 327 " \"Outer\": \"PEAP\","
292 " \"UseSystemCAs\": false," 328 " \"UseSystemCAs\": false,"
293 " }" 329 " }"
294 " }" 330 " }"
295 " }]" 331 " }]"
296 "}"); 332 "}");
297 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 333 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
298 334
299 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 335 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
300 EXPECT_EQ(0, parser.GetCertificatesSize()); 336 EXPECT_EQ(0, parser.GetCertificatesSize());
301 scoped_ptr<Network> network(parser.ParseNetwork(0)); 337 scoped_ptr<Network> network(parser.ParseNetwork(0));
302 ASSERT_TRUE(network.get()); 338 ASSERT_TRUE(network.get());
303 339
304 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 340 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
305 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 341 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
306 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X); 342 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
307 CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurity8021x); 343 CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurity8021x);
(...skipping 18 matching lines...) Expand all
326 " \"AutoConnect\": false," 362 " \"AutoConnect\": false,"
327 " \"EAP\": {" 363 " \"EAP\": {"
328 " \"Outer\": \"LEAP\"," 364 " \"Outer\": \"LEAP\","
329 " \"Identity\": \"user\"," 365 " \"Identity\": \"user\","
330 " \"Password\": \"pass\"," 366 " \"Password\": \"pass\","
331 " \"AnonymousIdentity\": \"anon\"," 367 " \"AnonymousIdentity\": \"anon\","
332 " }" 368 " }"
333 " }" 369 " }"
334 " }]" 370 " }]"
335 "}"); 371 "}");
336 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 372 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
337 373
338 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 374 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
339 EXPECT_EQ(0, parser.GetCertificatesSize()); 375 EXPECT_EQ(0, parser.GetCertificatesSize());
340 scoped_ptr<Network> network(parser.ParseNetwork(0)); 376 scoped_ptr<Network> network(parser.ParseNetwork(0));
341 ASSERT_TRUE(network.get()); 377 ASSERT_TRUE(network.get());
342 378
343 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 379 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
344 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 380 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
345 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X); 381 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
346 EXPECT_EQ(wifi->name(), "ssid"); 382 EXPECT_EQ(wifi->name(), "ssid");
(...skipping 18 matching lines...) Expand all
365 " \"Security\": \"WEP-PSK\"," 401 " \"Security\": \"WEP-PSK\","
366 " \"SSID\": \"ssid\"," 402 " \"SSID\": \"ssid\","
367 " \"Passphrase\": \"pass\"," 403 " \"Passphrase\": \"pass\","
368 " }," 404 " },"
369 " \"UnknownField1\": \"Value1\"," 405 " \"UnknownField1\": \"Value1\","
370 " \"UnknownField2\": {" 406 " \"UnknownField2\": {"
371 " \"UnknownSubField\": \"Value2\"" 407 " \"UnknownSubField\": \"Value2\""
372 " }," 408 " },"
373 " }]" 409 " }]"
374 "}"); 410 "}");
375 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 411 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
376 scoped_ptr<Network> network(parser.ParseNetwork(0)); 412 scoped_ptr<Network> network(parser.ParseNetwork(0));
377 ASSERT_TRUE(network.get()); 413 ASSERT_TRUE(network.get());
378 414
379 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 415 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
380 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 416 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
381 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP); 417 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP);
382 EXPECT_EQ(wifi->name(), "ssid"); 418 EXPECT_EQ(wifi->name(), "ssid");
383 EXPECT_EQ(wifi->passphrase(), "pass"); 419 EXPECT_EQ(wifi->passphrase(), "pass");
384 } 420 }
385 421
386 TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) { 422 TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) {
387 std::string test_blob(std::string( 423 std::string test_blob(std::string(
388 "{" 424 "{"
389 " \"NetworkConfigurations\": [") + 425 " \"NetworkConfigurations\": [") +
390 std::string(kNetworkConfigurationOpenVPN) + std::string( 426 std::string(kNetworkConfigurationOpenVPN) + std::string(
391 " ]}")); 427 " ]}"));
392 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 428 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
393 429
394 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 430 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
395 EXPECT_EQ(0, parser.GetCertificatesSize()); 431 EXPECT_EQ(0, parser.GetCertificatesSize());
396 scoped_ptr<Network> network(parser.ParseNetwork(0)); 432 scoped_ptr<Network> network(parser.ParseNetwork(0));
397 ASSERT_TRUE(network.get() != NULL); 433 ASSERT_TRUE(network.get() != NULL);
398 434
399 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 435 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
400 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN); 436 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN);
401 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get()); 437 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
402 EXPECT_EQ("MyVPN", vpn->name()); 438 EXPECT_EQ("MyVPN", vpn->name());
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 " \"PSK\": \"passphrase\"" 497 " \"PSK\": \"passphrase\""
462 " }," 498 " },"
463 " \"L2TP\": {" 499 " \"L2TP\": {"
464 " \"SaveCredentials\": false" 500 " \"SaveCredentials\": false"
465 " }" 501 " }"
466 " }" 502 " }"
467 " }" 503 " }"
468 " ]," 504 " ],"
469 " \"Certificates\": []" 505 " \"Certificates\": []"
470 "}"); 506 "}");
471 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 507 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
472 508
473 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 509 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
474 EXPECT_EQ(0, parser.GetCertificatesSize()); 510 EXPECT_EQ(0, parser.GetCertificatesSize());
475 scoped_ptr<Network> network(parser.ParseNetwork(0)); 511 scoped_ptr<Network> network(parser.ParseNetwork(0));
476 ASSERT_TRUE(network != NULL); 512 ASSERT_TRUE(network != NULL);
477 513
478 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 514 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
479 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN); 515 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN);
480 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get()); 516 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
481 EXPECT_EQ("MyL2TPVPN", vpn->name()); 517 EXPECT_EQ("MyL2TPVPN", vpn->name());
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 "3jnX40zaK4W7GeJvhij0MRr6yUL2lvaEcWDnK6K1F90G/ybKRCTHBCJzyBe7yHhZCc+Zc" 563 "3jnX40zaK4W7GeJvhij0MRr6yUL2lvaEcWDnK6K1F90G/ybKRCTHBCJzyBe7yHhZCc+Zc"
528 "vKK6DTi83fELTyupy08BkXt7oPdapxmKlZxTldo9FpPXSqrdRtAWhDkEkIEf8dMf8QrQr" 564 "vKK6DTi83fELTyupy08BkXt7oPdapxmKlZxTldo9FpPXSqrdRtAWhDkEkIEf8dMf8QrQr"
529 "3glCWfbcQ047URYX45AHRnLTLLkJfdY8+Y3KsHoqL2UrOrct+J1u0mmnLbonN3pB2B4nd" 565 "3glCWfbcQ047URYX45AHRnLTLLkJfdY8+Y3KsHoqL2UrOrct+J1u0mmnLbonN3pB2B4nd"
530 "9X9vf9/uSFrgvk0iPO0Ro3UPRUIIYEP2Kx51pZZVDd++hl5gXtqe0NIpphGhxLycIdzEl" 566 "9X9vf9/uSFrgvk0iPO0Ro3UPRUIIYEP2Kx51pZZVDd++hl5gXtqe0NIpphGhxLycIdzEl"
531 "MCMGCSqGSIb3DQEJFTEWBBR1uVpGjHRddIEYuJhz/FgG4Onh6jAxMCEwCQYFKw4DAhoFA" 567 "MCMGCSqGSIb3DQEJFTEWBBR1uVpGjHRddIEYuJhz/FgG4Onh6jAxMCEwCQYFKw4DAhoFA"
532 "AQU1M+0WRDkoVGbGg1jj7q2fI67qHIECBzRYESpgt5iAgIIAA==\"" 568 "AQU1M+0WRDkoVGbGg1jj7q2fI67qHIECBzRYESpgt5iAgIIAA==\""
533 " }" 569 " }"
534 " ]," 570 " ],"
535 "}"); 571 "}");
536 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ac}"); 572 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ac}");
537 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 573 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
538 ASSERT_EQ(1, parser.GetCertificatesSize()); 574 ASSERT_EQ(1, parser.GetCertificatesSize());
539 575
540 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get(); 576 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
541 EXPECT_TRUE(cert.get() != NULL); 577 EXPECT_TRUE(cert.get() != NULL);
542 EXPECT_EQ(net::USER_CERT, GetCertType(cert.get())); 578 EXPECT_EQ(net::USER_CERT, GetCertType(cert.get()));
543 579
544 EXPECT_STREQ(test_guid.c_str(), 580 EXPECT_STREQ(test_guid.c_str(),
545 cert->GetDefaultNickname(net::USER_CERT).c_str()); 581 cert->GetDefaultNickname(net::USER_CERT).c_str());
546 net::CertificateList result_list; 582 net::CertificateList result_list;
547 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list); 583 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 "kvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIA" 633 "kvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIA"
598 "LtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17" 634 "LtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17"
599 "nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZT" 635 "nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZT"
600 "Q/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dM" 636 "Q/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dM"
601 "VPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACR" 637 "VPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACR"
602 "WA==\"" 638 "WA==\""
603 " }" 639 " }"
604 " ]," 640 " ],"
605 "}"); 641 "}");
606 std::string test_guid("{f998f760-272b-6939-4c2beffe428697aa}"); 642 std::string test_guid("{f998f760-272b-6939-4c2beffe428697aa}");
607 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 643 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
608 ASSERT_EQ(1, parser.GetCertificatesSize()); 644 ASSERT_EQ(1, parser.GetCertificatesSize());
609 645
610 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get(); 646 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
611 EXPECT_TRUE(cert.get() != NULL); 647 EXPECT_TRUE(cert.get() != NULL);
612 EXPECT_EQ(net::SERVER_CERT, GetCertType(cert.get())); 648 EXPECT_EQ(net::SERVER_CERT, GetCertType(cert.get()));
613 649
614 EXPECT_STREQ(test_guid.c_str(), 650 EXPECT_STREQ(test_guid.c_str(),
615 cert->GetDefaultNickname(net::SERVER_CERT).c_str()); 651 cert->GetDefaultNickname(net::SERVER_CERT).c_str());
616 net::CertificateList result_list; 652 net::CertificateList result_list;
617 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list); 653 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list);
(...skipping 10 matching lines...) Expand all
628 664
629 } 665 }
630 666
631 TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) { 667 TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) {
632 const std::string test_blob(std::string("{" 668 const std::string test_blob(std::string("{"
633 " \"Certificates\": [") + 669 " \"Certificates\": [") +
634 std::string(kCertificateWebAuthority) + std::string( 670 std::string(kCertificateWebAuthority) + std::string(
635 " ]," 671 " ],"
636 "}")); 672 "}"));
637 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ab}"); 673 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ab}");
638 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 674 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
639 ASSERT_EQ(1, parser.GetCertificatesSize()); 675 ASSERT_EQ(1, parser.GetCertificatesSize());
640 676
641 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get(); 677 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
642 EXPECT_TRUE(cert.get() != NULL); 678 EXPECT_TRUE(cert.get() != NULL);
643 EXPECT_EQ(net::CA_CERT, GetCertType(cert.get())); 679 EXPECT_EQ(net::CA_CERT, GetCertType(cert.get()));
644 680
645 EXPECT_STREQ(test_guid.c_str(), 681 EXPECT_STREQ(test_guid.c_str(),
646 cert->GetDefaultNickname(net::CA_CERT).c_str()); 682 cert->GetDefaultNickname(net::CA_CERT).c_str());
647 net::CertificateList result_list; 683 net::CertificateList result_list;
648 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list); 684 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list);
(...skipping 12 matching lines...) Expand all
661 TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) { 697 TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) {
662 std::string test_blob(std::string( 698 std::string test_blob(std::string(
663 "{" 699 "{"
664 " \"NetworkConfigurations\": [") + 700 " \"NetworkConfigurations\": [") +
665 std::string(kNetworkConfigurationOpenVPN) + std::string( 701 std::string(kNetworkConfigurationOpenVPN) + std::string(
666 " ]," 702 " ],"
667 " \"Certificates\": [") + 703 " \"Certificates\": [") +
668 std::string(kCertificateWebAuthority) + std::string( 704 std::string(kCertificateWebAuthority) + std::string(
669 " ]," 705 " ],"
670 "}")); 706 "}"));
671 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 707 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
672 708
673 EXPECT_EQ(1, parser.GetCertificatesSize()); 709 EXPECT_EQ(1, parser.GetCertificatesSize());
674 EXPECT_TRUE(parser.ParseCertificate(0)); 710 EXPECT_TRUE(parser.ParseCertificate(0));
675 711
676 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 712 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
677 scoped_ptr<Network> network(parser.ParseNetwork(0)); 713 scoped_ptr<Network> network(parser.ParseNetwork(0));
678 ASSERT_TRUE(network.get() != NULL); 714 ASSERT_TRUE(network.get() != NULL);
679 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 715 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
680 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get()); 716 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
681 EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type()); 717 EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type());
682 } 718 }
683 719
684 } // namespace chromeos 720 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698