Rejecting networks/certificates independently on ONC import and policy loading.

chrome/browser/policy/network_configuration_updater.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 "chrome/browser/policy/network_configuration_updater.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 35 matching lines @@
 NetworkConfigurationUpdater::~NetworkConfigurationUpdater() {
   network_library_->RemoveNetworkProfileObserver(this);
 }
 
 void NetworkConfigurationUpdater::OnProfileListChanged() {
   VLOG(1) << "Network profile list changed, applying policies.";
   ApplyNetworkConfigurations();
 }
 
 void NetworkConfigurationUpdater::OnUserPolicyInitialized() {
-  VLOG(1) << "User policy initialized, applying policies. Ignoring.";
+  VLOG(1) << "User policy initialized, applying policies.";
   user_policy_initialized_ = true;
   ApplyNetworkConfigurations();
 }
 
 void NetworkConfigurationUpdater::OnPolicyChanged(
     chromeos::onc::ONCSource onc_source,
     const base::Value* previous,
     const base::Value* current) {
-  VLOG(1) << "Policy for ONC source " << onc_source << " changed.";
+  VLOG(1) << "Policy for ONC source "
+          << chromeos::onc::GetSourceAsString(onc_source) << " changed.";
   ApplyNetworkConfigurations();
 }
 
 void NetworkConfigurationUpdater::ApplyNetworkConfigurations() {
   ApplyNetworkConfiguration(key::kDeviceOpenNetworkConfiguration,
                             chromeos::onc::ONC_SOURCE_DEVICE_POLICY);
   if (user_policy_initialized_) {
     ApplyNetworkConfiguration(key::kOpenNetworkConfiguration,
                               chromeos::onc::ONC_SOURCE_USER_POLICY);
   }
 }
 
 void NetworkConfigurationUpdater::ApplyNetworkConfiguration(
     const std::string& policy_key,
     chromeos::onc::ONCSource onc_source) {
-  VLOG(1) << "Apply policy for ONC source " << onc_source;
+  VLOG(1) << "Apply policy for ONC source "
+          << chromeos::onc::GetSourceAsString(onc_source);
   const PolicyMap& policies = policy_service_->GetPolicies(POLICY_DOMAIN_CHROME,
                                                            std::string());
   const base::Value* policy_value = policies.GetValue(policy_key);
 
   std::string new_network_config;
   if (policy_value != NULL) {
     // If the policy is not a string, we issue a warning, but still clear the
     // network configuration.
-    if (!policy_value->GetAsString(&new_network_config))
-      LOG(WARNING) << "ONC policy is not a string value.";
+    if (!policy_value->GetAsString(&new_network_config)) {
+      LOG(WARNING) << "ONC policy for source "
+                   << chromeos::onc::GetSourceAsString(onc_source)
+                   << " is not a string value.";
+    }
   }
 
   // An empty string is not a valid ONC and generates warnings and
   // errors. Replace by a valid empty configuration.
   if (new_network_config.empty())
     new_network_config = chromeos::onc::kEmptyUnencryptedConfiguration;
 
-  network_library_->LoadOncNetworks(new_network_config, "", onc_source,
-                                    allow_web_trust_);
+  if (!network_library_->LoadOncNetworks(new_network_config, "", onc_source,
+                                         allow_web_trust_)) {
+    LOG(ERROR) << "Errors occurred during the ONC policy application.";
+  }
 }
 
 }  // namespace policy