fix: merge function

Author: Baoyuantop

apisix/admin/consumers.lua

@@ -19,46 +19,8 @@ local plugins = require("apisix.admin.plugins")
 local resource = require("apisix.admin.resource")
 local plugin = require("apisix.plugin")
 local pairs = pairs
-local consumer = require("apisix.consumer")
 local utils = require("apisix.admin.utils")
 
-
-local function check_duplicate_key(username, plugins_conf)
-    if not plugins_conf then
-        return true
-    end
-
-    for plugin_name, plugin_conf in pairs(plugins_conf) do
-        local plugin_obj = plugin.get(plugin_name)
-        if not plugin_obj then
-            return nil, "unknown plugin " .. plugin_name
-        end
-
-        if plugin_obj.type ~= "auth" then
-            goto continue
-        end
-
-        local key_field = utils.plugin_key_map[plugin_name]
-        if not key_field then
-            goto continue
-        end
-
-        local key_value = plugin_conf[key_field]
-        if not key_value then
-            goto continue
-        end
-
-        local consumer = consumer.find_consumer(plugin_name, key_field, key_value)
-        if consumer and consumer.username ~= username then
-            return nil, "duplicate key found with consumer: " .. consumer.username
-        end
-
-        ::continue::
-    end
-
-    return true
-end
-
 local function check_conf(username, conf, need_username, schema)
     local ok, err = core.schema.check(schema, conf)
     if not ok then
@@ -77,7 +39,7 @@ local function check_conf(username, conf, need_username, schema)
         if not ok then
             return nil, {error_msg = "invalid plugins configuration: " .. err}
         end
-        local ok, err = check_duplicate_key(conf.username, conf_plugins_copy)
+        local ok, err = utils.check_duplicate_key(conf_plugins_copy, conf.username)
         if not ok then
             return nil, {error_msg = err}
         end

apisix/admin/credentials.lua

@@ -18,42 +18,9 @@ local core     = require("apisix.core")
 local plugins  = require("apisix.admin.plugins")
 local plugin   = require("apisix.plugin")
 local resource = require("apisix.admin.resource")
-local consumer = require("apisix.consumer")
 local utils = require("apisix.admin.utils")
 local pairs    = pairs
 
-local function check_duplicate_key(id, plugins)
-    for name, plugin_conf in pairs(plugins) do
-        local plugin_obj = plugin.get(name)
-        if not plugin_obj then
-            goto continue
-        end
-
-        if plugin_obj.type ~= "auth" then
-            goto continue
-        end
-
-        local key_field = utils.plugin_key_map[name]
-        if not key_field then
-            goto continue
-        end
-
-        local key_value = plugin_conf[key_field]
-        if not key_value then
-            goto continue
-        end
-
-        local consumer = consumer.find_consumer(name, key_field, key_value)
-        if consumer and consumer.credential_id ~= id then
-            return nil, "duplicate key found with consumer: " .. consumer.username
-        end
-
-        ::continue::
-    end
-
-    return true
-end
-
 local function check_conf(id, conf, _need_id, schema)
     local ok, err = core.schema.check(schema, conf)
     if not ok then
@@ -69,7 +36,7 @@ local function check_conf(id, conf, _need_id, schema)
             return nil, {error_msg = "invalid plugins configuration: " .. err}
         end
 
-        local ok, err = check_duplicate_key(id, conf_plugins_copy)
+        local ok, err = utils.check_duplicate_key(conf_plugins_copy, nil, id)
         if not ok then
             return nil, {error_msg = err}
         end

apisix/admin/utils.lua

@@ -19,6 +19,8 @@ local ngx_time = ngx.time
 local tonumber = tonumber
 local ipairs = ipairs
 local pairs = pairs
+local consumer = require("apisix.consumer")
+local plugin = require("apisix.plugin")
 
 
 local _M = {}
@@ -110,11 +112,50 @@ function _M.decrypt_params(decrypt_func, body, schema_type)
     end
 end
 
-_M.plugin_key_map = {
+
+local plugin_key_map = {
     ["key-auth"] = "key",
     ["basic-auth"] = "username",
     ["jwt-auth"] = "key",
     ["hmac-auth"] = "key_id"
 }
 
+
+function _M.check_duplicate_key(plugins_conf, username, credential_id)
+    if not plugins_conf then
+        return true
+    end
+
+    for plugin_name, plugin_conf in pairs(plugins_conf) do
+        local plugin_obj = plugin.get(plugin_name)
+        if not plugin_obj then
+            return nil, "unknown plugin " .. plugin_name
+        end
+
+        if plugin_obj.type ~= "auth" then
+            goto continue
+        end
+
+        local key_field = plugin_key_map[plugin_name]
+        if not key_field then
+            goto continue
+        end
+
+        local key_value = plugin_conf[key_field]
+        if not key_value then
+            goto continue
+        end
+
+        local consumer = consumer.find_consumer(plugin_name, key_field, key_value)
+        if consumer and
+            ((username and consumer.username ~= username) or (credential_id and consumer.credential_id ~= credential_id)) then
+            return nil, "duplicate key found with consumer: " .. consumer.username
+        end
+
+        ::continue::
+    end
+
+    return true
+end
+
 return _M