Add Source property to networkingPrivate.getState

chromeos/network/network_util.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.
 
 #include "chromeos/network/network_util.h"
 
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "chromeos/login/login_state.h"
+#include "chromeos/network/managed_network_configuration_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/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 WifiAccessPoint::WifiAccessPoint()
     : signal_strength(0),
       signal_to_noise(0),
@@ skipping 116 matching lines @@
     scan_results->push_back(scan_result);
   }
   return true;
 }
 
 scoped_ptr<base::DictionaryValue> TranslateNetworkStateToONC(
     const NetworkState* network) {
   // Get the properties from the NetworkState.
   base::DictionaryValue shill_dictionary;
   network->GetStateProperties(&shill_dictionary);
+  // Set the Profile property so that Source gets translated.
+  shill_dictionary.SetStringWithoutPathExpansion(shill::kProfileProperty,

[pneubeck (no reviews), 2015/02/17 18:00:49]

why not adding this in NetworkState::GetStateProperties ?
I thought that function was exactly meant to add exactly what should show up in
GetState/GetNetworks (this call is actually the only one to that function).

[stevenjb, 2015/02/17 18:23:30]

Done.

+                                                 network->profile_path());
+
+  // NetworkState is always associated with the primary user profile, regardless
+  // of what profile is associated with the page that calls this method. We do
+  // not expose any sensitive properties in the resulting dictionary, it is
+  // only used to show connection state and icons.
+  std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash();
+  ::onc::ONCSource onc_source;

[pneubeck (no reviews), 2015/02/17 18:00:49]

pls initialize explicitly to ONC_SOURCE_NONE to prevent non-deterministic
behavior in case of a bug.

[stevenjb, 2015/02/17 18:23:31]

Done.

+  NetworkHandler::Get()
+      ->managed_network_configuration_handler()
+      ->FindPolicyByGUID(user_id_hash, network->guid(), &onc_source);
 
   scoped_ptr<base::DictionaryValue> onc_dictionary =
-      TranslateShillServiceToONCPart(shill_dictionary,
-                                     ::onc::ONC_SOURCE_UNKNOWN,
+      TranslateShillServiceToONCPart(shill_dictionary, onc_source,
                                      &onc::kNetworkWithStateSignature);
   return onc_dictionary.Pass();
 }
 
 scoped_ptr<base::ListValue> TranslateNetworkListToONC(
     NetworkTypePattern pattern,
     bool configured_only,
     bool visible_only,
     int limit,
     bool debugging_properties) {
   NetworkStateHandler::NetworkStateList network_states;
   NetworkHandler::Get()->network_state_handler()->GetNetworkListByType(
       pattern, configured_only, visible_only, limit, &network_states);
 
   scoped_ptr<base::ListValue> network_properties_list(new base::ListValue);
-  for (NetworkStateHandler::NetworkStateList::iterator it =
-           network_states.begin();
-       it != network_states.end();
-       ++it) {
+  for (auto state : network_states) {

[pneubeck (no reviews), 2015/02/17 18:00:49]

optional nit: I usually prefer keeping the element type, const NetworkState*,
for clarity.

[stevenjb, 2015/02/17 18:23:30]

Done.

     scoped_ptr<base::DictionaryValue> onc_dictionary =
-        TranslateNetworkStateToONC(*it);
+        TranslateNetworkStateToONC(state);
 
     if (debugging_properties) {
-      onc_dictionary->SetBoolean("connectable", (*it)->connectable());
-      onc_dictionary->SetBoolean("visible", (*it)->visible());
-      onc_dictionary->SetString("profile_path", (*it)->profile_path());
-      onc_dictionary->SetString("service_path", (*it)->path());
+      onc_dictionary->SetBoolean("connectable", state->connectable());
+      onc_dictionary->SetBoolean("visible", state->visible());
+      onc_dictionary->SetString("profile_path", state->profile_path());
+      onc_dictionary->SetString("service_path", state->path());
     }
 
     network_properties_list->Append(onc_dictionary.release());
   }
   return network_properties_list.Pass();
 }
 
 std::string TranslateONCTypeToShill(const std::string& onc_type) {
   if (onc_type == ::onc::network_type::kEthernet)
     return shill::kTypeEthernet;
   std::string shill_type;
   onc::TranslateStringToShill(onc::kNetworkTypeTable, onc_type, &shill_type);
   return shill_type;
 }
 
 std::string TranslateShillTypeToONC(const std::string& shill_type) {
   if (shill_type == shill::kTypeEthernet)
     return ::onc::network_type::kEthernet;
   std::string onc_type;
   onc::TranslateStringToONC(onc::kNetworkTypeTable, shill_type, &onc_type);
   return onc_type;
 }
 
 }  // namespace network_util
 }  // namespace chromeos