ONC: add support for non-utf-8 SSIDs

chromeos/network/managed_network_configuration_handler_impl.cc

 // Copyright 2013 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.
 
 #include "chromeos/network/managed_network_configuration_handler_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "chromeos/network/network_policy_observer.h"
 #include "chromeos/network/network_profile.h"
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/network_util.h"
 #include "chromeos/network/onc/onc_merger.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 "chromeos/network/policy_util.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 237 matching lines @@
                            false,  // Ignore missing fields.
                            false);  // This ONC does not come from policy.
 
   onc::Validator::Result validation_result;
   scoped_ptr<base::DictionaryValue> validated_user_settings =
       validator.ValidateAndRepairObject(
           &onc::kNetworkConfigurationSignature,
           *user_settings_copy,
           &validation_result);
 
+  // fill in HexSSID field from contents of SSID field if not set already
+  if (user_settings_copy.get() != NULL)

[pneubeck (no reviews), 2014/11/27 14:49:02]

nit: no .get()!=NULL and missing braces
 if (user_settings_copy) {
   ...
 }

nit: please check all comments to follow the scheme,
whole sentence starting with capital letter and ending with fullstop. :-)

[cschuet (SLOW), 2014/11/27 15:44:30]

Done.

+    onc::FillInHexSSIDFieldsInOncObject(
+        onc::kToplevelConfigurationSignature, user_settings_copy.get());

[pneubeck (no reviews), 2014/11/27 14:49:02]

bug:
user_settings_copy -> validated_user_settings

validated_user_settings is an onc::kNetworkConfigurationSignature not a toplevel
ONC.

please check whether you can add a SetProperties test to
managed_network_configuration_unittest that covers this case, i.e. that it
checks for the HexSSID to be sent to Shill.

[cschuet (SLOW), 2014/11/27 15:44:30]

Acknowledged.

+
+
   if (validation_result == onc::Validator::INVALID) {
     InvokeErrorCallback(service_path, error_callback, kInvalidUserSettings);
     return;
   }
   if (validation_result == onc::Validator::VALID_WITH_WARNINGS)
     LOG(WARNING) << "Validation of ONC user settings produced warnings.";
 
   const base::DictionaryValue* network_policy =
       GetByGUID(policies->per_network_config, guid);
   VLOG(2) << "This configuration is " << (network_policy ? "" : "not ")
@@ skipping 14 matching lines @@
 
 void ManagedNetworkConfigurationHandlerImpl::CreateConfiguration(
     const std::string& userhash,
     const base::DictionaryValue& properties,
     const network_handler::StringResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) const {
   const Policies* policies = GetPoliciesForUser(userhash);
   if (!policies) {
     InvokeErrorCallback("", error_callback, kPoliciesNotInitialized);
     return;
   }

[pneubeck (no reviews), 2014/11/27 14:56:45]

when we adapt the policy matching, you will have to call 
onc::FillInHexSSIDFieldsInOncObject
here before we do the policy matching.
We'll have to ensure that this works in a unit test of the
managed_network_configuration_handler (MNCH).

[cschuet (SLOW), 2014/11/27 15:44:30]

Acknowledged.

 
   if (policy_util::FindMatchingPolicy(policies->per_network_config,
                                       properties)) {
     InvokeErrorCallback("", error_callback, kNetworkAlreadyConfigured);
     return;
   }
 
   const NetworkProfile* profile =
       network_profile_handler_->GetProfileForUserhash(userhash);
   if (!profile) {
@@ skipping 451 matching lines @@
     scoped_ptr<base::DictionaryValue> network_properties,
     GetDevicePropertiesCallback send_callback,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Error getting device properties", service_path);
   send_callback.Run(service_path, network_properties.Pass());
 }
 
 
 }  // namespace chromeos