Extending ONC validator's logging. Completing toplevel validation.

chrome/browser/policy/configuration_policy_handler_chromeos.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/configuration_policy_handler_chromeos.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 34 matching lines @@
   const base::Value* value;
   if (!CheckAndGetValue(policies, errors, &value))
     return false;
 
   if (value) {
     std::string onc_blob;
     value->GetAsString(&onc_blob);
     scoped_ptr<base::DictionaryValue> root_dict =
         onc::ReadDictionaryFromJson(onc_blob);
     if (root_dict.get() == NULL) {
-      errors->AddError(policy_name(), IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR);
+      errors->AddError(policy_name(), IDS_POLICY_NETWORK_CONFIG_PARSE_FAILED);
       return false;
     }
 
     // Validate the ONC dictionary. We are liberal and ignore unknown field
     // names and ignore invalid field names in kRecommended arrays.
     onc::Validator validator(false,  // Ignore unknown fields.
                              false,  // Ignore invalid recommended field names.
                              true,  // Fail on missing fields.
                              true);  // Validate for managed ONC
 
     // ONC policies are always unencrypted.
+    onc::Validator::Result validation_result;
     root_dict = validator.ValidateAndRepairObject(
-        &onc::kUnencryptedConfigurationSignature,
-        *root_dict);
+        &onc::kToplevelConfigurationSignature, *root_dict, &validation_result);
+    if (validation_result == onc::Validator::VALID_WITH_WARNINGS) {
+      errors->AddError(policy_name(),
+                       IDS_POLICY_NETWORK_CONFIG_IMPORT_PARTIAL);
+    } else if (validation_result == onc::Validator::INVALID) {
+      errors->AddError(policy_name(), IDS_POLICY_NETWORK_CONFIG_IMPORT_FAILED);
+    }
 
-    if (root_dict.get() == NULL) {
-      errors->AddError(policy_name(), IDS_POLICY_NETWORK_CONFIG_PARSE_ERROR);
-      // Don't reject the policy, as some networks or certificates could still
-      // be applied.
-      return true;
-    }
+    // In any case, don't reject the policy as some networks or certificates
+    // could still be applied.
   }
 
   return true;
 }
 
 void NetworkConfigurationPolicyHandler::ApplyPolicySettings(
     const PolicyMap& policies,
     PrefValueMap* prefs) {
   // Network policy is read directly from the provider and injected into
   // NetworkLibrary, so no need to convert the policy settings into prefs.
@@ skipping 106 matching lines @@
         base::DictionaryValue* app_dict = new base::DictionaryValue();
         app_dict->SetString(ash::kPinnedAppsPrefAppIDPath, id);
         pinned_apps_list->Append(app_dict);
       }
     }
     prefs->SetValue(pref_path(), pinned_apps_list);
   }
 }
 
 }  // namespace policy