add env support

apache · Apr 7, 2023 · 804d4ec · 804d4ec
1 parent f18e6b2
commit 804d4ec
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/apisix/schema_def.lua b/apisix/schema_def.lua
@@ -727,15 +727,15 @@ _M.ssl = {
         },
         cert = {
             oneOf = {
-                { type = "string", minLength = 128, maxLength = 64*1024},
+                certificate_scheme,
                 -- TODO: uniformly define the schema of secret_uri
-                { type = "string", pattern = "^\\$secret://"}
+                { type = "string", pattern = "^\\$(secret|env)://"}
             }
         },
         key = {
             oneOf = {
-                { type = "string", minLength = 128, maxLength = 64*1024},
-                { type = "string", pattern = "^\\$secret://"}
+                private_key_schema,
+                { type = "string", pattern = "^\\$(secret|env)://"}
             }
         },
         sni = {

diff --git a/apisix/secret.lua b/apisix/secret.lua
@@ -116,7 +116,8 @@ local function check_secret_uri(secret_uri)
         return false, "error secret_uri type: " .. type(secret_uri)
     end
 
-    if not string.has_prefix(secret_uri, PREFIX) then
+    if not string.has_prefix(upper(secret_uri), PREFIX) and
+        not string.has_prefix(upper(secret_uri), core.env.PREFIX) then
         return false, "error secret_uri prefix: " .. secret_uri
     end
 

diff --git a/apisix/ssl.lua b/apisix/ssl.lua
@@ -253,8 +253,8 @@ function _M.check_ssl_conf(in_dp, conf)
         end
     end
 
-    -- if the certificate uses a secret reference, we only verify it when using it
-    if not secret.check_secret_uri(conf.cert) and
+    -- if the certificate or key uses a secret reference, we only verify it when using it
+    if not secret.check_secret_uri(conf.cert) or
         not secret.check_secret_uri(conf.key) then
 
         local ok, err = validate(conf.cert, conf.key)
@@ -274,7 +274,7 @@ function _M.check_ssl_conf(in_dp, conf)
     end
 
     for i = 1, numcerts do
-        if not secret.check_secret_uri(conf.cert[i]) and
+        if not secret.check_secret_uri(conf.cert[i]) or
             not secret.check_secret_uri(conf.key[i]) then
 
             local ok, err = validate(conf.certs[i], conf.keys[i])

diff --git a/t/router/radixtree-sni2.t b/t/router/radixtree-sni2.t
@@ -578,7 +578,7 @@ GET /t
             local code, body = t('/apisix/admin/ssls/1',
                 ngx.HTTP_PUT,
                 [[{
-                     "cert": "$secret://vault/test1/ssl/test2.com.crt",
+                    "cert": "$secret://vault/test1/ssl/test2.com.crt",
                     "key": "$secret://vault/test1/ssl/test2.com.key",
                     "sni": "test2.com"
                 }]]