Add OpenVPN OTP and UserAuthenticationType fields to ONC.

Reland of https://codereview.chromium.org/560863002/ which the CQ failed to commit correctly.

This does not adapt the UI to respect the policy's UserAuthenticationType, yet.

BUG=347916
TBR=stevenjb@chromium.org
TEST=Ensured that a previously working policy pushed OpenVPN network still works.

Review URL: https://codereview.chromium.org/632223002

Cr-Commit-Position: refs/heads/master@{#298431}

9 files changed, 31 insertions, 6 deletions

diff --git a/chromeos/test/data/network/openvpn_clientcert_with_cert_pems.onc b/chromeos/test/data/network/openvpn_clientcert_with_cert_pems.onc
index f9e4403..c0f62a5 100644
--- a/chromeos/test/data/network/openvpn_clientcert_with_cert_pems.onc
+++ b/chromeos/test/data/network/openvpn_clientcert_with_cert_pems.onc
@@ -22,10 +22,10 @@
                 }
             },
             "ClientCertType": "Pattern",
-            "Password": "********",
+            "Password": "some password",
             "Port": 1234,
             "Proto": "udp",
-            "Recommended": [ "Username", "Password" ],
+            "Recommended": [ "Username", "Password", "OTP" ],
             "SaveCredentials": true,
             "Username": "hans"
         },
diff --git a/chromeos/test/data/network/openvpn_with_password.onc b/chromeos/test/data/network/openvpn_with_password.onc
new file mode 100644
index 0000000..ac513d4
--- /dev/null
+++ b/chromeos/test/data/network/openvpn_with_password.onc
@@ -0,0 +1,22 @@
+{
+    "GUID": "{a3860e83-f03d-4cb1-bafa-b22c9e746950}",
+    "Name": "my vpn",
+    "Type": "VPN",
+    "VPN": {
+        "AutoConnect": true,
+        "Host": "vpn.my.domain.com",
+        "Type": "OpenVPN",
+        "OpenVPN": {
+            "ClientCertType": "None",
+            "Password": "some password",
+            "Port": 443,
+            "Proto": "udp",
+            "PushPeerInfo": true,
+            "SaveCredentials": false,
+            "ServerPollTimeout": 10,
+            "UserAuthenticationType": "Password",
+            "Username": "abc ${LOGIN_EMAIL} def",
+        }
+    }
+}
+
diff --git a/chromeos/test/data/network/policy/policy_vpn.onc b/chromeos/test/data/network/policy/policy_vpn.onc
index 8345438..3091a74 100644
--- a/chromeos/test/data/network/policy/policy_vpn.onc
+++ b/chromeos/test/data/network/policy/policy_vpn.onc
@@ -12,6 +12,7 @@
           "Port":443,
           "Proto":"udp",
           "SaveCredentials":false,
+          "UserAuthenticationType":"Password",
           "Username":"abc ${LOGIN_EMAIL} def"
         },
         "Type":"OpenVPN"
diff --git a/chromeos/test/data/network/shill_openvpn.json b/chromeos/test/data/network/shill_openvpn.json
index 4fc59f5..3871f3b 100644
--- a/chromeos/test/data/network/shill_openvpn.json
+++ b/chromeos/test/data/network/shill_openvpn.json
@@ -9,7 +9,7 @@
   ],
   "OpenVPN.CompLZO":"true",
   "OpenVPN.KeyDirection":"1",
-  "OpenVPN.Password":"some password",
+  "OpenVPN.Token":"some OTP",
   "OpenVPN.Port":"443",
   "OpenVPN.Proto":"udp",
   "OpenVPN.PushPeerInfo":"true",
diff --git a/chromeos/test/data/network/shill_openvpn_clientcert.json b/chromeos/test/data/network/shill_openvpn_clientcert.json
index 8d7832e..f82b1e2 100644
--- a/chromeos/test/data/network/shill_openvpn_clientcert.json
+++ b/chromeos/test/data/network/shill_openvpn_clientcert.json
@@ -1,7 +1,7 @@
 {
    "GUID": "{84391467-dd8b-4c66-9b52-860583038351}",
    "Name": "TestOpenVPN",
-   "OpenVPN.Password": "********",
+   "OpenVPN.Password": "some password",
    "OpenVPN.Port": "1234",
    "OpenVPN.Proto": "udp",
    "OpenVPN.User": "hans",
diff --git a/chromeos/test/data/network/toplevel_openvpn_clientcert_with_cert_pems.onc b/chromeos/test/data/network/toplevel_openvpn_clientcert_with_cert_pems.onc
index 037e0a3..30cefca 100644
--- a/chromeos/test/data/network/toplevel_openvpn_clientcert_with_cert_pems.onc
+++ b/chromeos/test/data/network/toplevel_openvpn_clientcert_with_cert_pems.onc
@@ -26,6 +26,7 @@
           "AuthRetry": "interact",
           "CompLZO": "true",
           "KeyDirection": "1",
+          "OTP": "some OTP",
           "Port": 443,
           "Proto": "udp",
           "PushPeerInfo": true,
@@ -41,6 +42,7 @@
           "TLSRemote": "MyOpenVPNServer",
           "SaveCredentials": false,
           "ServerCAPEMs": [ "pem1" ],
+          "UserAuthenticationType": "OTP",
           "ClientCertType": "Pattern",
           "ClientCertPattern": {
             "Issuer": {
diff --git a/chromeos/test/data/network/translation_of_shill_openvpn.onc b/chromeos/test/data/network/translation_of_shill_openvpn.onc
index 1401114..203d77be3 100644
--- a/chromeos/test/data/network/translation_of_shill_openvpn.onc
+++ b/chromeos/test/data/network/translation_of_shill_openvpn.onc
@@ -10,7 +10,6 @@
             "AuthRetry": "interact",
             "CompLZO": "true",
             "KeyDirection": "1",
-            "Password": "some password",
             "Port": 443,
             "Proto": "udp",
             "PushPeerInfo": true,
diff --git a/chromeos/test/data/network/translation_of_shill_openvpn_with_errors.onc b/chromeos/test/data/network/translation_of_shill_openvpn_with_errors.onc
index e3faa65..1b6a575 100644
--- a/chromeos/test/data/network/translation_of_shill_openvpn_with_errors.onc
+++ b/chromeos/test/data/network/translation_of_shill_openvpn_with_errors.onc
@@ -9,7 +9,6 @@
             "AuthRetry": "interact",
             "CompLZO": "true",
             "KeyDirection": "1",
-            "Password": "some password",
             "Port": 443,
             "Proto": "udp",
             "PushPeerInfo": true,
diff --git a/chromeos/test/data/network/valid_openvpn_with_cert_pems.onc b/chromeos/test/data/network/valid_openvpn_with_cert_pems.onc
index e1be1c8..2d93984 100644
--- a/chromeos/test/data/network/valid_openvpn_with_cert_pems.onc
+++ b/chromeos/test/data/network/valid_openvpn_with_cert_pems.onc
@@ -11,6 +11,7 @@
             "ClientCertType": "None",
             "CompLZO": "true",
             "KeyDirection": "1",
+            "OTP": "some OTP",
             "Password": "some password",
             "Port": 443,
             "Proto": "udp",
@@ -28,6 +29,7 @@
             "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": "abc ${LOGIN_EMAIL} def",
+            "UserAuthenticationType": "OTP",
             "VerifyHash": "some hash",
             "VerifyX509": {
                 "Name": "some x509 name",