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

Side by Side Diff: chromeos/test/data/network/invalid_settings_with_repairs.json

Issue 166903002: Identify and repair ONC files with duplicate GUIDs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Issue_23567011
Patch Set: Identify and repair ONC files with duplicate GUIDs Created 6 years, 10 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
OLDNEW
1 { 1 {
2 "duplicate-network-guid": {
3 "NetworkConfigurations": [
4 {
5 "GUID": "1",
6 "Type": "WiFi",
7 "Name": "My WiFi Network",
8 "WiFi": {
9 "Passphrase": "chromeos",
10 "SSID": "CrOS_WPA_DlinkN150",
pneubeck (no reviews) 2014/02/17 16:07:40 as discussed please also change the SSIDs/passphra
11 "Security": "WPA-PSK"
12 }
13 },
14 {
15 "GUID": "1",
16 "Type": "WiFi",
17 "Name": "My WiFi Network",
18 "WiFi": {
19 "Passphrase": "chromeos",
20 "SSID": "CrOS_WPA2_trendnet_tew639_gr",
21 "Security": "WPA-PSK"
22 }
23 }
24 ],
25 "Type": "UnencryptedConfiguration"
26 },
27 "repaired-duplicate-network-guid": {
28 "NetworkConfigurations": [
29 {
30 "GUID": "1",
31 "Type": "WiFi",
32 "Name": "My WiFi Network",
33 "WiFi": {
34 "Passphrase": "chromeos",
35 "SSID": "CrOS_WPA_DlinkN150",
36 "Security": "WPA-PSK"
37 }
38 }
39 ],
40 "Type": "UnencryptedConfiguration"
41 },
42 "duplicate-cert-guid": {
43 "Type": "UnencryptedConfiguration",
44 "Certificates": [
45 { "GUID": "2",
46 "Type": "Server",
47 "X509": "abc" },
48 { "GUID": "2",
49 "PKCS12": "abc" ,
50 "Type": "Client" }
51 ]
52 },
53 "repaired-duplicate-cert-guid": {
54 "Type": "UnencryptedConfiguration",
55 "Certificates": [
56 { "GUID": "2",
57 "Type": "Server",
58 "X509": "abc" }
59 ]
60 },
2 "managed-network-repaired": { 61 "managed-network-repaired": {
3 "Recommended": [], 62 "Recommended": [],
4 "GUID": "guid", 63 "GUID": "guid",
5 "Type": "Ethernet", 64 "Type": "Ethernet",
6 "Name": "name", 65 "Name": "name",
7 "Ethernet": { 66 "Ethernet": {
8 "Authentication": "None" 67 "Authentication": "None"
9 } 68 }
10 }, 69 },
11 "managed-network-unknown-fieldname": { 70 "managed-network-unknown-fieldname": {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 "Security": "WPA-EAP", 233 "Security": "WPA-EAP",
175 "EAP": { 234 "EAP": {
176 "Outer": "EAP-TLS", 235 "Outer": "EAP-TLS",
177 "Identity": "abc ${LOGIN_ID}@my.domain.com", 236 "Identity": "abc ${LOGIN_ID}@my.domain.com",
178 "ClientCertType": "Pattern", 237 "ClientCertType": "Pattern",
179 "ClientCertPattern": { 238 "ClientCertPattern": {
180 "IssuerCARef": [ 239 "IssuerCARef": [
181 "{58ac1967-a0e7-49e9-be68-123abc}" 240 "{58ac1967-a0e7-49e9-be68-123abc}"
182 ], 241 ],
183 "EnrollmentURI": [ 242 "EnrollmentURI": [
184 "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/gen erate-cert.html" 243 "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/gen erate-cert.html"
185 ] 244 ]
186 } 245 }
187 } 246 }
188 } 247 }
189 }, 248 },
190 "ipsec-with-psk-and-cacert": { 249 "ipsec-with-psk-and-cacert": {
191 "AuthenticationType": "PSK", 250 "AuthenticationType": "PSK",
192 "IKEVersion": 1, 251 "IKEVersion": 1,
193 "PSK": "some psk", 252 "PSK": "some psk",
194 "ServerCARef": "a cert ref" 253 "ServerCARef": "a cert ref"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 "SSID": "ssid-wpa", 441 "SSID": "ssid-wpa",
383 "UnknownField1": "Value1", 442 "UnknownField1": "Value1",
384 "Security": "WPA-PSK" } 443 "Security": "WPA-PSK" }
385 } 444 }
386 ], 445 ],
387 "Certificates": [], 446 "Certificates": [],
388 "Type": "UnencryptedConfiguration", 447 "Type": "UnencryptedConfiguration",
389 "UnknownField3": [], 448 "UnknownField3": [],
390 } 449 }
391 } 450 }
OLDNEW
« chromeos/network/onc/onc_validator.cc ('K') | « chromeos/network/onc/onc_validator_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698