change: check input params schema of request-validation plugin. (#1920

)

FIX #1881

apisix/core/schema.lua

@@ -36,16 +36,27 @@ local function create_validator(schema)
     return nil, res -- error message
 end
 
-
-function _M.check(schema, json)
+local function get_validator(schema)
     local validator, err = cached_validator(schema, nil,
                                 create_validator, schema)
+
+    if not validator then
+        return nil, err
+    end
+
+    return validator, nil
+end
+
+function _M.check(schema, json)
+    local validator, err = get_validator(schema)
+
     if not validator then
         return false, err
     end
 
     return validator(json)
 end
 
+_M.valid = get_validator
 
 return _M

apisix/plugins/request-validation.lua

@@ -42,7 +42,26 @@ local _M = {
 
 
 function _M.check_schema(conf)
-    return core.schema.check(schema, conf)
+    local ok, err = core.schema.check(schema, conf)
+    if not ok then
+        return false, err
+    end
+
+    if conf.body_schema then
+        ok, err = core.schema.valid(conf.body_schema)
+        if not ok then
+            return false, err
+        end
+    end
+
+    if conf.header_schema then
+        ok, err = core.schema.valid(conf.header_schema)
+        if not ok then
+            return false, err
+        end
+    end
+
+    return true, nil
 end