Merge branch 'master' into dev-apisix

Author: laz-xyr

apisix/admin/consumer_group.lua

@@ -18,6 +18,7 @@ local core = require("apisix.core")
 local consumers = require("apisix.consumer").consumers
 local resource = require("apisix.admin.resource")
 local schema_plugin = require("apisix.admin.plugins").check_schema
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 local type = type
 local tostring = tostring
 local ipairs = ipairs
@@ -38,6 +39,11 @@ local function check_conf(id, conf, need_id, schema)
 end
 
 
+local function encrypt_conf(id, conf)
+    plugins_encrypt_conf(conf.plugins)
+end
+
+
 local function delete_checker(id)
     local consumers, consumers_ver = consumers()
     if consumers_ver and consumers then
@@ -61,6 +67,7 @@ return resource.new({
     kind = "consumer group",
     schema = core.schema.consumer_group,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     unsupported_methods = {"post"},
     delete_checker = delete_checker
 })

apisix/admin/consumers.lua

@@ -16,6 +16,7 @@
 --
 local core    = require("apisix.core")
 local plugins = require("apisix.admin.plugins")
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 local resource = require("apisix.admin.resource")
 
 
@@ -57,10 +58,16 @@ local function check_conf(username, conf, need_username, schema, opts)
 end
 
 
+local function encrypt_conf(id, conf)
+    plugins_encrypt_conf(conf.plugins, core.schema.TYPE_CONSUMER)
+end
+
+
 return resource.new({
     name = "consumers",
     kind = "consumer",
     schema = core.schema.consumer,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     unsupported_methods = {"post", "patch"}
 })

apisix/admin/credentials.lua

@@ -18,6 +18,7 @@ local core     = require("apisix.core")
 local plugins  = require("apisix.admin.plugins")
 local plugin   = require("apisix.plugin")
 local resource = require("apisix.admin.resource")
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 local pairs    = pairs
 
 local function check_conf(_id, conf, _need_id, schema)
@@ -46,6 +47,12 @@ local function check_conf(_id, conf, _need_id, schema)
     return true, nil
 end
 
+
+local function encrypt_conf(id, conf)
+    plugins_encrypt_conf(conf.plugins, core.schema.TYPE_CONSUMER)
+end
+
+
 -- get_credential_etcd_key is used to splice the credential's etcd key (without prefix)
 -- from credential_id and sub_path.
 -- Parameter credential_id is from the uri or payload; sub_path is in the form of
@@ -69,6 +76,7 @@ return resource.new({
     kind = "credential",
     schema = core.schema.credential,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     get_resource_etcd_key = get_credential_etcd_key,
     unsupported_methods = {"post", "patch"}
 })

apisix/admin/global_rules.lua

@@ -17,6 +17,7 @@
 local core = require("apisix.core")
 local resource = require("apisix.admin.resource")
 local schema_plugin = require("apisix.admin.plugins").check_schema
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 
 
 local function check_conf(id, conf, need_id, schema)
@@ -34,10 +35,16 @@ local function check_conf(id, conf, need_id, schema)
 end
 
 
+local function encrypt_conf(id, conf)
+    plugins_encrypt_conf(conf.plugins)
+end
+
+
 return resource.new({
     name = "global_rules",
     kind = "global rule",
     schema = core.schema.global_rule,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     unsupported_methods = {"post"}
 })

apisix/admin/plugin_config.lua

@@ -18,6 +18,7 @@ local core = require("apisix.core")
 local get_routes = require("apisix.router").http_routes
 local resource = require("apisix.admin.resource")
 local schema_plugin = require("apisix.admin.plugins").check_schema
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 local type = type
 local tostring = tostring
 local ipairs = ipairs
@@ -38,6 +39,11 @@ local function check_conf(id, conf, need_id, schema)
 end
 
 
+local function encrypt_conf(id, conf)
+    plugins_encrypt_conf(conf.plugins)
+end
+
+
 local function delete_checker(id)
     local routes, routes_ver = get_routes()
     if routes_ver and routes then
@@ -61,6 +67,7 @@ return resource.new({
     kind = "plugin config",
     schema = core.schema.plugin_config,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     unsupported_methods = {"post"},
     delete_checker = delete_checker
 })

apisix/admin/plugin_metadata.lua

@@ -18,7 +18,7 @@ local pcall   = pcall
 local require = require
 local core    = require("apisix.core")
 local resource = require("apisix.admin.resource")
-local encrypt_conf = require("apisix.plugin").encrypt_conf
+local plugin_encrypt_conf = require("apisix.plugin").encrypt_conf
 
 local injected_mark = "injected metadata_schema"
 
@@ -35,6 +35,17 @@ local function validate_plugin(name)
 end
 
 
+local function inject_metadata_schema(plugin_object)
+    if not plugin_object.metadata_schema then
+        plugin_object.metadata_schema = {
+            type = "object",
+            ['$comment'] = injected_mark,
+            properties = {},
+        }
+    end
+end
+
+
 local function check_conf(plugin_name, conf)
     if not plugin_name then
         return nil, {error_msg = "missing plugin name"}
@@ -45,13 +56,8 @@ local function check_conf(plugin_name, conf)
         return nil, {error_msg = "invalid plugin name"}
     end
 
-    if not plugin_object.metadata_schema then
-        plugin_object.metadata_schema = {
-            type = "object",
-            ['$comment'] = injected_mark,
-            properties = {},
-        }
-    end
+    inject_metadata_schema(plugin_object)
+
     local schema = plugin_object.metadata_schema
 
     local ok, err
@@ -64,20 +70,41 @@ local function check_conf(plugin_name, conf)
         ok, err = plugin_object.check_schema(conf, core.schema.TYPE_METADATA)
     end
 
-    encrypt_conf(plugin_name, conf, core.schema.TYPE_METADATA)
-
     if not ok then
         return nil, {error_msg = "invalid configuration: " .. err}
     end
 
     return plugin_name
 end
 
+local function encrypt_conf(plugin_name, conf)
+    if not plugin_name then
+        -- This situation shouldn't happen according to the execution order.
+        core.log.info("missing plugin name")
+        return
+    end
+
+    local ok, plugin_object = validate_plugin(plugin_name)
+    if not ok then
+        -- This situation shouldn't happen according to the execution order.
+        core.log.info("invalid plugin name")
+        return
+    end
+
+    inject_metadata_schema(plugin_object)
+
+    local schema = plugin_object.metadata_schema
+    if schema['$comment'] ~= injected_mark and plugin_object.check_schema then
+        plugin_encrypt_conf(plugin_name, conf, core.schema.TYPE_METADATA)
+    end
+end
+
 
 return resource.new({
     name = "plugin_metadata",
     kind = "plugin_metadata",
     schema = core.schema.plugin_metadata,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     unsupported_methods = {"post", "patch"}
 })

apisix/admin/plugins.lua

@@ -31,13 +31,16 @@ local _M = {}
 
 
 function _M.check_schema(plugins_conf, schema_type)
-    local ok, err = check_schema(plugins_conf, schema_type, false)
-    if ok then
+    return check_schema(plugins_conf, schema_type, false)
+end
+
+
+function _M.encrypt_conf(plugins_conf, schema_type)
+    if plugins_conf then
         for name, conf in pairs(plugins_conf) do
             encrypt_conf(name, conf, schema_type)
         end
     end
-    return ok, err
 end
 
 

apisix/admin/resource.lua

@@ -18,6 +18,7 @@ local core = require("apisix.core")
 local utils = require("apisix.admin.utils")
 local apisix_ssl = require("apisix.ssl")
 local apisix_consumer = require("apisix.consumer")
+local tbl_deepcopy = require("apisix.core.table").deepcopy
 local setmetatable = setmetatable
 local tostring = tostring
 local ipairs = ipairs
@@ -123,7 +124,12 @@ function _M:check_conf(id, conf, need_id, typ, allow_time)
         core.log.info("schema: ", core.json.delay_encode(self.schema))
     end
 
-    local ok, err = self.checker(id, conf, need_id, self.schema, {secret_type = typ})
+    local conf_for_check = tbl_deepcopy(conf)
+    local ok, err = self.checker(id, conf_for_check, need_id, self.schema, {secret_type = typ})
+
+    if self.encrypt_conf then
+        self.encrypt_conf(id, conf)
+    end
 
     if not ok then
         return ok, err

apisix/admin/routes.lua

@@ -19,6 +19,7 @@ local core = require("apisix.core")
 local apisix_upstream = require("apisix.upstream")
 local resource = require("apisix.admin.resource")
 local schema_plugin = require("apisix.admin.plugins").check_schema
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 local type = type
 local loadstring = loadstring
 local ipairs = ipairs
@@ -173,11 +174,18 @@ local function check_conf(id, conf, need_id, schema, opts)
 end
 
 
+local function encrypt_conf(id, conf)
+    apisix_upstream.encrypt_conf(conf.upstream)
+    plugins_encrypt_conf(conf.plugins)
+end
+
+
 return resource.new({
     name = "routes",
     kind = "route",
     schema = core.schema.route,
     checker = check_conf,
+    encrypt_conf = encrypt_conf,
     list_filter_fields = {
         service_id = true,
         upstream_id = true,

apisix/admin/services.lua

@@ -20,6 +20,7 @@ local get_stream_routes = require("apisix.router").stream_routes
 local apisix_upstream = require("apisix.upstream")
 local resource = require("apisix.admin.resource")
 local schema_plugin = require("apisix.admin.plugins").check_schema
+local plugins_encrypt_conf = require("apisix.admin.plugins").encrypt_conf
 local tostring = tostring
 local ipairs = ipairs
 local type = type
@@ -120,10 +121,17 @@ local function delete_checker(id)
 end
 
 
+local function encrypt_conf(id, conf)
+    apisix_upstream.encrypt_conf(conf.upstream)
+    plugins_encrypt_conf(conf.plugins)
+end
+
+
 return resource.new({
     name = "services",
     kind = "service",
     schema = core.schema.service,
     checker = check_conf,
-    delete_checker = delete_checker
+    encrypt_conf = encrypt_conf,
+    delete_checker = delete_checker,
 })