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

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: 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": "{485d6076-dd44-6b6d-69787465725f5043}",
pneubeck (no reviews) 2014/02/17 10:11:36 use a short GUID so that it's easier to see that t
kaliamoorthi 2014/02/17 15:06:49 Done.
6 "Type": "WiFi",
7 "Name": "My WiFi Network",
8 "WiFi": {
9 "Passphrase": "chromeos",
10 "SSID": "CrOS_WPA_DlinkN150",
11 "Security": "WPA-PSK"
12 }
13 },
14 {
15 "GUID": "{485d6076-dd44-6b6d-69787465725f5043}",
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 "Certificates": [],
pneubeck (no reviews) 2014/02/17 10:11:36 can be removed.
kaliamoorthi 2014/02/17 15:06:49 Done.
26 "Type": "UnencryptedConfiguration"
27 },
28 "repaired-duplicate-network-guid": {
29 "NetworkConfigurations": [
30 {
31 "GUID": "{485d6076-dd44-6b6d-69787465725f5043}",
32 "Type": "WiFi",
33 "Name": "My WiFi Network",
34 "WiFi": {
35 "Passphrase": "chromeos",
36 "SSID": "CrOS_WPA_DlinkN150",
37 "Security": "WPA-PSK"
38 }
39 }
40 ],
41 "Certificates": [],
pneubeck (no reviews) 2014/02/17 10:11:36 ditto
kaliamoorthi 2014/02/17 15:06:49 Done.
42 "Type": "UnencryptedConfiguration"
43 },
44 "duplicate-cert-id": {
45 "Type": "UnencryptedConfiguration",
46 "Certificates": [
47 { "GUID": "2",
48 "Type": "Server",
49 "X509": "abc" },
50 { "GUID": "2",
51 "PKCS12": "abc" ,
52 "Type": "Client" }
53 ]
54 },
55 "repaired-duplicate-cert-id": {
56 "Type": "UnencryptedConfiguration",
57 "Certificates": [
58 { "GUID": "2",
59 "Type": "Server",
60 "X509": "abc" }
61 ]
62 },
2 "managed-network-repaired": { 63 "managed-network-repaired": {
3 "Recommended": [], 64 "Recommended": [],
4 "GUID": "guid", 65 "GUID": "guid",
5 "Type": "Ethernet", 66 "Type": "Ethernet",
6 "Name": "name", 67 "Name": "name",
7 "Ethernet": { 68 "Ethernet": {
8 "Authentication": "None" 69 "Authentication": "None"
9 } 70 }
10 }, 71 },
11 "managed-network-unknown-fieldname": { 72 "managed-network-unknown-fieldname": {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 "Security": "WPA-EAP", 235 "Security": "WPA-EAP",
175 "EAP": { 236 "EAP": {
176 "Outer": "EAP-TLS", 237 "Outer": "EAP-TLS",
177 "Identity": "abc ${LOGIN_ID}@my.domain.com", 238 "Identity": "abc ${LOGIN_ID}@my.domain.com",
178 "ClientCertType": "Pattern", 239 "ClientCertType": "Pattern",
179 "ClientCertPattern": { 240 "ClientCertPattern": {
180 "IssuerCARef": [ 241 "IssuerCARef": [
181 "{58ac1967-a0e7-49e9-be68-123abc}" 242 "{58ac1967-a0e7-49e9-be68-123abc}"
182 ], 243 ],
183 "EnrollmentURI": [ 244 "EnrollmentURI": [
184 "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/gen erate-cert.html" 245 "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/gen erate-cert.html"
185 ] 246 ]
186 } 247 }
187 } 248 }
188 } 249 }
189 }, 250 },
190 "ipsec-with-psk-and-cacert": { 251 "ipsec-with-psk-and-cacert": {
191 "AuthenticationType": "PSK", 252 "AuthenticationType": "PSK",
192 "IKEVersion": 1, 253 "IKEVersion": 1,
193 "PSK": "some psk", 254 "PSK": "some psk",
194 "ServerCARef": "a cert ref" 255 "ServerCARef": "a cert ref"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 "SSID": "ssid-wpa", 443 "SSID": "ssid-wpa",
383 "UnknownField1": "Value1", 444 "UnknownField1": "Value1",
384 "Security": "WPA-PSK" } 445 "Security": "WPA-PSK" }
385 } 446 }
386 ], 447 ],
387 "Certificates": [], 448 "Certificates": [],
388 "Type": "UnencryptedConfiguration", 449 "Type": "UnencryptedConfiguration",
389 "UnknownField3": [], 450 "UnknownField3": [],
390 } 451 }
391 } 452 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698