Extending the translation from ONC to Shill.

Added string expansion and UIData creation.

BUG=162040,147624
TBR=jochen@chromium.org (for gypi changes)


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

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

13 files changed, 205 insertions, 3 deletions

diff --git a/chromeos/test/data/network/shill_ethernet.json b/chromeos/test/data/network/shill_ethernet.json
index 7754932..19e0cc4 100644
--- a/chromeos/test/data/network/shill_ethernet.json
+++ b/chromeos/test/data/network/shill_ethernet.json
@@ -1,4 +1,3 @@
 { "GUID": "guid",
   "Type": "ethernet",
-  "Name": "name",
 }
diff --git a/chromeos/test/data/network/shill_l2tpipsec_clientcert.json b/chromeos/test/data/network/shill_l2tpipsec_clientcert.json
new file mode 100644
index 0000000..3c47214
--- /dev/null
+++ b/chromeos/test/data/network/shill_l2tpipsec_clientcert.json
@@ -0,0 +1,10 @@
+{
+   "GUID": "guid",
+   "L2TPIPsec.Password": "some password",
+   "L2TPIPsec.User": "some username",
+   "Name": "MyL2TPVPN",
+   "Provider.Host": "some.host.org",
+   "Provider.Type": "l2tpipsec",
+   "SaveCredentials": true,
+   "Type": "vpn",
+}
diff --git a/chromeos/test/data/network/shill_openvpn.json b/chromeos/test/data/network/shill_openvpn.json
index 08650df..2468863 100644
--- a/chromeos/test/data/network/shill_openvpn.json
+++ b/chromeos/test/data/network/shill_openvpn.json
@@ -6,7 +6,7 @@
     "Provider.Type": "openvpn",
     "Provider.Host": "vpn.my.domain.com",
     "OpenVPN.AuthRetry": "interact",
-    "OpenVPN.User": "some username",
+    "OpenVPN.User": "abc ${LOGIN_EMAIL} def",
     "OpenVPN.Password": "some password",
     "OpenVPN.StaticChallenge": "Please enter token OTP",
     "OpenVPN.CompLZO": "true",
diff --git a/chromeos/test/data/network/shill_openvpn_clientcert.json b/chromeos/test/data/network/shill_openvpn_clientcert.json
new file mode 100644
index 0000000..7210401
--- /dev/null
+++ b/chromeos/test/data/network/shill_openvpn_clientcert.json
@@ -0,0 +1,13 @@
+{
+   "GUID": "{84391467-dd8b-4c66-9b52-860583038351}",
+   "Name": "TestOpenVPN",
+   "OpenVPN.CACertNSS": "{126ea985-9ece-4250-8a32-6badf52a99e5}",
+   "OpenVPN.Password": "********",
+   "OpenVPN.Port": "1234",
+   "OpenVPN.Proto": "udp",
+   "OpenVPN.User": "hans",
+   "Provider.Host": "terminus.muc",
+   "Provider.Type": "openvpn",
+   "SaveCredentials": true,
+   "Type": "vpn",
+}
diff --git a/chromeos/test/data/network/shill_wifi_clientcert.json b/chromeos/test/data/network/shill_wifi_clientcert.json
new file mode 100644
index 0000000..5936934
--- /dev/null
+++ b/chromeos/test/data/network/shill_wifi_clientcert.json
@@ -0,0 +1,10 @@
+{
+   "EAP.EAP": "TLS",
+   "EAP.Identity": "abc ${LOGIN_ID}@my.domain.com",
+   "EAP.UseSystemCAs": true,
+   "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
+   "SSID": "SomeWifi-XY",
+   "SaveCredentials": true,
+   "Security": "802_1x",
+   "Type": "wifi"
+}
diff --git a/chromeos/test/data/network/shill_wifi_clientref.json b/chromeos/test/data/network/shill_wifi_clientref.json
new file mode 100644
index 0000000..d7cca33
--- /dev/null
+++ b/chromeos/test/data/network/shill_wifi_clientref.json
@@ -0,0 +1,10 @@
+{
+   "EAP.EAP": "TLS",
+   "EAP.Identity": "${LOGIN_ID}@my.domain.com",
+   "EAP.UseSystemCAs": true,
+   "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
+   "SSID": "SomeWifi-XY",
+   "SaveCredentials": true,
+   "Security": "802_1x",
+   "Type": "wifi"
+}
diff --git a/chromeos/test/data/network/shill_wifi_psk.json b/chromeos/test/data/network/shill_wifi_psk.json
new file mode 100644
index 0000000..572c4ac
--- /dev/null
+++ b/chromeos/test/data/network/shill_wifi_psk.json
@@ -0,0 +1,9 @@
+{
+   "AutoConnect": true,
+   "GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}",
+   "Passphrase": "some passphrase",
+   "SSID": "OpenWrt",
+   "Security": "psk",
+   "Type": "wifi",
+   "WiFi.HiddenSSID": false
+}
diff --git a/chromeos/test/data/network/valid_l2tpipsec_clientcert.onc b/chromeos/test/data/network/valid_l2tpipsec_clientcert.onc
new file mode 100644
index 0000000..6f20b18
--- /dev/null
+++ b/chromeos/test/data/network/valid_l2tpipsec_clientcert.onc
@@ -0,0 +1,31 @@
+{ "GUID": "guid",
+  "Type": "VPN",
+  "Name": "MyL2TPVPN",
+  "VPN": {
+      "Type": "L2TP-IPsec",
+      "Host": "some.host.org",
+      "IPsec": {
+          "AuthenticationType": "Cert",
+          "ClientCertType": "Pattern",
+          "ClientCertPattern": {
+              "EnrollmentURI": [ "my.enrollment.url" ],
+              "IssuerCARef": [
+                  "def",
+                  "abc"
+              ],
+              "Issuer": {
+                  "CommonName": "common_name",
+                  "Locality": "locality",
+                  "Organization": "organization",
+                  "OrganizationalUnit": "unit"
+              }
+          },
+          "IKEVersion": 1,
+          "SaveCredentials": true
+      },
+      "L2TP": {
+          "Username": "some username",
+          "Password": "some password"
+      }
+  }
+}
diff --git a/chromeos/test/data/network/valid_openvpn.onc b/chromeos/test/data/network/valid_openvpn.onc
index 2e0daca..ce80409 100644
--- a/chromeos/test/data/network/valid_openvpn.onc
+++ b/chromeos/test/data/network/valid_openvpn.onc
@@ -25,7 +25,7 @@
             "StaticChallenge": "Please enter token OTP",
             "TLSAuthContents": "-----BEGIN OpenVPN Static key V1-----\n83f8e7ccd99be189b4663e18615f9166\nd885cdea6c8accb0ebf5be304f0b8081\n5404f2a6574e029815d7a2fb65b83d0c\n676850714c6a56b23415a78e06aad6b1\n34900dd512049598382039e4816cb5ff\n1848532b71af47578c9b4a14b5bca49f\n99e0ae4dae2f4e5eadfea374aeb8fb1e\na6fdf02adc73ea778dfd43d64bf7bc75\n7779d629498f8c2fbfd32812bfdf6df7\n8cebafafef3e5496cb13202274f2768a\n1959bc53d67a70945c4c8c6f34b63327\nfb60dc84990ffec1243461e0b6310f61\ne90aee1f11fb6292d6f5fcd7cd508aab\n50d80f9963589c148cb4b933ec86128d\ned77d3fad6005b62f36369e2319f52bd\n09c6d2e52cce2362a05009dc29b6b39a\n-----END OpenVPN Static key V1-----\n",
             "TLSRemote": "my.domain.com",
-            "Username": "some username",
+            "Username": "abc ${LOGIN_EMAIL} def",
         }
     }
 }
diff --git a/chromeos/test/data/network/valid_openvpn_clientcert.onc b/chromeos/test/data/network/valid_openvpn_clientcert.onc
new file mode 100644
index 0000000..0a09327
--- /dev/null
+++ b/chromeos/test/data/network/valid_openvpn_clientcert.onc
@@ -0,0 +1,35 @@
+{
+    "GUID": "{84391467-dd8b-4c66-9b52-860583038351}",
+    "Name": "TestOpenVPN",
+    "ProxySettings": {
+        "Type": "Direct"
+    },
+    "Type": "VPN",
+    "VPN": {
+        "Host": "terminus.muc",
+        "OpenVPN": {
+            "ClientCertPattern": {
+                "EnrollmentURI": [ "my.enrollment.url" ],
+                "IssuerCARef": [
+                    "def",
+                    "abc"
+                ],
+                "Subject": {
+                    "CommonName": "common_name",
+                    "Locality": "locality",
+                    "Organization": "organization",
+                    "OrganizationalUnit": "unit"
+                }
+            },
+            "ClientCertType": "Pattern",
+            "Password": "********",
+            "Port": 1234,
+            "Proto": "udp",
+            "Recommended": [ "Username", "Password" ],
+            "SaveCredentials": true,
+            "ServerCARef": "{126ea985-9ece-4250-8a32-6badf52a99e5}",
+            "Username": "hans"
+        },
+        "Type": "OpenVPN"
+    }
+}
diff --git a/chromeos/test/data/network/valid_wifi_clientcert.onc b/chromeos/test/data/network/valid_wifi_clientcert.onc
new file mode 100644
index 0000000..c246a39
--- /dev/null
+++ b/chromeos/test/data/network/valid_wifi_clientcert.onc
@@ -0,0 +1,29 @@
+{
+    "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
+    "Type": "WiFi",
+    "Name": "SomeWifi-XY",
+    "WiFi": {
+        "SSID": "SomeWifi-XY",
+        "Security": "WPA-EAP",
+        "Recommended": [ "AutoConnect" ],
+        "EAP": {
+            "Outer": "EAP-TLS",
+            "Identity": "abc ${LOGIN_ID}@my.domain.com",
+            "UseSystemCAs": true,
+            "ClientCertType": "Pattern",
+            "ClientCertPattern": {
+                "IssuerCARef": [
+                    "{58ac1967-a0e7-49e9-be68-123abc}",
+                    "{42cb13cd-140c-4941-9fb6-456def}"
+                ],
+                "EnrollmentURI": [ "chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html" ]
+            },
+            "Recommended": [ "Identity" ],
+            "SaveCredentials": true
+        }
+    },
+    "ProxySettings": {
+        "Type": "PAC",
+        "PAC": "https://proxycfg.my.domain.com/proxy.dat"
+    }
+}
diff --git a/chromeos/test/data/network/valid_wifi_clientref.onc b/chromeos/test/data/network/valid_wifi_clientref.onc
new file mode 100644
index 0000000..259ff76
--- /dev/null
+++ b/chromeos/test/data/network/valid_wifi_clientref.onc
@@ -0,0 +1,23 @@
+{
+    "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
+    "Type": "WiFi",
+    "Name": "SomeWifi-XY",
+    "WiFi": {
+        "SSID": "SomeWifi-XY",
+        "Security": "WPA-EAP",
+        "Recommended": [ "AutoConnect" ],
+        "EAP": {
+            "Outer": "EAP-TLS",
+            "Identity": "${LOGIN_ID}@my.domain.com",
+            "UseSystemCAs": true,
+            "ClientCertType": "Ref",
+            "ClientCertRef": "{58ac1967-a0e7-49e9-be68-123abc}",
+            "Recommended": [ "Identity" ],
+            "SaveCredentials": true
+        }
+    },
+    "ProxySettings": {
+        "Type": "PAC",
+        "PAC": "https://proxycfg.my.domain.com/proxy.dat"
+    }
+}
diff --git a/chromeos/test/data/network/valid_wifi_psk.onc b/chromeos/test/data/network/valid_wifi_psk.onc
new file mode 100644
index 0000000..bbcca3b
--- /dev/null
+++ b/chromeos/test/data/network/valid_wifi_psk.onc
@@ -0,0 +1,33 @@
+{
+    "GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}",
+    "Name": "OpenWrt",
+    "ProxySettings": {
+        "Manual": {
+            "FTPProxy": {
+                "Host": "192.168.2.1",
+                "Port": 8889
+            },
+            "HTTPProxy": {
+                "Host": "192.168.2.1",
+                "Port": 8889
+            },
+            "SOCKS": {
+                "Host": "192.168.2.1",
+                "Port": 8889
+            },
+            "SecureHTTPProxy": {
+                "Host": "192.168.2.1",
+                "Port": 8889
+            }
+        },
+        "Type": "Manual"
+    },
+    "Type": "WiFi",
+    "WiFi": {
+        "AutoConnect": true,
+        "HiddenSSID": false,
+        "Passphrase": "some passphrase",
+        "SSID": "OpenWrt",
+        "Security": "WPA-PSK"
+    }
+}