Adding policy support to the new network configuration stack.

chromeos/dbus/shill_manager_client.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/dbus/shill_manager_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_manager_client_stub.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
+const char kIncompleteServiceProperties[] = "Error.IncompleteServiceProperties";
+const char kIncompleteServicePropertiesMessage[] =
+    "Service properties are incomplete.";
+
 // Returns whether the properties have the required keys or not.
-bool AreServicePropertiesValid(const base::DictionaryValue& properties) {
-  if (properties.HasKey(flimflam::kGuidProperty))
+bool AreServicePropertiesValidWithMode(
+    const base::DictionaryValue& properties,
+    const ShillManagerClient::ErrorCallback& error_callback) {
+  if (properties.HasKey(flimflam::kGuidProperty) ||
+      (properties.HasKey(flimflam::kTypeProperty) &&
+       properties.HasKey(flimflam::kSecurityProperty) &&
+       properties.HasKey(flimflam::kModeProperty) &&
+       properties.HasKey(flimflam::kSSIDProperty))) {
     return true;
-  return properties.HasKey(flimflam::kTypeProperty) &&
-      properties.HasKey(flimflam::kSecurityProperty) &&
-      properties.HasKey(flimflam::kSSIDProperty);
+  }
+  error_callback.Run(kIncompleteServiceProperties,
+                     kIncompleteServicePropertiesMessage);
+  return false;
+}
+
+// DEPRECATED: Keep this only for backward compatibility with NetworkLibrary.
+// Returns whether the properties have the required keys or not.
+// TODO(pneubeck): remove this once NetworkLibrary is gone (crbug/230799).
+bool AreServicePropertiesValid(
+    const base::DictionaryValue& properties,
+    const ShillManagerClient::ErrorCallback& error_callback) {
+  if (properties.HasKey(flimflam::kGuidProperty) ||
+      (properties.HasKey(flimflam::kTypeProperty) &&
+       properties.HasKey(flimflam::kSecurityProperty) &&
+       properties.HasKey(flimflam::kSSIDProperty))) {
+    return true;
+  }
+  error_callback.Run(kIncompleteServiceProperties,
+                     kIncompleteServicePropertiesMessage);
+  return false;
 }
 
 // Appends a string-to-variant dictionary to the writer.
 void AppendServicePropertiesDictionary(
     dbus::MessageWriter* writer,
     const base::DictionaryValue& dictionary) {
   dbus::MessageWriter array_writer(NULL);
   writer->OpenArray("{sv}", &array_writer);
   for (base::DictionaryValue::Iterator it(dictionary);
        !it.IsAtEnd();
@@ skipping 98 matching lines @@
     writer.AppendString(type);
     helper_.CallVoidMethodWithErrorCallback(&method_call,
                                             callback,
                                             error_callback);
   }
 
   virtual void ConfigureService(
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
-    DCHECK(AreServicePropertiesValid(properties));
+    if (!AreServicePropertiesValid(properties, error_callback)) {
+      LOG(ERROR) << kIncompleteServicePropertiesMessage;
+      return;
+    }
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kConfigureServiceFunction);
     dbus::MessageWriter writer(&method_call);
     AppendServicePropertiesDictionary(&writer, properties);
     helper_.CallObjectPathMethodWithErrorCallback(&method_call,
                                                   callback,
                                                   error_callback);
   }
 
+  virtual void ConfigureServiceForProfile(
+      const dbus::ObjectPath& profile_path,
+      const base::DictionaryValue& properties,
+      const ObjectPathCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {
+    if (!AreServicePropertiesValidWithMode(properties, error_callback)) {
+      LOG(ERROR) << kIncompleteServicePropertiesMessage;

[pastarmovj, 2013/04/16 11:31:18]

You can make this NOTREACHED - it is like a DCHECK(false) so it will both print
your message and crash in debug builds like your initial intention was.

[pneubeck (no reviews), 2013/04/16 14:56:28]

Done.

+      return;
+    }
+    dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+                                 shill::kConfigureServiceForProfileFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendObjectPath(dbus::ObjectPath(profile_path));
+    AppendServicePropertiesDictionary(&writer, properties);
+    helper_.CallObjectPathMethodWithErrorCallback(&method_call,
+                                                  callback,
+                                                  error_callback);
+  }
+
   virtual void GetService(
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetServiceFunction);
     dbus::MessageWriter writer(&method_call);
     AppendServicePropertiesDictionary(&writer, properties);
     helper_.CallObjectPathMethodWithErrorCallback(&method_call,
                                                   callback,
@@ skipping 97 matching lines @@
 ShillManagerClient* ShillManagerClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillManagerClientStub();
 }
 
 }  // namespace chromeos