Merge pull request Kong#37 from Mashape/fix/schema-validation

Fixing schema validation"

Author: subnetmarco

spec/unit/validations_spec.lua

@@ -15,10 +15,14 @@ describe("Validation #schema", function()
       allowed = { enum = { "hello", "world" }},
       default = { default = function() return "default" end },
       custom = { func = function(v, t)
-                          if v and t.default == "default" then
-                            return true
+                          if v then
+                            if t.default == "default" then
+                              return true
+                            else
+                              return false, "Nah"
+                            end
                           else
-                            return false, "Nah"
+                            return true
                           end
                         end },
       sub_schema = {
@@ -186,7 +190,6 @@ describe("Validation #schema", function()
     describe("Sub-schemas", function()
 
       it("should validate a property with a sub-schema", function()
-        pending("todo")
         -- Success
         local values = { string = "somestring", sub_schema = { sub_field_required = "sub value" }}
 

src/kong/dao/schemas.lua

@@ -55,7 +55,7 @@ function _M.validate(t, schema, is_update)
       end
 
     -- Check field against a custom function
-    elseif t[column] ~= nil and v.func and type(v.func) == "function" then
+    elseif v.func and type(v.func) == "function" then
       local ok, err = v.func(t[column], t)
       if not ok or err then
         errors = utils.add_error(errors, column, err)
@@ -67,7 +67,12 @@ function _M.validate(t, schema, is_update)
 
     -- validate a subschema
     elseif t[column] ~= nil and v.schema then
-
+      local s_ok, s_errors = _M.validate(t[column], v.schema, is_update)
+      if not s_ok then
+        for s_k, s_v in pairs(s_errors) do
+          errors = utils.add_error(errors, column.."."..s_k, s_v)
+        end
+      end
     end
   end
 

src/kong/plugins/authentication/schema.lua

@@ -1,20 +1,16 @@
 local constants = require "kong.constants"
+local utils = require "kong.tools.utils"
 local stringy = require "stringy"
 
 local function check_authentication_key_names(names, plugin_value)
-  if plugin_value.authentication_type == constants.AUTHENTICATION.BASIC then
-    return false, "This field is not available for \""..BASIC.."\" authentication"
-  elseif plugin_value.authentication_type ~= BASIC then
-    if names then
-      if type(names) == "table" then
-        return true
-      else
-        return false, "You need to specify an array"
-      end
-    else
-      return false, "This field is required for query and header authentication"
+  if plugin_value.authentication_type == constants.AUTHENTICATION.BASIC and names then
+    return false, "This field is not available for \""..constants.AUTHENTICATION.BASIC.."\" authentication"
+  elseif plugin_value.authentication_type ~= constants.AUTHENTICATION.BASIC then
+    if not names or type(names) ~= "table" or utils.table_size(names) == 0 then
+      return false, "You need to specify an array with at least one value"
     end
   end
+  return true
 end
 
 return {