Notify ARC of default network changes

components/arc/net/arc_net_host_impl.cc

Index: components/arc/net/arc_net_host_impl.cc
diff --git a/components/arc/net/arc_net_host_impl.cc b/components/arc/net/arc_net_host_impl.cc
index 3ffab61ca33da84bbe185c923dcfd17459a8cc07..25ebdbed88155ab82a06650202fcba60082ef3f5 100644
--- a/components/arc/net/arc_net_host_impl.cc
+++ b/components/arc/net/arc_net_host_impl.cc
@@ -53,6 +53,21 @@ bool IsDeviceOwner() {
          chromeos::LoginState::LOGGED_IN_USER_OWNER;
 }
 
+std::string GetStringFromOncDictionary(const base::DictionaryValue* dict,
+                                       const char* key,
+                                       bool required) {
+  std::string tmp;
+
+  if (required) {
+    if (!dict->GetString(key, &tmp))
+      NOTREACHED();
+    DCHECK(!tmp.empty());
+  } else {
+    dict->GetString(key, &tmp);
+  }

[stevenjb, 2016/05/17 18:02:41]

This can be simpligied:

std:string tmp;
dict->GetString(key, &tmp);
if (required && tmp.empty())
  NOTREACHED();
return tmp;

[Kevin Cernekee, 2016/05/17 19:38:58]

Done.

+  return tmp;
+}

[stevenjb, 2016/05/17 18:02:41]

All file local (i.e. non public) helper functions should be inside an anonymous
namespace.

[Kevin Cernekee, 2016/05/17 19:38:58]

Done.

+
 ArcNetHostImpl::ArcNetHostImpl(ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
   arc_bridge_service()->AddObserver(this);
@@ -370,6 +385,227 @@ void ArcNetHostImpl::ScanCompleted(const chromeos::DeviceState* /*unused*/) {
   arc_bridge_service()->net_instance()->ScanCompleted();
 }
 
+mojom::SecurityType TranslateONCWifiSecurityType(
+    const base::DictionaryValue* dict) {
+  std::string tmp = GetStringFromOncDictionary(dict, onc::wifi::kSecurity,
+                                               true /* required */);
+  if (tmp == onc::wifi::kWEP_PSK)
+    return mojom::SecurityType::WEP_PSK;
+  else if (tmp == onc::wifi::kWEP_8021X)
+    return mojom::SecurityType::WEP_8021X;
+  else if (tmp == onc::wifi::kWPA_PSK)
+    return mojom::SecurityType::WPA_PSK;
+  else if (tmp == onc::wifi::kWPA_EAP)
+    return mojom::SecurityType::WPA_EAP;
+  else
+    return mojom::SecurityType::NONE;
+}
+
+mojom::WiFiPtr TranslateONCWifi(const base::DictionaryValue* dict) {
+  mojom::WiFiPtr mojo = mojom::WiFi::New();
+
+  // Optional; defaults to 0.
+  dict->GetInteger(onc::wifi::kFrequency, &mojo->frequency);
+
+  mojo->bssid =
+      GetStringFromOncDictionary(dict, onc::wifi::kBSSID, false /* required */);
+  mojo->hex_ssid = GetStringFromOncDictionary(dict, onc::wifi::kHexSSID,
+                                              true /* required */);
+
+  // Optional; defaults to false.
+  dict->GetBoolean(onc::wifi::kHiddenSSID, &mojo->hidden_ssid);
+
+  mojo->security = TranslateONCWifiSecurityType(dict);
+
+  // Optional; defaults to 0.
+  dict->GetInteger(onc::wifi::kSignalStrength, &mojo->signal_strength);
+
+  return mojo;
+}
+
+mojo::Array<mojo::String> TranslateStringArray(const base::ListValue* list) {
+  mojo::Array<mojo::String> mojos = mojo::Array<mojo::String>::New(0);
+
+  for (size_t i = 0; i < list->GetSize(); i++) {
+    std::string tmp;
+    if (!list->GetString(i, &tmp))
+      NOTREACHED();

[stevenjb, 2016/05/17 18:02:41]

nit: NOTREACHED is redundant with empty() check.

[Kevin Cernekee, 2016/05/17 19:38:58]

Done.

+    DCHECK(!tmp.empty());
+    mojos.push_back(static_cast<mojo::String>(tmp));
+  }
+
+  return mojos;
+}
+
+mojo::Array<mojom::IPConfigurationPtr> TranslateONCIPConfigs(
+    const base::ListValue* list) {
+  mojo::Array<mojom::IPConfigurationPtr> mojos =
+      mojo::Array<mojom::IPConfigurationPtr>::New(0);
+
+  for (size_t i = 0; i < list->GetSize(); i++) {
+    const base::DictionaryValue* ip_dict = nullptr;
+    mojom::IPConfigurationPtr mojo = mojom::IPConfiguration::New();
+
+    list->GetDictionary(i, &ip_dict);
+    DCHECK(ip_dict);
+
+    mojo->gateway = GetStringFromOncDictionary(ip_dict, onc::ipconfig::kGateway,
+                                               true /* required */);
+    mojo->ip_address = GetStringFromOncDictionary(
+        ip_dict, onc::ipconfig::kIPAddress, true /* required */);
+
+    const base::ListValue* dns_list;
+    if (!ip_dict->GetList(onc::ipconfig::kNameServers, &dns_list))
+      NOTREACHED();
+    mojo->name_servers = TranslateStringArray(dns_list);
+
+    if (!ip_dict->GetInteger(onc::ipconfig::kRoutingPrefix,
+                             &mojo->routing_prefix)) {
+      NOTREACHED();
+    }
+
+    std::string tmp = GetStringFromOncDictionary(ip_dict, onc::ipconfig::kType,
+                                                 true /* required */);
+    mojo->type = tmp == onc::ipconfig::kIPv6 ? mojom::IPAddressType::IPV6
+                                             : mojom::IPAddressType::IPV4;
+
+    mojo->web_proxy_auto_discovery_url = GetStringFromOncDictionary(
+        ip_dict, onc::ipconfig::kWebProxyAutoDiscoveryUrl, true /* required */);
+
+    mojos.push_back(std::move(mojo));
+  }
+  return mojos;
+}
+
+mojom::ConnectionStateType TranslateONCConnectionState(
+    const base::DictionaryValue* dict) {
+  std::string tmp = GetStringFromOncDictionary(
+      dict, onc::network_config::kConnectionState, true /* required */);
+
+  if (tmp == onc::connection_state::kConnected)
+    return mojom::ConnectionStateType::CONNECTED;
+  else if (tmp == onc::connection_state::kConnecting)
+    return mojom::ConnectionStateType::CONNECTING;
+  else if (tmp == onc::connection_state::kNotConnected)
+    return mojom::ConnectionStateType::NOT_CONNECTED;
+
+  NOTREACHED();
+  return mojom::ConnectionStateType::NOT_CONNECTED;
+}
+
+mojom::NetworkConfigurationPtr TranslateONCConfiguration(
+    const base::DictionaryValue* dict) {
+  mojom::NetworkConfigurationPtr mojo = mojom::NetworkConfiguration::New();
+
+  mojo->connection_state = TranslateONCConnectionState(dict);
+
+  mojo->guid = GetStringFromOncDictionary(dict, onc::network_config::kGUID,
+                                          true /* required */);
+
+  const base::ListValue* ip_config_list = nullptr;
+  if (dict->GetList(onc::network_config::kIPConfigs, &ip_config_list)) {
+    DCHECK(ip_config_list);
+    mojo->ip_configs = TranslateONCIPConfigs(ip_config_list);
+  }
+
+  mojo->guid = GetStringFromOncDictionary(dict, onc::network_config::kGUID,
+                                          true /* required */);
+  mojo->mac_address = GetStringFromOncDictionary(
+      dict, onc::network_config::kMacAddress, true /* required */);
+
+  std::string tmp = GetStringFromOncDictionary(dict, onc::network_config::kType,
+                                               true /* required */);
+  if (tmp == onc::network_type::kCellular) {
+    mojo->type = mojom::NetworkType::CELLULAR;
+  } else if (tmp == onc::network_type::kEthernet) {
+    mojo->type = mojom::NetworkType::ETHERNET;
+  } else if (tmp == onc::network_type::kVPN) {
+    mojo->type = mojom::NetworkType::VPN;
+  } else if (tmp == onc::network_type::kWiFi) {
+    mojo->type = mojom::NetworkType::WIFI;
+
+    const base::DictionaryValue* wifi_dict = nullptr;
+    dict->GetDictionary(onc::network_config::kWiFi, &wifi_dict);
+    DCHECK(wifi_dict);
+    mojo->wifi = TranslateONCWifi(wifi_dict);
+  } else if (tmp == onc::network_type::kWimax) {
+    mojo->type = mojom::NetworkType::WIMAX;
+  } else {
+    NOTREACHED();
+  }

[stevenjb, 2016/05/17 18:02:41]

nit: Use a helper function

[Kevin Cernekee, 2016/05/17 19:38:58]

Done.

+
+  return mojo;
+}
+
+void GetDefaultNetworkSuccessCallback(
+    const ArcNetHostImpl::GetDefaultNetworkCallback& callback,
+    const std::string& service_path,
+    const base::DictionaryValue& dictionary) {
+  // TODO(cernekee): Figure out how to query Chrome for the default physical
+  // service if a VPN is connected, rather than just reporting the
+  // default logical service in both fields.
+  callback.Run(TranslateONCConfiguration(&dictionary),
+               TranslateONCConfiguration(&dictionary));
+}
+
+void GetDefaultNetworkFailureCallback(
+    const ArcNetHostImpl::GetDefaultNetworkCallback& callback,
+    const std::string& error_name,
+    std::unique_ptr<base::DictionaryValue> error_data) {
+  LOG(ERROR) << "Failed to query default logical network";
+  callback.Run(nullptr, nullptr);
+}
+
+void ArcNetHostImpl::GetDefaultNetwork(
+    const GetDefaultNetworkCallback& callback) {
+  std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash();

[stevenjb, 2016/05/17 18:02:41]

This does extra work and logs a misleading error if default_network_ is null.
Instead:

default_network = GetNetworkStateHandler()->DefaultNetwork();
if (!default_network) {
  VLOG(1) << "GetDefaultNetwork: no default network";
  callback.Run(nullptr, nullptr);
  return;
}

[Kevin Cernekee, 2016/05/17 19:38:58]

Done.

+  GetManagedConfigurationHandler()->GetProperties(
+      user_id_hash, default_network_,
+      base::Bind(&GetDefaultNetworkSuccessCallback, callback),
+      base::Bind(&GetDefaultNetworkFailureCallback, callback));
+}
+
+void DefaultNetworkSuccessCallback(ArcNetHostImpl* instance,
+                                   const std::string& service_path,
+                                   const base::DictionaryValue& dictionary) {
+  instance->arc_bridge_service()->net_instance()->DefaultNetworkChanged(
+      TranslateONCConfiguration(&dictionary),
+      TranslateONCConfiguration(&dictionary));
+}
+
+void DefaultNetworkFailureCallback(
+    const std::string& error_name,
+    std::unique_ptr<base::DictionaryValue> error_data) {
+  LOG(ERROR) << "Failed to query default logical network";
+}
+
+void ArcNetHostImpl::DefaultNetworkChanged(
+    const chromeos::NetworkState* network) {
+  if (!network) {
+    default_network_.clear();
+    VLOG(1) << "No default network";
+  } else {
+    default_network_ = network->path();
+    VLOG(1) << "New default network: " << default_network_;
+  }
+
+  if (arc_bridge_service()->net_version() < 2) {
+    VLOG(1) << "ArcBridgeService does not support DefaultNetworkChanged.";
+    return;
+  }
+
+  if (default_network_.empty()) {
+    arc_bridge_service()->net_instance()->DefaultNetworkChanged(nullptr,
+                                                                nullptr);
+  } else {
+    std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash();
+    GetManagedConfigurationHandler()->GetProperties(
+        user_id_hash, default_network_,
+        base::Bind(&DefaultNetworkSuccessCallback, base::Unretained(this)),
+        base::Bind(&DefaultNetworkFailureCallback));
+  }
+}
+
 void ArcNetHostImpl::OnShuttingDown() {
   GetStateHandler()->RemoveObserver(this, FROM_HERE);
 }