Add a check for server and CA certificates in device policies to the ONC validator.

Checking for empty GUIDs and added a note to the ONC spec.
Cleaned up the CertificateImporter on the way.

TBR=stevenjb@chromium.org (small NetworkLibrary change reviewed by Greg, added a test file)
BUG=170357


Review URL: https://chromiumcodereview.appspot.com/11970012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178820 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 59 insertions, 0 deletions

diff --git a/chromeos/test/data/network/invalid_settings_with_repairs.json b/chromeos/test/data/network/invalid_settings_with_repairs.json
index e1ab1d4..c639d82 100644
--- a/chromeos/test/data/network/invalid_settings_with_repairs.json
+++ b/chromeos/test/data/network/invalid_settings_with_repairs.json
@@ -135,6 +135,28 @@
             "Authentication": "None"
         }
     },
+    "network-with-client-cert-pattern": {
+        "GUID": "guid",
+        "Type": "WiFi",
+        "Name": "name",
+        "WiFi": {
+            "SSID": "ssid",
+            "Security": "WPA-EAP",
+            "EAP": {
+                "Outer": "EAP-TLS",
+                "Identity": "abc ${LOGIN_ID}@my.domain.com",
+                "ClientCertType": "Pattern",
+                "ClientCertPattern": {
+                    "IssuerCARef": [
+                        "{58ac1967-a0e7-49e9-be68-123abc}"
+                    ],
+                    "EnrollmentURI": [
+                        "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html" 
+                    ]
+                }
+            }
+        }
+    },
     "toplevel-empty": {
         "Type": "UnencryptedConfiguration",
         "NetworkConfigurations": [ ]
@@ -151,6 +173,22 @@
           }
         ]
     },
+    "toplevel-with-vpn": {
+        "Type": "UnencryptedConfiguration",
+        "NetworkConfigurations":
+        [ { "GUID": "guid",
+            "Type": "VPN",
+            "Name": "name",
+            "VPN": {
+                "Host": "host",
+                "Type": "OpenVPN",
+                "OpenVPN": {
+                  "ClientCertType": "None"
+                }
+            }
+          }
+        ]
+    },
     "toplevel-with-nested-warning": {
         "Type": "UnencryptedConfiguration",
         "NetworkConfigurations":
@@ -183,4 +221,25 @@
           }
         ]
     },
+    "toplevel-server-and-ca-cert-dropped": {
+      "Type": "UnencryptedConfiguration",
+      "Certificates":
+      [ { "GUID": "3",
+          "PKCS12": "abc" ,
+          "Type": "Client" } ]
+    },
+    "toplevel-with-server-and-ca-cert": {
+      "Type": "UnencryptedConfiguration",
+      "Certificates":
+      [ { "Trust": ["Web"],
+          "GUID": "1",
+          "Type": "Authority",
+          "X509": "abc" },
+        { "GUID": "2",
+          "Type": "Server",
+          "X509": "abc" },
+        { "GUID": "3",
+          "PKCS12": "abc" ,
+          "Type": "Client" } ]
+    }
 }