DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve certificate configuration detection per request

Browse source
This commit is contained in:
Elvin Efendi 2019-09-24 21:17:02 -04:00
parent c5a8357f1d
commit 73e659f5fc
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rootfs/etc/nginx/lua/lua_ingress.lua
View file

@ -1,6 +1,6 @@
local ngx_re_split = require("ngx.re").split
local certificate_configured_for_server = require("certificate").configured_for_server
local certificate_configured_for_current_request = require("certificate").configured_for_current_request
local original_randomseed = math.randomseed
local string_format = string.format
@ -69,7 +69,7 @@ local function redirect_to_https(location_config)
return true
end
return location_config.ssl_redirect and certificate_configured_for_server(ngx.var.host)
return location_config.ssl_redirect and certificate_configured_for_current_request()
end
local function redirect_host()
@ -143,7 +143,7 @@ function _M.rewrite(location_config)
ngx_redirect(uri, config.http_redirect_code)
end
if config.hsts and ngx.var.scheme == "https" and certificate_configured_for_server(ngx.var.host) then
if config.hsts and ngx.var.scheme == "https" and certificate_configured_for_current_request then
local value = "max-age=" .. config.hsts_max_age
if config.hsts_include_subdomains then
value = value .. "; includeSubDomains"