Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: chromeos/network/managed_network_configuration_handler_impl.cc

Issue 1431563005: Handle prohibited technologies in device policy ONC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/managed_network_configuration_handler_impl.cc
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
index c0407232335a56daf76c05767fa424c86380ee5c..16648c34163466dc23ec05aad6a12cb62a7f000a 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.cc
+++ b/chromeos/network/managed_network_configuration_handler_impl.cc
@@ -34,6 +34,7 @@
#include "chromeos/network/onc/onc_utils.h"
#include "chromeos/network/onc/onc_validator.h"
#include "chromeos/network/policy_util.h"
+#include "chromeos/network/prohibited_technologies_handler.h"
#include "chromeos/network/shill_property_util.h"
#include "components/onc/onc_constants.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
@@ -426,6 +427,19 @@ void ManagedNetworkConfigurationHandlerImpl::SetPolicy(
policies->global_network_config.MergeDictionary(&global_network_config);
+ // Update prohibited technologies.
+ const base::ListValue* prohibited_list = nullptr;
+ if (policies->global_network_config.GetListWithoutPathExpansion(
+ ::onc::global_network_config::kDisableNetworkTypes,
+ &prohibited_list) &&
+ prohibited_technologies_handler_) {
+ // Prohobited technologies are only allowed in user policy.
+ DCHECK_EQ(::onc::ONC_SOURCE_DEVICE_POLICY, onc_source);
+
+ prohibited_technologies_handler_->SetProhibitedTechnologies(
+ prohibited_list);
+ }
+
GuidToPolicyMap old_per_network_config;
policies->per_network_config.swap(old_per_network_config);
@@ -709,12 +723,14 @@ void ManagedNetworkConfigurationHandlerImpl::Init(
NetworkStateHandler* network_state_handler,
NetworkProfileHandler* network_profile_handler,
NetworkConfigurationHandler* network_configuration_handler,
- NetworkDeviceHandler* network_device_handler) {
+ NetworkDeviceHandler* network_device_handler,
+ ProhibitedTechnologiesHandler* prohibited_technologies_handler) {
network_state_handler_ = network_state_handler;
network_profile_handler_ = network_profile_handler;
network_configuration_handler_ = network_configuration_handler;
network_device_handler_ = network_device_handler;
network_profile_handler_->AddObserver(this);
+ prohibited_technologies_handler_ = prohibited_technologies_handler;
}
void ManagedNetworkConfigurationHandlerImpl::OnPolicyAppliedToNetwork(

Powered by Google App Engine
This is Rietveld 408576698