Replace additional network properties with ONC values

chromeos/network/network_configuration_handler.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_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_event_log.h"
+#include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 // Strip surrounding "" from keys (if present).
@@ skipping 262 matching lines @@
                  "",
                  error_callback));
 }
 
 void NetworkConfigurationHandler::RemoveConfiguration(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   // Service.Remove is not reliable. Instead, request the profile entries
   // for the service and remove each entry.
-  if (ContainsKey(profile_entry_deleters_,service_path)) {
+  if (ContainsKey(profile_entry_deleters_, service_path)) {
     InvokeErrorCallback(
         service_path, error_callback, "RemoveConfigurationInProgress");
     return;
   }
+  const NetworkState* network = network_state_handler_->GetNetworkState(
+      service_path);
+  std::string type = network ? network->type() : "";
+  if (type.empty() || (type != shill::kTypeWifi && type != shill::kTypeWimax &&
+                       type != shill::kTypeVPN)) {
+    InvokeErrorCallback(

[pneubeck (no reviews), 2014/07/07 09:14:26]

Why is that restriction necessary?

I guess this is about the previous restriction from internet_options_handler.
NCH is often used for internal actions as well and applying UI / extension API
specific restrictions here is a confusing.

MNCH is supposed to enforce user restrictions / enforce networkingPrivate API
rules. And the RemoveConfiguration method there is so far a direct mapping to
this one. How about restricting it there?

Note also, that this is not accurate anymore: The EAP settings of Ethernet could
are removable as well.

[stevenjb, 2014/07/07 23:40:21]

This is intended to enforce Shill behavior, i.e. detect an error early,
independent of any UI. We could eliminate it but then might get a less
decipherable error down the line. I will change this to a blacklist instead of a
whitelist.

[pneubeck (no reviews), 2014/07/08 07:55:27]

AFAIK, it's not an error to remove the ProfileEntry in the shared profile for
Ethernet. It should correctly remove all ethernet (not EAP) configuration.
Whether that functionality is used by the UI or not should be irrelevant here.
It could be used potentially.
Anyways, this is only used only by internet_options_handler, so I don't feel
strong about it.
Please, at least document this restriction in the header.

[stevenjb, 2014/07/08 17:13:04]

This restriction is inherited from early days of Flimflam, so I am honestly not
sure what Shill will do. I will go ahead and remove the restriction, we don't
currently have any UI surface for it. If we add one and something breaks, we'll
deal with it then.

+        service_path, error_callback, "UnsupportedRemoveType");
+  }
+
   NET_LOG_USER("Remove Configuration", service_path);
   ProfileEntryDeleter* deleter =
       new ProfileEntryDeleter(this, service_path, callback, error_callback);
   profile_entry_deleters_[service_path] = deleter;
   deleter->Run();
 }
 
 void NetworkConfigurationHandler::SetNetworkProfile(
     const std::string& service_path,
     const std::string& profile_path,
@@ skipping 107 matching lines @@
 
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
     NetworkStateHandler* network_state_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
   handler->Init(network_state_handler);
   return handler;
 }
 
 }  // namespace chromeos