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}

1 files changed, 14 insertions, 2 deletions

diff --git a/chromeos/network/onc/onc_normalizer.cc b/chromeos/network/onc/onc_normalizer.cc
index e2d869c..f93882f 100644
--- a/chromeos/network/onc/onc_normalizer.cc
+++ b/chromeos/network/onc/onc_normalizer.cc
@@ -179,8 +179,6 @@ void Normalizer::NormalizeNetworkConfiguration(base::DictionaryValue* network) {
 }
 
 void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {
-  using namespace ::onc::vpn;
-
   std::string clientcert_type;
   openvpn->GetStringWithoutPathExpansion(::onc::client_cert::kClientCertType,
                                          &clientcert_type);
@@ -190,6 +188,20 @@ void Normalizer::NormalizeOpenVPN(base::DictionaryValue* openvpn) {
   RemoveEntryUnless(openvpn,
                     ::onc::client_cert::kClientCertRef,
                     clientcert_type == ::onc::client_cert::kRef);
+
+  std::string user_auth_type;
+  openvpn->GetStringWithoutPathExpansion(
+      ::onc::openvpn::kUserAuthenticationType, &user_auth_type);
+  RemoveEntryUnless(
+      openvpn,
+      ::onc::openvpn::kPassword,
+      user_auth_type == ::onc::openvpn_user_auth_type::kPassword ||
+          user_auth_type == ::onc::openvpn_user_auth_type::kPasswordAndOTP);
+  RemoveEntryUnless(
+      openvpn,
+      ::onc::openvpn::kOTP,
+      user_auth_type == ::onc::openvpn_user_auth_type::kOTP ||
+          user_auth_type == ::onc::openvpn_user_auth_type::kPasswordAndOTP);
 }
 
 void Normalizer::NormalizeProxySettings(base::DictionaryValue* proxy) {