use has_prefix

apache · Nov 24, 2022 · 778e9a9 · 778e9a9
1 parent e0a456d
commit 778e9a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/apisix/core/env.lua b/apisix/core/env.lua
@@ -59,7 +59,9 @@ end
 
 
 local function is_env_ref(ref)
-    return type(ref) == "string" and sub(upper(ref), 1, 7) == ENV_PREFIX
+    -- Avoid the error caused by has_prefix to cause a crash,
+    -- so judge the type of ref.
+    return type(ref) == "string" and string.has_prefix(upper(ref), ENV_PREFIX)
 end
 
 

diff --git a/apisix/core/utils.lua b/apisix/core/utils.lua
@@ -35,6 +35,7 @@ local base           = require("resty.core.base")
 local open           = io.open
 local sub_str        = string.sub
 local str_byte       = string.byte
+local str_format     = string.format
 local tonumber       = tonumber
 local tostring       = tostring
 local pairs          = pairs
@@ -352,7 +353,7 @@ do
     end
 
     local function retrieve(refs)
-        log.info(string.format("retrieve secrets refs: %p", refs))
+        log.info(str_format("retrieve secrets refs: %p", refs))
 
         local new_refs = table.deepcopy(refs)
         return retrieve_ref(new_refs)