Merge pull request #1568 from SkynetLabs/fix-nginx-lua-falsy-variable
fix empty check on nginx sourced env variable
This commit is contained in:
commit
39f04bba06
|
@ -4,8 +4,7 @@ function _M.authorization_header()
|
|||
-- read api password from env variable
|
||||
local apipassword = os.getenv("SIA_API_PASSWORD")
|
||||
-- if api password is not available as env variable, read it from disk
|
||||
if not apipassword then
|
||||
local b64 = require("ngx.base64")
|
||||
if apipassword == nil or apipassword == "" then
|
||||
-- open apipassword file for reading (b flag is required for some reason)
|
||||
-- (file /etc/.sia/apipassword has to be mounted from the host system)
|
||||
local apipassword_file = io.open("/data/sia/apipassword", "rb")
|
||||
|
@ -16,7 +15,7 @@ function _M.authorization_header()
|
|||
end
|
||||
-- encode the user:password authorization string
|
||||
-- (in our case user is empty so it is just :password)
|
||||
local content = b64.encode_base64url(":" .. apipassword)
|
||||
local content = require("ngx.base64").encode_base64url(":" .. apipassword)
|
||||
-- set authorization header with proper base64 encoded string
|
||||
return "Basic " .. content
|
||||
end
|
||||
|
|
Reference in New Issue