Add strictness to Schema::Validate()

components/policy/core/common/schema_unittest.cc

 // Copyright 2013 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 "components/policy/core/common/schema.h"
 
+#include "base/memory/scoped_ptr.h"
 #include "components/policy/core/common/schema_internal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 namespace {
 
 const char kTestSchema[] =
     "{"
     "  \"type\": \"object\","
@@ skipping 25 matching lines @@
     "      }"
     "    },"
     "    \"Object\": {"
     "      \"type\": \"object\","
     "      \"properties\": {"
     "        \"one\": { \"type\": \"boolean\" },"
     "        \"two\": { \"type\": \"integer\" }"
     "      },"
     "      \"additionalProperties\": { \"type\": \"string\" }"
     "    },"
+    "    \"ObjectOfObject\": {"
+    "      \"type\": \"object\","
+    "      \"properties\": {"
+    "        \"Object\": {"
+    "          \"type\": \"object\","
+    "          \"properties\": {"
+    "            \"one\": { \"type\": \"string\" },"
+    "            \"two\": { \"type\": \"integer\" }"
+    "          }"
+    "        }"
+    "      }"
+    "    },"
     "    \"IntegerWithEnums\": {"
     "      \"type\": \"integer\","
     "      \"enum\": [1, 2, 3]"
     "    },"
     "    \"IntegerWithEnumsGaps\": {"
     "      \"type\": \"integer\","
     "      \"enum\": [10, 20, 30]"
     "    },"
     "    \"StringWithEnums\": {"
     "      \"type\": \"string\","
     "      \"enum\": [\"one\", \"two\", \"three\"]"
     "    },"
     "    \"IntegerWithRange\": {"
     "      \"type\": \"integer\","
     "      \"minimum\": 1,"
     "      \"maximum\": 3"
+    "    },"
+    "    \"ObjectOfArray\": {"
+    "      \"type\": \"object\","
+    "      \"properties\": {"
+    "        \"List\": {"
+    "          \"type\": \"array\","
+    "          \"items\": { \"type\": \"integer\" }"
+    "        }"
+    "      }"
+    "    },"
+    "    \"ArrayOfObjectOfArray\": {"
+    "      \"type\": \"array\","
+    "      \"items\": {"
+    "        \"type\": \"object\","
+    "        \"properties\": {"
+    "          \"List\": {"
+    "            \"type\": \"array\","
+    "            \"items\": { \"type\": \"string\" }"
+    "          }"
+    "        }"
+    "      }"
     "    }"
     "  }"
     "}";
 
 bool ParseFails(const std::string& content) {
   std::string error;
   Schema schema = Schema::Parse(content, &error);
   if (schema.valid())
     return false;
   EXPECT_FALSE(error.empty());
   return true;
 }
 
+void TestSchemaValidation(Schema schema,
+                          const base::Value& value,
+                          SchemaOnErrorStrategy strategy,
+                          bool expected_return_value) {
+  std::string error;
+  static const char* no_error_returned = "No error returned.";

[Joao da Silva, 2014/01/23 15:52:36]

static const char kNoErrorReturned[] = "No error returned.";

[binjin, 2014/01/23 17:20:13]

Done.

+
+  // Test that Schema::Validate() works as expected.
+  error = no_error_returned;
+  bool returned = schema.Validate(value, strategy, &error);
+  EXPECT_EQ(returned, expected_return_value) << error;
+
+  // Test that Schema::Normalize() will return the same value as
+  // Schema::Validate().
+  error = no_error_returned;
+  scoped_ptr<base::Value> cloned_value(value.DeepCopy());
+  returned = schema.Normalize(cloned_value.get(), strategy, &error);
+  EXPECT_EQ(returned, expected_return_value) << error;
+
+  // Test that Schema::Normalize() have actually dropped invalid and unknown
+  // properties.
+  if (expected_return_value) {
+    EXPECT_TRUE(schema.Validate(*cloned_value.get(),
+          SCHEMA_STRICT, &error));
+    EXPECT_TRUE(schema.Normalize(cloned_value.get(),
+          SCHEMA_STRICT, &error));

[Joao da Silva, 2014/01/23 15:52:36]

Run clang-format on these 2 lines

[binjin, 2014/01/23 17:20:13]

Done.

+  }
+}
+
 std::string SchemaObjectWrapper(const std::string& subschema) {
   return "{"
          "  \"type\": \"object\","
          "  \"properties\": {"
          "    \"SomePropertyName\":" + subschema +
          "  }"
          "}";
 }
 
 }  // namespace
@@ skipping 179 matching lines @@
   sub = schema.GetProperty("IntegerWithRange");
   ASSERT_TRUE(sub.valid());
   ASSERT_EQ(base::Value::TYPE_INTEGER, sub.type());
 
   struct {
     const char* expected_key;
     base::Value::Type expected_type;
   } kExpectedProperties[] = {
     { "Array",                base::Value::TYPE_LIST },
     { "ArrayOfArray",         base::Value::TYPE_LIST },
+    { "ArrayOfObjectOfArray", base::Value::TYPE_LIST },
     { "ArrayOfObjects",       base::Value::TYPE_LIST },
     { "Boolean",              base::Value::TYPE_BOOLEAN },
     { "Integer",              base::Value::TYPE_INTEGER },
     { "IntegerWithEnums",     base::Value::TYPE_INTEGER },
     { "IntegerWithEnumsGaps", base::Value::TYPE_INTEGER },
     { "IntegerWithRange",     base::Value::TYPE_INTEGER },
     { "Null",                 base::Value::TYPE_NULL },
     { "Number",               base::Value::TYPE_DOUBLE },
     { "Object",               base::Value::TYPE_DICTIONARY },
+    { "ObjectOfArray",        base::Value::TYPE_DICTIONARY },
+    { "ObjectOfObject",       base::Value::TYPE_DICTIONARY },
     { "String",               base::Value::TYPE_STRING },
     { "StringWithEnums",      base::Value::TYPE_STRING },
   };
   Schema::Iterator it = schema.GetPropertiesIterator();
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kExpectedProperties); ++i) {
     ASSERT_FALSE(it.IsAtEnd());
     EXPECT_STREQ(kExpectedProperties[i].expected_key, it.key());
     ASSERT_TRUE(it.schema().valid());
     EXPECT_EQ(kExpectedProperties[i].expected_type, it.schema().type());
     it.Advance();
@@ skipping 161 matching lines @@
   ASSERT_TRUE(subsubsub.valid());
   ASSERT_EQ(base::Value::TYPE_STRING, subsubsub.type());
 }
 
 TEST(SchemaTest, Validate) {
   std::string error;
   Schema schema = Schema::Parse(kTestSchema, &error);
   ASSERT_TRUE(schema.valid()) << error;
 
   base::DictionaryValue bundle;
-  EXPECT_TRUE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, true);
 
   // Wrong type, expected integer.
   bundle.SetBoolean("Integer", true);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
 
   // Wrong type, expected list of strings.
   {
     bundle.Clear();
     base::ListValue list;
     list.AppendInteger(1);
     bundle.Set("Array", list.DeepCopy());
-    EXPECT_FALSE(schema.Validate(bundle));
+    TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   }
 
   // Wrong type in a sub-object.
   {
     bundle.Clear();
     base::DictionaryValue dict;
     dict.SetString("one", "one");
     bundle.Set("Object", dict.DeepCopy());
-    EXPECT_FALSE(schema.Validate(bundle));
+    TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   }
 
   // Unknown name.
   bundle.Clear();
   bundle.SetBoolean("Unknown", true);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
 
   // All of these will be valid.
   bundle.Clear();
   bundle.SetBoolean("Boolean", true);
   bundle.SetInteger("Integer", 123);
   bundle.Set("Null", base::Value::CreateNullValue());
   bundle.Set("Number", base::Value::CreateDoubleValue(3.14));
   bundle.SetString("String", "omg");
 
   {
@@ skipping 30 matching lines @@
     dict.SetString("additionally", "a string");
     dict.SetString("and also", "another string");
     bundle.Set("Object", dict.DeepCopy());
   }
 
   bundle.SetInteger("IntegerWithEnums", 1);
   bundle.SetInteger("IntegerWithEnumsGaps", 20);
   bundle.SetString("StringWithEnums", "two");
   bundle.SetInteger("IntegerWithRange", 3);
 
-  EXPECT_TRUE(schema.Validate(bundle));
-
-  bundle.SetString("boom", "bang");
-  EXPECT_FALSE(schema.Validate(bundle));
-  bundle.Remove("boom", NULL);
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, true);
 
   bundle.SetInteger("IntegerWithEnums", 0);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnums", 1);
 
   bundle.SetInteger("IntegerWithEnumsGaps", 0);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 9);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 10);
-  EXPECT_TRUE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, true);
   bundle.SetInteger("IntegerWithEnumsGaps", 11);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 19);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 21);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 29);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 30);
-  EXPECT_TRUE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, true);
   bundle.SetInteger("IntegerWithEnumsGaps", 31);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 100);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithEnumsGaps", 20);
 
   bundle.SetString("StringWithEnums", "FOUR");
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetString("StringWithEnums", "two");
 
   bundle.SetInteger("IntegerWithRange", 4);
-  EXPECT_FALSE(schema.Validate(bundle));
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
   bundle.SetInteger("IntegerWithRange", 3);
 
+  // Unknown top level property.
+  bundle.SetString("boom", "bang");
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
+  TestSchemaValidation(schema, bundle, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, true);
+  TestSchemaValidation(schema, bundle, SCHEMA_ALLOW_UNKNOWN, true);
+  bundle.Remove("boom", NULL);
+
+  // Invalid top level property.
+  bundle.SetInteger("Boolean", 12345);
+  TestSchemaValidation(schema, bundle, SCHEMA_STRICT, false);
+  TestSchemaValidation(schema, bundle, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+  TestSchemaValidation(schema, bundle, SCHEMA_ALLOW_INVALID, true);
+  bundle.SetBoolean("Boolean", true);
+
+  // Tests on ObjectOfObject.
+  {
+    Schema subschema = schema.GetProperty("ObjectOfObject");
+    ASSERT_TRUE(subschema.valid());
+    base::DictionaryValue root;
+
+    // Unknown property.
+    root.SetBoolean("Object.three", false);
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+    root.Remove("Object.three", NULL);
+
+    // Invalid property.
+    root.SetInteger("Object.one", 12345);
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+    root.Remove("Object.one", NULL);
+  }
+
+  // Tests on ArrayOfObjects.
+  {
+    Schema subschema = schema.GetProperty("ArrayOfObjects");
+    ASSERT_TRUE(subschema.valid());
+    base::ListValue root;
+
+    // Unknown property.
+    base::DictionaryValue* dict_value = new base::DictionaryValue();
+    dict_value->SetBoolean("three", true);
+    root.Append(dict_value);  // Pass ownership to root.
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+    root.Remove(root.GetSize() - 1, NULL);
+
+    // Invalid property.
+    dict_value = new base::DictionaryValue();
+    dict_value->SetBoolean("two", true);
+    root.Append(dict_value);  // Pass ownership to root.
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+    root.Remove(root.GetSize() - 1, NULL);
+  }
+
+  // Tests on ObjectOfArray.
+  {
+    Schema subschema = schema.GetProperty("ObjectOfArray");
+    ASSERT_TRUE(subschema.valid());
+    base::DictionaryValue root;
+
+    base::ListValue* list_value = new base::ListValue();
+    root.Set("List", list_value);  // Pass ownership to root;

[Joao da Silva, 2014/01/23 15:52:36]

// Pass ownership to root.

+
+    // No errors.
+    list_value->Append(new base::FundamentalValue(12345));
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+
+    // Invalid list item.
+    list_value->Append(new base::StringValue("blabla"));
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+  }
+
+  // Tests on ArrayOfObjectOfArray.
+  {
+    Schema subschema = schema.GetProperty("ArrayOfObjectOfArray");
+    ASSERT_TRUE(subschema.valid());
+    base::ListValue root;
+
+    base::ListValue* list_value = new base::ListValue();
+    base::DictionaryValue* dict_value = new base::DictionaryValue();
+    dict_value->Set("List", list_value);  // Pass ownership to dict_value.
+    root.Append(dict_value);  // Pass ownership to root

[Joao da Silva, 2014/01/23 15:52:36]

// Pass ownership to root.

+
+    // No errors

[Joao da Silva, 2014/01/23 15:52:36]

// No errors.

[binjin, 2014/01/23 17:20:13]

Done.

+    list_value->Append(new base::StringValue("blabla"));
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+
+    // Invalid list item.
+    list_value->Append(new base::FundamentalValue(12345));
+    TestSchemaValidation(subschema, root, SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN_TOPLEVEL, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_UNKNOWN, false);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID_TOPLEVEL, true);
+    TestSchemaValidation(subschema, root, SCHEMA_ALLOW_INVALID, true);
+  }
 }
+
 TEST(SchemaTest, InvalidReferences) {
   // References to undeclared schemas fail.
   EXPECT_TRUE(ParseFails(
       "{"
       "  \"type\": \"object\","
       "  \"properties\": {"
       "    \"name\": { \"$ref\": \"undeclared\" }"
       "  }"
       "}"));
 
@@ skipping 239 matching lines @@
 
   EXPECT_FALSE(ParseFails(SchemaObjectWrapper(
       "{"
       "  \"type\": \"integer\","
       "  \"minimum\": 10,"
       "  \"maximum\": 20"
       "}")));
 }
 
 }  // namespace policy