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

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: Created 9 years 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\": \"fDArlfLAqT+cnumHVyFzDQ==\","
284 " \"Salt\": \"jhPV56gmk64=\","
285 " \"Cipher\": \"AES256\","
286 " \"HMAC\": \"SHA1\","
287 " \"Iterations\": 10000,"
288 " \"Ciphertext\": \"7WGxKWUIrRuq5WcctY+tvuT6HjX2ZfTVs0nadK46Upg5PFr/"
289 "T6MP7MG6BHw+pzqthdvNm+smGXy4O88+eIE4A9s7emQqUq/SY5SR5sOz+HuoUgtiBK5P"
290 "5Zsli0dqpuMyXJw3FF6sUdvPKyim2gUDnGf7lwVK8mrA4yQWhwJF9OR1CbXW5kByguoP"
291 "V20WKHdFUT1mEWHIasJXM2V3F+vUSufHqidG7r9cBaNBRTvF42Il+QaB9RWiAIDhS5TZ"
292 "T7JeDg8SXxnUjmN0A2aZ+Y0hFee9OKUOGsQFq5ipi1yPgptgzGJuEMNN6RJHVGYcT7P5"
293 "7H/FLfnpcvttci2FX/lHK0kF1K3GhoO4WUTGL0iuXQAJJKIQUD/OML2fXoaBziCXwvID"
294 "WUZv+nuszu7NDDcA7GKPIKFM4W99SY7BqZVCXA7rEF+Sv1AhdOfEGrqNNmGFcUQqbWkQ"
295 "P4YyBheb7jcOkHqzYA1JM2IZwpnc7WXukVg=\""
296 "}");
297 OncNetworkParser parser(test_blob,
298 "test0000",
299 NetworkUIData::ONC_SOURCE_USER_IMPORT);
300
301 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
302 EXPECT_EQ(0, parser.GetCertificatesSize());
303 Network* network = parser.ParseNetwork(0);
304 ASSERT_TRUE(network);
305
306 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
307 WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
308 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_NONE);
309 EXPECT_EQ(wifi->name(), "WirelessNetwork");
310 EXPECT_EQ(wifi->auto_connect(), false);
311 EXPECT_EQ(wifi->passphrase(), "");
312 }
313
314
280 TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) { 315 TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) {
281 std::string test_blob( 316 std::string test_blob(
282 "{" 317 "{"
283 " \"NetworkConfigurations\": [{" 318 " \"NetworkConfigurations\": [{"
284 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\"," 319 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\","
285 " \"Type\": \"WiFi\"," 320 " \"Type\": \"WiFi\","
286 " \"WiFi\": {" 321 " \"WiFi\": {"
287 " \"Security\": \"WPA-EAP\"," 322 " \"Security\": \"WPA-EAP\","
288 " \"SSID\": \"ssid\"," 323 " \"SSID\": \"ssid\","
289 " \"AutoConnect\": true," 324 " \"AutoConnect\": true,"
290 " \"EAP\": {" 325 " \"EAP\": {"
291 " \"Outer\": \"PEAP\"," 326 " \"Outer\": \"PEAP\","
292 " \"UseSystemCAs\": false," 327 " \"UseSystemCAs\": false,"
293 " }" 328 " }"
294 " }" 329 " }"
295 " }]" 330 " }]"
296 "}"); 331 "}");
297 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 332 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
298 333
299 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 334 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
300 EXPECT_EQ(0, parser.GetCertificatesSize()); 335 EXPECT_EQ(0, parser.GetCertificatesSize());
301 scoped_ptr<Network> network(parser.ParseNetwork(0)); 336 scoped_ptr<Network> network(parser.ParseNetwork(0));
302 ASSERT_TRUE(network.get()); 337 ASSERT_TRUE(network.get());
303 338
304 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 339 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
305 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 340 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
306 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X); 341 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
307 CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurity8021x); 342 CheckStringProperty(wifi, PROPERTY_INDEX_SECURITY, flimflam::kSecurity8021x);
(...skipping 18 matching lines...) Expand all
326 " \"AutoConnect\": false," 361 " \"AutoConnect\": false,"
327 " \"EAP\": {" 362 " \"EAP\": {"
328 " \"Outer\": \"LEAP\"," 363 " \"Outer\": \"LEAP\","
329 " \"Identity\": \"user\"," 364 " \"Identity\": \"user\","
330 " \"Password\": \"pass\"," 365 " \"Password\": \"pass\","
331 " \"AnonymousIdentity\": \"anon\"," 366 " \"AnonymousIdentity\": \"anon\","
332 " }" 367 " }"
333 " }" 368 " }"
334 " }]" 369 " }]"
335 "}"); 370 "}");
336 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 371 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
337 372
338 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 373 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
339 EXPECT_EQ(0, parser.GetCertificatesSize()); 374 EXPECT_EQ(0, parser.GetCertificatesSize());
340 scoped_ptr<Network> network(parser.ParseNetwork(0)); 375 scoped_ptr<Network> network(parser.ParseNetwork(0));
341 ASSERT_TRUE(network.get()); 376 ASSERT_TRUE(network.get());
342 377
343 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 378 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
344 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 379 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
345 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X); 380 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
346 EXPECT_EQ(wifi->name(), "ssid"); 381 EXPECT_EQ(wifi->name(), "ssid");
(...skipping 18 matching lines...) Expand all
365 " \"Security\": \"WEP-PSK\"," 400 " \"Security\": \"WEP-PSK\","
366 " \"SSID\": \"ssid\"," 401 " \"SSID\": \"ssid\","
367 " \"Passphrase\": \"pass\"," 402 " \"Passphrase\": \"pass\","
368 " }," 403 " },"
369 " \"UnknownField1\": \"Value1\"," 404 " \"UnknownField1\": \"Value1\","
370 " \"UnknownField2\": {" 405 " \"UnknownField2\": {"
371 " \"UnknownSubField\": \"Value2\"" 406 " \"UnknownSubField\": \"Value2\""
372 " }," 407 " },"
373 " }]" 408 " }]"
374 "}"); 409 "}");
375 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 410 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
376 scoped_ptr<Network> network(parser.ParseNetwork(0)); 411 scoped_ptr<Network> network(parser.ParseNetwork(0));
377 ASSERT_TRUE(network.get()); 412 ASSERT_TRUE(network.get());
378 413
379 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 414 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
380 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get()); 415 WifiNetwork* wifi = static_cast<WifiNetwork*>(network.get());
381 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP); 416 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP);
382 EXPECT_EQ(wifi->name(), "ssid"); 417 EXPECT_EQ(wifi->name(), "ssid");
383 EXPECT_EQ(wifi->passphrase(), "pass"); 418 EXPECT_EQ(wifi->passphrase(), "pass");
384 } 419 }
385 420
386 TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) { 421 TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) {
387 std::string test_blob(std::string( 422 std::string test_blob(std::string(
388 "{" 423 "{"
389 " \"NetworkConfigurations\": [") + 424 " \"NetworkConfigurations\": [") +
390 std::string(kNetworkConfigurationOpenVPN) + std::string( 425 std::string(kNetworkConfigurationOpenVPN) + std::string(
391 " ]}")); 426 " ]}"));
392 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 427 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
393 428
394 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 429 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
395 EXPECT_EQ(0, parser.GetCertificatesSize()); 430 EXPECT_EQ(0, parser.GetCertificatesSize());
396 scoped_ptr<Network> network(parser.ParseNetwork(0)); 431 scoped_ptr<Network> network(parser.ParseNetwork(0));
397 ASSERT_TRUE(network.get() != NULL); 432 ASSERT_TRUE(network.get() != NULL);
398 433
399 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 434 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
400 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN); 435 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN);
401 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get()); 436 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
402 EXPECT_EQ("MyVPN", vpn->name()); 437 EXPECT_EQ("MyVPN", vpn->name());
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 " \"PSK\": \"passphrase\"" 496 " \"PSK\": \"passphrase\""
462 " }," 497 " },"
463 " \"L2TP\": {" 498 " \"L2TP\": {"
464 " \"SaveCredentials\": false" 499 " \"SaveCredentials\": false"
465 " }" 500 " }"
466 " }" 501 " }"
467 " }" 502 " }"
468 " ]," 503 " ],"
469 " \"Certificates\": []" 504 " \"Certificates\": []"
470 "}"); 505 "}");
471 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 506 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
472 507
473 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 508 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
474 EXPECT_EQ(0, parser.GetCertificatesSize()); 509 EXPECT_EQ(0, parser.GetCertificatesSize());
475 scoped_ptr<Network> network(parser.ParseNetwork(0)); 510 scoped_ptr<Network> network(parser.ParseNetwork(0));
476 ASSERT_TRUE(network != NULL); 511 ASSERT_TRUE(network != NULL);
477 512
478 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 513 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
479 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN); 514 CheckStringProperty(network.get(), PROPERTY_INDEX_TYPE, flimflam::kTypeVPN);
480 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get()); 515 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
481 EXPECT_EQ("MyL2TPVPN", vpn->name()); 516 EXPECT_EQ("MyL2TPVPN", vpn->name());
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 "3jnX40zaK4W7GeJvhij0MRr6yUL2lvaEcWDnK6K1F90G/ybKRCTHBCJzyBe7yHhZCc+Zc" 562 "3jnX40zaK4W7GeJvhij0MRr6yUL2lvaEcWDnK6K1F90G/ybKRCTHBCJzyBe7yHhZCc+Zc"
528 "vKK6DTi83fELTyupy08BkXt7oPdapxmKlZxTldo9FpPXSqrdRtAWhDkEkIEf8dMf8QrQr" 563 "vKK6DTi83fELTyupy08BkXt7oPdapxmKlZxTldo9FpPXSqrdRtAWhDkEkIEf8dMf8QrQr"
529 "3glCWfbcQ047URYX45AHRnLTLLkJfdY8+Y3KsHoqL2UrOrct+J1u0mmnLbonN3pB2B4nd" 564 "3glCWfbcQ047URYX45AHRnLTLLkJfdY8+Y3KsHoqL2UrOrct+J1u0mmnLbonN3pB2B4nd"
530 "9X9vf9/uSFrgvk0iPO0Ro3UPRUIIYEP2Kx51pZZVDd++hl5gXtqe0NIpphGhxLycIdzEl" 565 "9X9vf9/uSFrgvk0iPO0Ro3UPRUIIYEP2Kx51pZZVDd++hl5gXtqe0NIpphGhxLycIdzEl"
531 "MCMGCSqGSIb3DQEJFTEWBBR1uVpGjHRddIEYuJhz/FgG4Onh6jAxMCEwCQYFKw4DAhoFA" 566 "MCMGCSqGSIb3DQEJFTEWBBR1uVpGjHRddIEYuJhz/FgG4Onh6jAxMCEwCQYFKw4DAhoFA"
532 "AQU1M+0WRDkoVGbGg1jj7q2fI67qHIECBzRYESpgt5iAgIIAA==\"" 567 "AQU1M+0WRDkoVGbGg1jj7q2fI67qHIECBzRYESpgt5iAgIIAA==\""
533 " }" 568 " }"
534 " ]," 569 " ],"
535 "}"); 570 "}");
536 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ac}"); 571 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ac}");
537 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 572 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
538 ASSERT_EQ(1, parser.GetCertificatesSize()); 573 ASSERT_EQ(1, parser.GetCertificatesSize());
539 574
540 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get(); 575 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
541 EXPECT_TRUE(cert.get() != NULL); 576 EXPECT_TRUE(cert.get() != NULL);
542 EXPECT_EQ(net::USER_CERT, GetCertType(cert.get())); 577 EXPECT_EQ(net::USER_CERT, GetCertType(cert.get()));
543 578
544 EXPECT_STREQ(test_guid.c_str(), 579 EXPECT_STREQ(test_guid.c_str(),
545 cert->GetDefaultNickname(net::USER_CERT).c_str()); 580 cert->GetDefaultNickname(net::USER_CERT).c_str());
546 net::CertificateList result_list; 581 net::CertificateList result_list;
547 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list); 582 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 "kvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIA" 632 "kvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIA"
598 "LtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17" 633 "LtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17"
599 "nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZT" 634 "nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZT"
600 "Q/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dM" 635 "Q/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dM"
601 "VPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACR" 636 "VPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACR"
602 "WA==\"" 637 "WA==\""
603 " }" 638 " }"
604 " ]," 639 " ],"
605 "}"); 640 "}");
606 std::string test_guid("{f998f760-272b-6939-4c2beffe428697aa}"); 641 std::string test_guid("{f998f760-272b-6939-4c2beffe428697aa}");
607 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 642 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
608 ASSERT_EQ(1, parser.GetCertificatesSize()); 643 ASSERT_EQ(1, parser.GetCertificatesSize());
609 644
610 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get(); 645 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
611 EXPECT_TRUE(cert.get() != NULL); 646 EXPECT_TRUE(cert.get() != NULL);
612 EXPECT_EQ(net::SERVER_CERT, GetCertType(cert.get())); 647 EXPECT_EQ(net::SERVER_CERT, GetCertType(cert.get()));
613 648
614 EXPECT_STREQ(test_guid.c_str(), 649 EXPECT_STREQ(test_guid.c_str(),
615 cert->GetDefaultNickname(net::SERVER_CERT).c_str()); 650 cert->GetDefaultNickname(net::SERVER_CERT).c_str());
616 net::CertificateList result_list; 651 net::CertificateList result_list;
617 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list); 652 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list);
(...skipping 10 matching lines...) Expand all
628 663
629 } 664 }
630 665
631 TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) { 666 TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) {
632 const std::string test_blob(std::string("{" 667 const std::string test_blob(std::string("{"
633 " \"Certificates\": [") + 668 " \"Certificates\": [") +
634 std::string(kCertificateWebAuthority) + std::string( 669 std::string(kCertificateWebAuthority) + std::string(
635 " ]," 670 " ],"
636 "}")); 671 "}"));
637 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ab}"); 672 std::string test_guid("{f998f760-272b-6939-4c2beffe428697ab}");
638 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 673 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
639 ASSERT_EQ(1, parser.GetCertificatesSize()); 674 ASSERT_EQ(1, parser.GetCertificatesSize());
640 675
641 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get(); 676 scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
642 EXPECT_TRUE(cert.get() != NULL); 677 EXPECT_TRUE(cert.get() != NULL);
643 EXPECT_EQ(net::CA_CERT, GetCertType(cert.get())); 678 EXPECT_EQ(net::CA_CERT, GetCertType(cert.get()));
644 679
645 EXPECT_STREQ(test_guid.c_str(), 680 EXPECT_STREQ(test_guid.c_str(),
646 cert->GetDefaultNickname(net::CA_CERT).c_str()); 681 cert->GetDefaultNickname(net::CA_CERT).c_str());
647 net::CertificateList result_list; 682 net::CertificateList result_list;
648 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list); 683 OncNetworkParser::ListCertsWithNickname(test_guid, &result_list);
(...skipping 12 matching lines...) Expand all
661 TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) { 696 TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) {
662 std::string test_blob(std::string( 697 std::string test_blob(std::string(
663 "{" 698 "{"
664 " \"NetworkConfigurations\": [") + 699 " \"NetworkConfigurations\": [") +
665 std::string(kNetworkConfigurationOpenVPN) + std::string( 700 std::string(kNetworkConfigurationOpenVPN) + std::string(
666 " ]," 701 " ],"
667 " \"Certificates\": [") + 702 " \"Certificates\": [") +
668 std::string(kCertificateWebAuthority) + std::string( 703 std::string(kCertificateWebAuthority) + std::string(
669 " ]," 704 " ],"
670 "}")); 705 "}"));
671 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT); 706 OncNetworkParser parser(test_blob, "", NetworkUIData::ONC_SOURCE_USER_IMPORT);
672 707
673 EXPECT_EQ(1, parser.GetCertificatesSize()); 708 EXPECT_EQ(1, parser.GetCertificatesSize());
674 EXPECT_TRUE(parser.ParseCertificate(0)); 709 EXPECT_TRUE(parser.ParseCertificate(0));
675 710
676 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 711 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
677 scoped_ptr<Network> network(parser.ParseNetwork(0)); 712 scoped_ptr<Network> network(parser.ParseNetwork(0));
678 ASSERT_TRUE(network.get() != NULL); 713 ASSERT_TRUE(network.get() != NULL);
679 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 714 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
680 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get()); 715 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network.get());
681 EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type()); 716 EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type());
682 } 717 }
683 718
684 } // namespace chromeos 719 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698