Extending the translation from ONC to Shill.

chromeos/network/onc/onc_translator_onc_to_shill.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // The implementation of TranslateONCObjectToShill is structured in two parts:
 // - The recursion through the existing ONC hierarchy
 //     see TranslateONCHierarchy
 // - The local translation of an object depending on the associated signature
 //     see LocalTranslator::TranslateFields
 
@@ skipping 35 matching lines @@
       : onc_signature_(&onc_signature),
         onc_object_(&onc_object),
         shill_dictionary_(shill_dictionary) {
   }
 
   void TranslateFields();
 
  private:
   void TranslateOpenVPN();
   void TranslateVPN();
+  void TranslateWiFi();
+  void TranslateEAP();
   void TranslateNetworkConfiguration();
 
   // Copies all entries from |onc_object_| to |shill_dictionary_| for which a
   // translation (shill_property_name) is defined by |onc_signature_|.
   void CopyFieldsAccordingToSignature();
 
   // Adds |value| to |shill_dictionary| at the field shill_property_name given
   // by the associated signature. Takes ownership of |value|. Does nothing if
   // |value| is NULL or the property name cannot be read from the signature.
   void AddValueAccordingToSignature(const std::string& onc_field_name,
@@ skipping 13 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(LocalTranslator);
 };
 
 void LocalTranslator::TranslateFields() {
   if (onc_signature_ == &kNetworkConfigurationSignature)
     TranslateNetworkConfiguration();
   else if (onc_signature_ == &kVPNSignature)
     TranslateVPN();
   else if (onc_signature_ == &kOpenVPNSignature)
     TranslateOpenVPN();
+  else if (onc_signature_ == &kWiFiSignature)
+    TranslateWiFi();
+  else if (onc_signature_ == &kEAPSignature)
+    TranslateEAP();
   else
     CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateOpenVPN() {
   // Shill supports only one RemoteCertKU but ONC a list.
   // Copy only the first entry if existing.
   const base::ListValue* certKUs;
   std::string certKU;
   if (onc_object_->GetListWithoutPathExpansion(vpn::kRemoteCertKU, &certKUs) &&
       certKUs->GetString(0, &certKU)) {
     shill_dictionary_->SetStringWithoutPathExpansion(
         flimflam::kOpenVPNRemoteCertKUProperty, certKU);
   }
 
   for (base::DictionaryValue::Iterator it(*onc_object_); it.HasNext();
        it.Advance()) {
     scoped_ptr<base::Value> translated;
     if (it.key() == vpn::kSaveCredentials || it.key() == vpn::kRemoteCertKU) {
       translated.reset(it.value().DeepCopy());
     } else {
       // Shill wants all Provider/VPN fields to be strings.
       translated = ConvertValueToString(it.value());
     }
     AddValueAccordingToSignature(it.key(), translated.Pass());
   }
 }
 
 void LocalTranslator::TranslateVPN() {
-  TranslateWithTableAndSet(kType, kVPNTypeTable,
+  std::string type;
+  onc_object_->GetStringWithoutPathExpansion(kType, &type);
+  TranslateWithTableAndSet(type, kVPNTypeTable,
                            flimflam::kProviderTypeProperty);
+
+  CopyFieldsAccordingToSignature();
+}
+
+void LocalTranslator::TranslateWiFi() {
+  std::string security;
+  onc_object_->GetStringWithoutPathExpansion(wifi::kSecurity, &security);
+  TranslateWithTableAndSet(security, kWiFiSecurityTable,
+                           flimflam::kSecurityProperty);
+
+  CopyFieldsAccordingToSignature();
+}
+
+void LocalTranslator::TranslateEAP() {
+  std::string outer;
+  onc_object_->GetStringWithoutPathExpansion(eap::kOuter, &outer);
+  TranslateWithTableAndSet(outer, kEAPOuterTable, flimflam::kEapMethodProperty);
+
+  // Translate the inner protocol only for outer tunneling protocols.
+  if (outer == eap::kPEAP || outer == eap::kEAP_TTLS) {
+    // In ONC the Inner protocol defaults to "Automatic".
+    std::string inner = eap::kAutomatic;
+    // ONC's Inner == "Automatic" translates to omitting the Phase2 property in
+    // Shill.
+    onc_object_->GetStringWithoutPathExpansion(eap::kInner, &inner);
+    if (inner != eap::kAutomatic) {
+      const StringTranslationEntry* table =
+          outer == eap::kPEAP ? kEAP_PEAP_InnerTable : kEAP_TTLS_InnerTable;
+      TranslateWithTableAndSet(inner, table, flimflam::kEapPhase2AuthProperty);
+    }
+  }
+
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateNetworkConfiguration() {
-  TranslateWithTableAndSet(kType, kNetworkTypeTable, flimflam::kTypeProperty);
+  std::string type;
+  onc_object_->GetStringWithoutPathExpansion(kType, &type);
+  TranslateWithTableAndSet(type, kNetworkTypeTable, flimflam::kTypeProperty);
+
+  // Shill doesn't allow setting the name for non-VPN networks.
+  if (type == kVPN) {
+    std::string name;
+    onc_object_->GetStringWithoutPathExpansion(kName, &name);
+    shill_dictionary_->SetStringWithoutPathExpansion(
+        flimflam::kNameProperty, name);
+  }
+
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::CopyFieldsAccordingToSignature() {
   for (base::DictionaryValue::Iterator it(*onc_object_); it.HasNext();
        it.Advance()) {
     AddValueAccordingToSignature(it.key(),
                                  make_scoped_ptr(it.value().DeepCopy()));
   }
 }
 
 void LocalTranslator::AddValueAccordingToSignature(
     const std::string& onc_name,
     scoped_ptr<base::Value> value) {
   if (value.get() == NULL)
     return;
   const OncFieldSignature* field_signature =
       GetFieldSignature(*onc_signature_, onc_name);
   DCHECK(field_signature != NULL);
   if (field_signature == NULL || field_signature->shill_property_name == NULL)
     return;
 
   shill_dictionary_->SetWithoutPathExpansion(
       field_signature->shill_property_name, value.release());
 }
 
 void LocalTranslator::TranslateWithTableAndSet(
-    const std::string& onc_field_name,
+    const std::string& onc_value,
     const StringTranslationEntry table[],
     const std::string& shill_property_name) {
-  std::string onc_value;
-  if (!onc_object_->GetStringWithoutPathExpansion(onc_field_name, &onc_value))
-    return;
-
   for (int i = 0; table[i].onc_value != NULL; ++i) {
     if (onc_value != table[i].onc_value)
       continue;
     shill_dictionary_->SetStringWithoutPathExpansion(shill_property_name,
                                                      table[i].shill_value);
     return;
   }
   // As we previously validate ONC, this case should never occur. If it still
   // occurs, we should check here. Otherwise the failure will only show up much
   // later in Shill.
-  LOG(ERROR) << "Value '" << onc_value << "' for field '"
-             << onc_field_name << "' cannot be translated to Shill";
+  LOG(ERROR) << "Value '" << onc_value << "cannot be translated to Shill";
 }
 
 // Iterates recursively over |onc_object| and its |signature|. At each object
 // applies the local translation using LocalTranslator::TranslateFields. The
 // results are written to |shill_dictionary|.
 void TranslateONCHierarchy(const OncValueSignature& signature,
                            const base::DictionaryValue& onc_object,
                            base::DictionaryValue* shill_dictionary) {
   // Translates fields of |onc_object| and writes them to |shill_dictionary_|.
   LocalTranslator translator(signature, onc_object, shill_dictionary);
@@ skipping 20 matching lines @@
     const OncValueSignature* onc_signature,
     const base::DictionaryValue& onc_object) {
   CHECK(onc_signature != NULL);
   scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
   TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
   return shill_dictionary.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos