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

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

Issue 8804020: Set onc_source UI data parameter when importing ONC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Handle "Recommended" dictionary entry properly. 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 <pk11pub.h> 8 #include <pk11pub.h>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 " \"NetworkConfigurations\": [{" 232 " \"NetworkConfigurations\": [{"
233 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\"," 233 " \"GUID\": \"{485d6076-dd44-6b6d-69787465725f5045}\","
234 " \"Type\": \"WiFi\"," 234 " \"Type\": \"WiFi\","
235 " \"WiFi\": {" 235 " \"WiFi\": {"
236 " \"Security\": \"WEP-PSK\"," 236 " \"Security\": \"WEP-PSK\","
237 " \"SSID\": \"ssid\"," 237 " \"SSID\": \"ssid\","
238 " \"Passphrase\": \"pass\"," 238 " \"Passphrase\": \"pass\","
239 " }" 239 " }"
240 " }]" 240 " }]"
241 "}"); 241 "}");
242 OncNetworkParser parser(test_blob); 242 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
243 243
244 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 244 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
245 EXPECT_EQ(0, parser.GetCertificatesSize()); 245 EXPECT_EQ(0, parser.GetCertificatesSize());
246 EXPECT_FALSE(parser.ParseNetwork(1)); 246 EXPECT_FALSE(parser.ParseNetwork(1));
247 Network* network = parser.ParseNetwork(0); 247 Network* network = parser.ParseNetwork(0);
248 ASSERT_TRUE(network); 248 ASSERT_TRUE(network);
249 249
250 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 250 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
251 WifiNetwork* wifi = static_cast<WifiNetwork*>(network); 251 WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
252 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP); 252 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_WEP);
(...skipping 15 matching lines...) Expand all
268 " \"Security\": \"WPA-EAP\"," 268 " \"Security\": \"WPA-EAP\","
269 " \"SSID\": \"ssid\"," 269 " \"SSID\": \"ssid\","
270 " \"AutoConnect\": true," 270 " \"AutoConnect\": true,"
271 " \"EAP\": {" 271 " \"EAP\": {"
272 " \"Outer\": \"PEAP\"," 272 " \"Outer\": \"PEAP\","
273 " \"UseSystemCAs\": false," 273 " \"UseSystemCAs\": false,"
274 " }" 274 " }"
275 " }" 275 " }"
276 " }]" 276 " }]"
277 "}"); 277 "}");
278 OncNetworkParser parser(test_blob); 278 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
279 279
280 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 280 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
281 EXPECT_EQ(0, parser.GetCertificatesSize()); 281 EXPECT_EQ(0, parser.GetCertificatesSize());
282 EXPECT_FALSE(parser.ParseNetwork(1)); 282 EXPECT_FALSE(parser.ParseNetwork(1));
283 Network* network = parser.ParseNetwork(0); 283 Network* network = parser.ParseNetwork(0);
284 ASSERT_TRUE(network); 284 ASSERT_TRUE(network);
285 285
286 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 286 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
287 WifiNetwork* wifi = static_cast<WifiNetwork*>(network); 287 WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
288 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X); 288 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
(...skipping 19 matching lines...) Expand all
308 " \"AutoConnect\": false," 308 " \"AutoConnect\": false,"
309 " \"EAP\": {" 309 " \"EAP\": {"
310 " \"Outer\": \"LEAP\"," 310 " \"Outer\": \"LEAP\","
311 " \"Identity\": \"user\"," 311 " \"Identity\": \"user\","
312 " \"Password\": \"pass\"," 312 " \"Password\": \"pass\","
313 " \"AnonymousIdentity\": \"anon\"," 313 " \"AnonymousIdentity\": \"anon\","
314 " }" 314 " }"
315 " }" 315 " }"
316 " }]" 316 " }]"
317 "}"); 317 "}");
318 OncNetworkParser parser(test_blob); 318 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
319 319
320 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 320 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
321 EXPECT_EQ(0, parser.GetCertificatesSize()); 321 EXPECT_EQ(0, parser.GetCertificatesSize());
322 EXPECT_FALSE(parser.ParseNetwork(1)); 322 EXPECT_FALSE(parser.ParseNetwork(1));
323 Network* network = parser.ParseNetwork(0); 323 Network* network = parser.ParseNetwork(0);
324 ASSERT_TRUE(network); 324 ASSERT_TRUE(network);
325 325
326 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI); 326 EXPECT_EQ(network->type(), chromeos::TYPE_WIFI);
327 WifiNetwork* wifi = static_cast<WifiNetwork*>(network); 327 WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
328 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X); 328 EXPECT_EQ(wifi->encryption(), chromeos::SECURITY_8021X);
329 EXPECT_EQ(wifi->name(), "ssid"); 329 EXPECT_EQ(wifi->name(), "ssid");
330 EXPECT_EQ(wifi->auto_connect(), false); 330 EXPECT_EQ(wifi->auto_connect(), false);
331 EXPECT_EQ(wifi->eap_method(), EAP_METHOD_LEAP); 331 EXPECT_EQ(wifi->eap_method(), EAP_METHOD_LEAP);
332 EXPECT_EQ(wifi->eap_use_system_cas(), true); 332 EXPECT_EQ(wifi->eap_use_system_cas(), true);
333 EXPECT_EQ(wifi->eap_identity(), "user"); 333 EXPECT_EQ(wifi->eap_identity(), "user");
334 CheckStringProperty(wifi, PROPERTY_INDEX_EAP_IDENTITY, "user"); 334 CheckStringProperty(wifi, PROPERTY_INDEX_EAP_IDENTITY, "user");
335 EXPECT_EQ(wifi->eap_passphrase(), "pass"); 335 EXPECT_EQ(wifi->eap_passphrase(), "pass");
336 CheckStringProperty(wifi, PROPERTY_INDEX_EAP_PASSWORD, "pass"); 336 CheckStringProperty(wifi, PROPERTY_INDEX_EAP_PASSWORD, "pass");
337 EXPECT_EQ(wifi->eap_anonymous_identity(), "anon"); 337 EXPECT_EQ(wifi->eap_anonymous_identity(), "anon");
338 CheckStringProperty(wifi, PROPERTY_INDEX_EAP_ANONYMOUS_IDENTITY, "anon"); 338 CheckStringProperty(wifi, PROPERTY_INDEX_EAP_ANONYMOUS_IDENTITY, "anon");
339 } 339 }
340 340
341 TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) { 341 TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) {
342 std::string test_blob(std::string( 342 std::string test_blob(std::string(
343 "{" 343 "{"
344 " \"NetworkConfigurations\": [") + 344 " \"NetworkConfigurations\": [") +
345 std::string(kNetworkConfigurationOpenVPN) + std::string( 345 std::string(kNetworkConfigurationOpenVPN) + std::string(
346 " ]}")); 346 " ]}"));
347 OncNetworkParser parser(test_blob); 347 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
348 348
349 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 349 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
350 EXPECT_EQ(0, parser.GetCertificatesSize()); 350 EXPECT_EQ(0, parser.GetCertificatesSize());
351 Network* network = parser.ParseNetwork(0); 351 Network* network = parser.ParseNetwork(0);
352 ASSERT_TRUE(network != NULL); 352 ASSERT_TRUE(network != NULL);
353 353
354 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 354 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
355 CheckStringProperty(network, PROPERTY_INDEX_TYPE, flimflam::kTypeVPN); 355 CheckStringProperty(network, PROPERTY_INDEX_TYPE, flimflam::kTypeVPN);
356 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network); 356 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
357 EXPECT_EQ("MyVPN", vpn->name()); 357 EXPECT_EQ("MyVPN", vpn->name());
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 " \"PSK\": \"passphrase\"" 416 " \"PSK\": \"passphrase\""
417 " }," 417 " },"
418 " \"L2TP\": {" 418 " \"L2TP\": {"
419 " \"SaveCredentials\": false" 419 " \"SaveCredentials\": false"
420 " }" 420 " }"
421 " }" 421 " }"
422 " }" 422 " }"
423 " ]," 423 " ],"
424 " \"Certificates\": []" 424 " \"Certificates\": []"
425 "}"); 425 "}");
426 OncNetworkParser parser(test_blob); 426 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
427 427
428 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 428 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
429 EXPECT_EQ(0, parser.GetCertificatesSize()); 429 EXPECT_EQ(0, parser.GetCertificatesSize());
430 Network* network = parser.ParseNetwork(0); 430 Network* network = parser.ParseNetwork(0);
431 ASSERT_TRUE(network != NULL); 431 ASSERT_TRUE(network != NULL);
432 432
433 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 433 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
434 CheckStringProperty(network, PROPERTY_INDEX_TYPE, flimflam::kTypeVPN); 434 CheckStringProperty(network, PROPERTY_INDEX_TYPE, flimflam::kTypeVPN);
435 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network); 435 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
436 EXPECT_EQ("MyL2TPVPN", vpn->name()); 436 EXPECT_EQ("MyL2TPVPN", vpn->name());
(...skipping 25 matching lines...) Expand all
462 "1hbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA31WiJ9LvprrhKtDlW0RdLFAO7Qj" 462 "1hbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA31WiJ9LvprrhKtDlW0RdLFAO7Qj"
463 "kvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIA" 463 "kvs+sG6j2Vp2aBSrlhALG/0BVHUhWi4F/HHJho+ncLHAg5AGO0sdAjYUdQG6tfPqjLsIA"
464 "LtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17" 464 "LtoKEZZdFe/JhmqOEaxWsSdu2S2RdPgCQOsP79EH58gXwu2gejCkJDmU22WL4YLuqOc17"
465 "nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZT" 465 "nxbDC8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCv4vMD+PMlfnftu4/6Yf/oMLE8yCOqZT"
466 "Q/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dM" 466 "Q/dWCxB9PiJnOefiBeSzSZE6Uv3G7qnblZPVZaFeJMd+ostt0viCyPucFsFgLMyyoV1dM"
467 "VPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACR" 467 "VPVwJT5Iq1AHehWXnTBbxUK9wioA5jOEKdroKjuSSsg/Q8Wx6cpJmttQz5olGPgstmACR"
468 "WA==\"" 468 "WA==\""
469 " }" 469 " }"
470 " ]," 470 " ],"
471 "}"); 471 "}");
472 OncNetworkParser parser(test_blob); 472 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
473 473
474 EXPECT_EQ(1, parser.GetCertificatesSize()); 474 EXPECT_EQ(1, parser.GetCertificatesSize());
475 EXPECT_TRUE(parser.ParseCertificate(0)); 475 EXPECT_TRUE(parser.ParseCertificate(0));
476 } 476 }
477 477
478 TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) { 478 TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) {
479 const std::string test_blob(std::string("{" 479 const std::string test_blob(std::string("{"
480 " \"Certificates\": [") + 480 " \"Certificates\": [") +
481 std::string(kCertificateWebAuthority) + std::string( 481 std::string(kCertificateWebAuthority) + std::string(
482 " ]," 482 " ],"
483 "}")); 483 "}"));
484 OncNetworkParser parser(test_blob); 484 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
485 485
486 EXPECT_EQ(1, parser.GetCertificatesSize()); 486 EXPECT_EQ(1, parser.GetCertificatesSize());
487 EXPECT_TRUE(parser.ParseCertificate(0)); 487 EXPECT_TRUE(parser.ParseCertificate(0));
488 } 488 }
489 489
490 TEST_F(OncNetworkParserTest, TestAddClientCertificate) { 490 TEST_F(OncNetworkParserTest, TestAddClientCertificate) {
491 std::string test_blob( 491 std::string test_blob(
492 "{" 492 "{"
493 " \"Certificates\": [" 493 " \"Certificates\": ["
494 " {" 494 " {"
(...skipping 27 matching lines...) Expand all
522 "9jv3n8vSwvA0Xn0okAv1FWYLStiCpNxnD6lmXQvcmL/skAlJJpHY9/58qt/e5sGYrkKBw" 522 "9jv3n8vSwvA0Xn0okAv1FWYLStiCpNxnD6lmXQvcmL/skAlJJpHY9/58qt/e5sGYrkKBw"
523 "3jnX40zaK4W7GeJvhij0MRr6yUL2lvaEcWDnK6K1F90G/ybKRCTHBCJzyBe7yHhZCc+Zc" 523 "3jnX40zaK4W7GeJvhij0MRr6yUL2lvaEcWDnK6K1F90G/ybKRCTHBCJzyBe7yHhZCc+Zc"
524 "vKK6DTi83fELTyupy08BkXt7oPdapxmKlZxTldo9FpPXSqrdRtAWhDkEkIEf8dMf8QrQr" 524 "vKK6DTi83fELTyupy08BkXt7oPdapxmKlZxTldo9FpPXSqrdRtAWhDkEkIEf8dMf8QrQr"
525 "3glCWfbcQ047URYX45AHRnLTLLkJfdY8+Y3KsHoqL2UrOrct+J1u0mmnLbonN3pB2B4nd" 525 "3glCWfbcQ047URYX45AHRnLTLLkJfdY8+Y3KsHoqL2UrOrct+J1u0mmnLbonN3pB2B4nd"
526 "9X9vf9/uSFrgvk0iPO0Ro3UPRUIIYEP2Kx51pZZVDd++hl5gXtqe0NIpphGhxLycIdzEl" 526 "9X9vf9/uSFrgvk0iPO0Ro3UPRUIIYEP2Kx51pZZVDd++hl5gXtqe0NIpphGhxLycIdzEl"
527 "MCMGCSqGSIb3DQEJFTEWBBR1uVpGjHRddIEYuJhz/FgG4Onh6jAxMCEwCQYFKw4DAhoFA" 527 "MCMGCSqGSIb3DQEJFTEWBBR1uVpGjHRddIEYuJhz/FgG4Onh6jAxMCEwCQYFKw4DAhoFA"
528 "AQU1M+0WRDkoVGbGg1jj7q2fI67qHIECBzRYESpgt5iAgIIAA==\"" 528 "AQU1M+0WRDkoVGbGg1jj7q2fI67qHIECBzRYESpgt5iAgIIAA==\""
529 " }" 529 " }"
530 " ]," 530 " ],"
531 "}"); 531 "}");
532 OncNetworkParser parser(test_blob); 532 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
533 533
534 EXPECT_EQ(1, parser.GetCertificatesSize()); 534 EXPECT_EQ(1, parser.GetCertificatesSize());
535 EXPECT_TRUE(parser.ParseCertificate(0)); 535 EXPECT_TRUE(parser.ParseCertificate(0));
536 } 536 }
537 537
538 TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) { 538 TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) {
539 std::string test_blob(std::string( 539 std::string test_blob(std::string(
540 "{" 540 "{"
541 " \"NetworkConfigurations\": [") + 541 " \"NetworkConfigurations\": [") +
542 std::string(kNetworkConfigurationOpenVPN) + std::string( 542 std::string(kNetworkConfigurationOpenVPN) + std::string(
543 " ]," 543 " ],"
544 " \"Certificates\": [") + 544 " \"Certificates\": [") +
545 std::string(kCertificateWebAuthority) + std::string( 545 std::string(kCertificateWebAuthority) + std::string(
546 " ]," 546 " ],"
547 "}")); 547 "}"));
548 OncNetworkParser parser(test_blob); 548 OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
549 549
550 EXPECT_EQ(1, parser.GetCertificatesSize()); 550 EXPECT_EQ(1, parser.GetCertificatesSize());
551 EXPECT_TRUE(parser.ParseCertificate(0)); 551 EXPECT_TRUE(parser.ParseCertificate(0));
552 552
553 EXPECT_EQ(1, parser.GetNetworkConfigsSize()); 553 EXPECT_EQ(1, parser.GetNetworkConfigsSize());
554 Network* network = parser.ParseNetwork(0); 554 Network* network = parser.ParseNetwork(0);
555 ASSERT_TRUE(network != NULL); 555 ASSERT_TRUE(network != NULL);
556 EXPECT_EQ(network->type(), chromeos::TYPE_VPN); 556 EXPECT_EQ(network->type(), chromeos::TYPE_VPN);
557 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network); 557 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
558 EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type()); 558 EXPECT_EQ(PROVIDER_TYPE_OPEN_VPN, vpn->provider_type());
559 } 559 }
560 560
561 } // namespace chromeos 561 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698