Don't reject extension list policies with invalid entries.

chrome/browser/policy/configuration_policy_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 "chrome/browser/policy/configuration_policy_handler.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/json/json_writer.h"
@@ skipping 209 matching lines @@
 
 bool ExtensionListPolicyHandler::CheckPolicySettings(
     const PolicyMap& policies,
     PolicyErrorMap* errors) {
   return CheckAndGetList(policies, errors, NULL);
 }
 
 void ExtensionListPolicyHandler::ApplyPolicySettings(
     const PolicyMap& policies,
     PrefValueMap* prefs) {
-  const Value* value = policies.GetValue(policy_name());
-  if (value)
-    prefs->SetValue(pref_path(), value->DeepCopy());
+  scoped_ptr<base::ListValue> list;
+  PolicyErrorMap errors;
+  if (CheckAndGetList(policies, &errors, &list) && list)
+    prefs->SetValue(pref_path(), list.release());
 }
 
 const char* ExtensionListPolicyHandler::pref_path() const {
   return pref_path_;
 }
 
 bool ExtensionListPolicyHandler::CheckAndGetList(
     const PolicyMap& policies,
     PolicyErrorMap* errors,
-    const base::ListValue** extension_ids) {
+    scoped_ptr<base::ListValue>* extension_ids) {
   if (extension_ids)
-    *extension_ids = NULL;
+    extension_ids->reset();
 
   const base::Value* value = NULL;
   if (!CheckAndGetValue(policies, errors, &value))
     return false;
 
   if (!value)
     return true;
 
   const base::ListValue* list_value = NULL;
   if (!value->GetAsList(&list_value)) {
     NOTREACHED();
     return false;
   }
 
   // Check that the list contains valid extension ID strings only.

[Joao da Silva, 2012/10/17 09:26:49]

This comment is outdated

[Mattias Nissler (ping if slow), 2012/10/17 09:41:19]

Done.

+  scoped_ptr<base::ListValue> filtered_list(new base::ListValue());
   for (base::ListValue::const_iterator entry(list_value->begin());
        entry != list_value->end(); ++entry) {
     std::string id;
     if (!(*entry)->GetAsString(&id)) {
       errors->AddError(policy_name(),
                        entry - list_value->begin(),
                        IDS_POLICY_TYPE_ERROR,
                        ValueTypeToString(base::Value::TYPE_STRING));
-      return false;
+      continue;
     }
     if (!(allow_wildcards_ && id == "*") &&
         !extensions::Extension::IdIsValid(id)) {
       errors->AddError(policy_name(),
                        entry - list_value->begin(),
                        IDS_POLICY_VALUE_FORMAT_ERROR);
-      return false;
+      continue;
     }
+    filtered_list->Append(base::Value::CreateStringValue(id));
   }
 
   if (extension_ids)
-    *extension_ids = list_value;
+    *extension_ids = filtered_list.Pass();
 
   return true;
 }
 
 // ExtensionURLPatternListPolicyHandler implementation -------------------------
 
 ExtensionURLPatternListPolicyHandler::ExtensionURLPatternListPolicyHandler(
     const char* policy_name,
     const char* pref_path)
     : TypeCheckingPolicyHandler(policy_name, base::Value::TYPE_LIST),
@@ skipping 992 matching lines @@
           errors->AddError(policy_name(),
                            IDS_POLICY_OUT_OF_RANGE_ERROR,
                            base::IntToString(restore_value));
       }
     }
   }
   return true;
 }
 
 }  // namespace policy