Replace OncNetworkParser by the new ONC translator.

chrome/browser/chromeos/cros/network_library_impl_base.cc

Index: chrome/browser/chromeos/cros/network_library_impl_base.cc
diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc
index f16c47365e84b43d39a0a56b5d6f7f281dab751a..6b92eb94cb79dac3b34b4ced018182535b5a4c50 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -6,16 +6,18 @@
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
-#include "chrome/browser/chromeos/cros/native_network_parser.h"
 #include "chrome/browser/chromeos/cros/network_constants.h"
-#include "chrome/browser/chromeos/cros/onc_network_parser.h"
+#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/browser/chromeos/network_login_observer.h"
 #include "chromeos/network/onc/onc_certificate_importer.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_signature.h"
+#include "chromeos/network/onc/onc_translator.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/onc/onc_validator.h"
 #include "content/public/browser/browser_thread.h"
@@ -1030,6 +1032,32 @@ void NetworkLibraryImplBase::SwitchToPreferredNetwork() {
   }
 }
 
+namespace {
+
+class UserStringSubstitution : public onc::StringSubstitution {
+ public:
+  UserStringSubstitution() {}
+  virtual bool GetSubstitute(std::string placeholder,
+                             std::string* substitute) {
+    if (!content::BrowserThread::IsMessageLoopValid(
+            content::BrowserThread::UI) ||

[stevenjb, 2012/12/21 18:38:36]

This is an odd place for a thread check. I would either put it at the top of
LoadOncNetworks or remove it entirely.

[pneubeck (no reviews), 2013/01/09 17:04:05]

Yeah, I dropped the original comment during copy/paste.
I remove this condition, once we have new tests.

+        !UserManager::Get()->IsUserLoggedIn()) {
+      return false;
+    }
+
+    const User* logged_in_user = UserManager::Get()->GetLoggedInUser();
+    if (placeholder == onc::substitutes::kLoginIDField)
+      *substitute = logged_in_user->GetAccountName(false);
+    else if (placeholder == onc::substitutes::kEmailField)
+      *substitute = logged_in_user->email();
+    else
+      return false;
+    return true;
+  }
+};
+
+}  // namespace
+
 bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
                                              const std::string& passphrase,
                                              onc::ONCSource source,
@@ -1080,23 +1108,24 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
                            from_policy);
 
   onc::Validator::Result validation_result;
-  validator.ValidateAndRepairObject(&onc::kToplevelConfigurationSignature,
-                                    *root_dict,
-                                    &validation_result);
+  root_dict = validator.ValidateAndRepairObject(
+      &onc::kToplevelConfigurationSignature,
+      *root_dict,
+      &validation_result);
 
   if (from_policy) {
     UMA_HISTOGRAM_BOOLEAN("Enterprise.ONC.PolicyValidation",
                           validation_result == onc::Validator::VALID);
   }
 
-  bool success = true;
   if (validation_result == onc::Validator::VALID_WITH_WARNINGS) {
     LOG(WARNING) << "ONC from " << onc::GetSourceAsString(source)
                  << " produced warnings.";
-  } else if (validation_result == onc::Validator::INVALID) {
+  } else if (validation_result == onc::Validator::INVALID ||
+             root_dict == NULL) {
     LOG(ERROR) << "ONC from " << onc::GetSourceAsString(source)
                << " is invalid and couldn't be repaired.";
-    success = false;
+    return false;
   }
 
   const base::ListValue* certificates;
@@ -1108,6 +1137,7 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
       onc::kNetworkConfigurations,
       &network_configs);
 
+  bool success = true;
   if (has_certificates) {
     VLOG(2) << "ONC file has " << certificates->GetSize() << " certificates";
 
@@ -1125,32 +1155,36 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
   network_ids.clear();
   if (has_network_configurations) {
     VLOG(2) << "ONC file has " << network_configs->GetSize() << " networks";
-    OncNetworkParser parser(*network_configs, source);
+    for (base::ListValue::const_iterator it(network_configs->begin());
+         it != network_configs->end(); ++it) {
+      const base::DictionaryValue* network;
+      (*it)->GetAsDictionary(&network);
 
-    for (int i = 0; i < parser.GetNetworkConfigsSize(); i++) {
-      // Parse Open Network Configuration blob into a temporary Network object.
       bool marked_for_removal = false;
-      scoped_ptr<Network> network(parser.ParseNetwork(i, &marked_for_removal));
-      if (!network) {
-        LOG(ERROR) << "Error during ONC parsing network at index " << i
-                   << " from " << onc::GetSourceAsString(source);
-        success = false;
-        continue;
-      }
+      network->GetBooleanWithoutPathExpansion(onc::kRemove,
+                                              &marked_for_removal);
+
+      std::string type;
+      network->GetStringWithoutPathExpansion(onc::kType,
+                                             &type);

[stevenjb, 2012/12/21 18:38:36]

one line

[pneubeck (no reviews), 2013/01/09 17:04:05]

Done.

 
       // Disallow anything but WiFi and Ethernet for device-level policy (which
       // corresponds to shared networks). See also http://crosbug.com/28741.
       if (source == onc::ONC_SOURCE_DEVICE_POLICY &&
-          network->type() != TYPE_WIFI &&
-          network->type() != TYPE_ETHERNET) {
+          type != onc::kWiFi &&
+          type != onc::kEthernet) {
         LOG(WARNING) << "Ignoring device-level policy-pushed network of type "
-                     << network->type();
+                     << type;
         continue;
       }
 
+      std::string guid;
+      network->GetStringWithoutPathExpansion(onc::kGUID,
+                                             &guid);

[stevenjb, 2012/12/21 18:38:36]

one line

[pneubeck (no reviews), 2013/01/09 17:04:05]

Done.

+
       if (source == onc::ONC_SOURCE_USER_IMPORT && marked_for_removal) {
         // User import supports the removal of networks by ID.
-        removal_ids.insert(network->unique_id());
+        removal_ids.insert(guid);
         continue;
       }
 
@@ -1162,47 +1196,66 @@ bool NetworkLibraryImplBase::LoadOncNetworks(const std::string& onc_blob,
         continue;
       }
 
+      // Expand strings like LoginID
+      base::DictionaryValue* expanded_network = network->DeepCopy();
+      UserStringSubstitution substitution;
+      ExpandStringsInOncObject(onc::kNetworkConfigurationSignature,
+                               &substitution,
+                               expanded_network);
+
       // Update the ONC map.
-      const base::DictionaryValue*& entry =
-          network_onc_map_[network->unique_id()];
+      const base::DictionaryValue*& entry = network_onc_map_[guid];
       delete entry;
-      entry = parser.GetNetworkConfig(i)->DeepCopy();
+      entry = expanded_network;
 
       // Configure the network.
-      base::DictionaryValue dict;
-      for (Network::PropertyMap::const_iterator props =
-               network->property_map_.begin();
-           props != network->property_map_.end(); ++props) {
-        std::string key =
-            NativeNetworkParser::property_mapper()->GetKey(props->first);
-        if (!key.empty())
-          dict.SetWithoutPathExpansion(key, props->second->DeepCopy());
-        else
-          VLOG(2) << "Property " << props->first << " will not be sent";
+      scoped_ptr<base::DictionaryValue> shill_dict =
+          onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
+                                         *expanded_network);
+
+      // Set the ProxyConfig.
+      const base::DictionaryValue* proxy_settings;
+      if (expanded_network->GetDictionaryWithoutPathExpansion(
+              onc::kProxySettings,
+              &proxy_settings)) {
+        scoped_ptr<base::DictionaryValue> proxy_config =
+            onc::ConvertOncProxySettingsToProxyConfig(*proxy_settings);
+        std::string proxy_json;
+        base::JSONWriter::Write(proxy_config.get(), &proxy_json);
+        shill_dict->SetStringWithoutPathExpansion(
+            flimflam::kProxyConfigProperty,
+            proxy_json);
       }
 
+      // Set the UIData.
+      scoped_ptr<base::DictionaryValue> ui_data =
+          CreateUIData(source, *expanded_network);
+      std::string ui_data_json;
+      base::JSONWriter::Write(ui_data.get(), &ui_data_json);
+      shill_dict->SetStringWithoutPathExpansion(
+          flimflam::kUIDataProperty,
+          ui_data_json);
+
       // Set the appropriate profile for |source|.
-      if (profile != NULL)
-        dict.SetString(flimflam::kProfileProperty, profile->path);
+      if (profile != NULL) {
+        shill_dict->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
+                                                  profile->path);
+      }
 
       // For Ethernet networks, apply them to the current Ethernet service.
-      if (network->type() == TYPE_ETHERNET) {
+      if (type == onc::kEthernet) {
         const EthernetNetwork* ethernet = ethernet_network();
         if (ethernet) {
-          CallConfigureService(ethernet->unique_id(), &dict);
+          CallConfigureService(ethernet->unique_id(), shill_dict.get());
         } else {
           LOG(WARNING) << "Tried to import ONC with an Ethernet network when "
                        << "there is no active Ethernet connection.";
         }
       } else {
-        CallConfigureService(network->unique_id(), &dict);
+        CallConfigureService(guid, shill_dict.get());
       }
 
-      // Store the unique identifier of the network that is defined in the ONC
-      // blob in |network_ids|. The identifiers are later used to clean out any
-      // previously-existing networks that had been configured through policy
-      // but are no longer specified in the updated ONC blob.
-      network_ids.insert(network->unique_id());
+      network_ids.insert(guid);
     }
   }