diff options
| author | kaliamoorthi@chromium.org <kaliamoorthi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 11:38:04 +0000 |
|---|---|---|
| committer | kaliamoorthi@chromium.org <kaliamoorthi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 11:38:04 +0000 |
| commit | 97e0800e68fdf6f9018bb83e2a8f2a865a92d0c7 (patch) | |
| tree | 47dfcdcb19936713dfc0db76c2f5fa5de09efb1a /chromeos/test | |
| parent | ef6866f187737df1724428cf39f8193592427939 (diff) | |
| download | chromium_src-97e0800e68fdf6f9018bb83e2a8f2a865a92d0c7.zip chromium_src-97e0800e68fdf6f9018bb83e2a8f2a865a92d0c7.tar.gz chromium_src-97e0800e68fdf6f9018bb83e2a8f2a865a92d0c7.tar.bz2 | |
Identify and repair ONC files with duplicate GUIDs.
The patch identifies network configurations and certificates with duplicate GUIDs and repairs the ONC such that the first occurrence is retained as a unique network configuration or certificate.
BUG=211421
Review URL: https://codereview.chromium.org/166903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/test')
| -rw-r--r-- | chromeos/test/data/network/invalid_settings_with_repairs.json | 61 |
1 files changed, 60 insertions, 1 deletions
diff --git a/chromeos/test/data/network/invalid_settings_with_repairs.json b/chromeos/test/data/network/invalid_settings_with_repairs.json index fbe6ada..e95c698 100644 --- a/chromeos/test/data/network/invalid_settings_with_repairs.json +++ b/chromeos/test/data/network/invalid_settings_with_repairs.json @@ -1,4 +1,63 @@ { + "duplicate-network-guid": { + "NetworkConfigurations": [ + { + "GUID": "1", + "Type": "WiFi", + "Name": "My WiFi Network", + "WiFi": { + "Passphrase": "dummy", + "SSID": "dummySSID", + "Security": "WPA-PSK" + } + }, + { + "GUID": "1", + "Type": "WiFi", + "Name": "My WiFi Network", + "WiFi": { + "Passphrase": "dummy1", + "SSID": "dummySSID1", + "Security": "WPA-PSK" + } + } + ], + "Type": "UnencryptedConfiguration" + }, + "repaired-duplicate-network-guid": { + "NetworkConfigurations": [ + { + "GUID": "1", + "Type": "WiFi", + "Name": "My WiFi Network", + "WiFi": { + "Passphrase": "dummy", + "SSID": "dummySSID", + "Security": "WPA-PSK" + } + } + ], + "Type": "UnencryptedConfiguration" + }, + "duplicate-cert-guid": { + "Type": "UnencryptedConfiguration", + "Certificates": [ + { "GUID": "2", + "Type": "Server", + "X509": "abc" }, + { "GUID": "2", + "PKCS12": "abc" , + "Type": "Client" } + ] + }, + "repaired-duplicate-cert-guid": { + "Type": "UnencryptedConfiguration", + "Certificates": [ + { "GUID": "2", + "Type": "Server", + "X509": "abc" } + ] + }, "managed-network-repaired": { "Recommended": [], "GUID": "guid", @@ -181,7 +240,7 @@ "{58ac1967-a0e7-49e9-be68-123abc}" ], "EnrollmentURI": [ - "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html" + "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html" ] } } |