Trigger ConnectToBestNetwork in more cases.

chromeos/network/auto_connect_handler.cc

Index: chromeos/network/auto_connect_handler.cc
diff --git a/chromeos/network/auto_connect_handler.cc b/chromeos/network/auto_connect_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c1c8633639c1ad814df3effb88b8281f9439934b
--- /dev/null
+++ b/chromeos/network/auto_connect_handler.cc
@@ -0,0 +1,212 @@
+// Copyright 2014 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/auto_connect_handler.h"
+
+#include <string>
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/values.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill_service_client.h"
+#include "chromeos/network/managed_network_configuration_handler.h"
+#include "chromeos/network/network_event_log.h"
+#include "chromeos/network/network_state.h"
+#include "dbus/object_path.h"
+
+namespace chromeos {
+
+AutoConnectHandler::AutoConnectHandler()
+    : client_cert_resolver_(nullptr),
+      request_best_connection_pending_(false),
+      device_policy_applied_(false),
+      user_policy_applied_(false),
+      client_certs_resolved_(false),
+      applied_autoconnect_policy_(false) {
+}
+
+AutoConnectHandler::~AutoConnectHandler() {
+  if (client_cert_resolver_)
+    client_cert_resolver_->RemoveObserver(this);
+  if (LoginState::IsInitialized())
+    LoginState::Get()->RemoveObserver(this);
+  if (managed_configuration_handler_)
+    managed_configuration_handler_->RemoveObserver(this);
+}
+
+void AutoConnectHandler::Init(
+    ClientCertResolver* client_cert_resolver,
+    NetworkConnectionHandler* network_connection_handler,
+    NetworkStateHandler* network_state_handler,
+    ManagedNetworkConfigurationHandler* managed_network_configuration_handler) {
+  if (LoginState::IsInitialized())
+    LoginState::Get()->AddObserver(this);
+
+  client_cert_resolver_ = client_cert_resolver;
+  if (client_cert_resolver_)
+    client_cert_resolver_->AddObserver(this);
+
+  network_connection_handler_ = network_connection_handler;
+  if (network_connection_handler_)
+    network_connection_handler_->AddObserver(this);
+
+  network_state_handler_ = network_state_handler;
+
+  if (managed_network_configuration_handler) {
+    managed_configuration_handler_ = managed_network_configuration_handler;
+    managed_configuration_handler_->AddObserver(this);
+  }
+
+  if (LoginState::IsInitialized())
+    LoggedInStateChanged();
+}
+
+void AutoConnectHandler::LoggedInStateChanged() {
+  if (!LoginState::Get()->IsUserLoggedIn())
+    return;
+
+  // Disconnect before connecting, to ensure that we do not disconnect a network
+  // that we just connected.
+  DisconnectIfPolicyRequires();
+  NET_LOG_DEBUG("RequestBestConnection", "User logged in");
+  RequestBestConnection();
+}
+
+void AutoConnectHandler::ConnectToNetworkRequested() {
+  // Stop any pending request to connect to the best newtork.
+  request_best_connection_pending_ = false;
+}
+
+void AutoConnectHandler::PoliciesChanged(const std::string& userhash) {
+  // Ignore user policies.
+  if (!userhash.empty())
+    return;
+  DisconnectIfPolicyRequires();
+}
+
+void AutoConnectHandler::PoliciesApplied(const std::string& userhash) {
+  if (userhash.empty())
+    device_policy_applied_ = true;
+  else
+    user_policy_applied_ = true;
+
+  // Request to connect to the best network only if there is at least one
+  // managed network. Otherwise only process existing requests.
+  const ManagedNetworkConfigurationHandler::GuidToPolicyMap* managed_networks =
+      managed_configuration_handler_->GetNetworkConfigsFromPolicy(userhash);
+  DCHECK(managed_networks);
+  if (managed_networks->empty()) {
+    CheckBestConnection();
+  } else {
+    NET_LOG_DEBUG("RequestBestConnection", "Policy applied");
+    RequestBestConnection();
+  }

[stevenjb, 2014/11/07 17:19:06]

nit: invert this logic to be consistent with the logic below (and slightly more
readable, positive result, which in this case is !empty(), before negative).

[pneubeck (no reviews), 2014/11/08 16:49:55]

Done.

+}
+
+void AutoConnectHandler::ResolveRequestCompleted(
+    bool network_properties_changed) {
+  client_certs_resolved_ = true;
+
+  // Only request to connect to the best network if network properties were
+  // actually changed. Otherwise only process existing requests.
+  if (network_properties_changed) {
+    NET_LOG_DEBUG("RequestBestConnection",
+                  "Client certificate patterns resolved");
+    RequestBestConnection();
+  } else {
+    CheckBestConnection();
+  }
+}
+
+void AutoConnectHandler::RequestBestConnection() {
+  request_best_connection_pending_ = true;
+  CheckBestConnection();
+}
+
+void AutoConnectHandler::CheckBestConnection() {
+  // Return immediately if there is currently no request pending to change to
+  // the best network.
+  if (!request_best_connection_pending_)
+    return;
+
+  bool policy_application_running =
+      managed_configuration_handler_->IsAnyPolicyApplicationRunning();
+  bool client_cert_resolve_task_running =
+      client_cert_resolver_->IsAnyResolveTaskRunning();
+  VLOG(2) << "device policy applied: " << device_policy_applied_
+          << "\nuser policy applied: " << user_policy_applied_
+          << "\npolicy application running: " << policy_application_running
+          << "\nclient cert patterns resolved: " << client_certs_resolved_
+          << "\nclient cert resolve task running: "
+          << client_cert_resolve_task_running;
+  if (!device_policy_applied_ || policy_application_running ||
+      client_cert_resolve_task_running) {
+    return;
+  }
+
+  if (LoginState::Get()->IsUserLoggedIn()) {
+    // Before changing connection after login, we wait at least for:
+    //  - user policy applied at least once
+    //  - client certificate patterns resolved
+    if (!user_policy_applied_ || !client_certs_resolved_)
+      return;
+  }
+
+  request_best_connection_pending_ = false;
+  NET_LOG_EVENT("ConnectToBestWifiNetwork", "");
+  network_state_handler_->ConnectToBestWifiNetwork();

[stevenjb, 2014/11/07 17:19:06]

Should we remove this from NSH/SPH and make the Shill call here? I'm concerned
that if we leave it in NSH some other logic could conflict and break this logic,
i.e. I think we should only call ConnectToBestWifiNetwork from one place.

[pneubeck (no reviews), 2014/11/08 16:49:55]

can't move it without further changes. NSH is at first triggering a network scan
and then calling ConnectToBestServices.

let's punt that.

+}
+
+void AutoConnectHandler::DisconnectIfPolicyRequires() {
+  if (applied_autoconnect_policy_ || !LoginState::Get()->IsUserLoggedIn())
+    return;
+
+  const base::DictionaryValue* global_network_config =
+      managed_configuration_handler_->GetGlobalConfigFromPolicy(std::string());

[stevenjb, 2014/11/07 17:19:06]

nit: comment what std::string() represents

[pneubeck (no reviews), 2014/11/08 16:49:55]

Done.

+
+  if (!global_network_config)
+    return;  // Device policy is not set, yet.
+
+  applied_autoconnect_policy_ = true;
+
+  bool only_policy_autoconnect = false;
+  global_network_config->GetBooleanWithoutPathExpansion(
+      ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
+      &only_policy_autoconnect);
+
+  if (only_policy_autoconnect)
+    DisconnectFromUnmanagedSharedWiFiNetworks();
+}
+
+void AutoConnectHandler::DisconnectFromUnmanagedSharedWiFiNetworks() {
+  NET_LOG_DEBUG("DisconnectFromUnmanagedSharedWiFiNetworks", "");
+
+  NetworkStateHandler::NetworkStateList networks;
+  network_state_handler_->GetVisibleNetworkListByType(
+      NetworkTypePattern::Wireless(), &networks);
+  for (const NetworkState* network : networks) {
+    if (!(network->IsConnectingState() || network->IsConnectedState()))
+      break;  // Connected and connecting networks are listed first.
+
+    if (network->IsPrivate())
+      continue;
+
+    const bool network_is_policy_managed =
+        !network->profile_path().empty() && !network->guid().empty() &&
+        managed_configuration_handler_->FindPolicyByGuidAndProfile(
+            network->guid(), network->profile_path());
+    if (network_is_policy_managed)
+      continue;
+
+    NET_LOG_EVENT("Disconnect Forced by Policy", network->path());
+    DBusThreadManager::Get()->GetShillServiceClient()->Disconnect(
+        dbus::ObjectPath(network->path()), base::Bind(&base::DoNothing),
+        base::Bind(&network_handler::ShillErrorCallbackFunction,
+                   "AutoConnectHandler.Disconnect failed", network->path(),
+                   network_handler::ErrorCallback()));
+  }
+}
+
+}  // namespace chromeos