From 8527f774f782dcf4c0f6da7e3d6aac73d655493e Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 2 Apr 2020 20:41:31 -0300 Subject: [PATCH] Change condition order that produces endless loop --- rootfs/etc/nginx/lua/lua_ingress.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rootfs/etc/nginx/lua/lua_ingress.lua b/rootfs/etc/nginx/lua/lua_ingress.lua index 2d84ce141..e292ade80 100644 --- a/rootfs/etc/nginx/lua/lua_ingress.lua +++ b/rootfs/etc/nginx/lua/lua_ingress.lua @@ -61,12 +61,12 @@ local function redirect_to_https(location_config) return false end - if ngx.var.pass_access_scheme ~= "http" then - return false + if location_config.force_ssl_redirect and ngx.var.pass_access_scheme == "http" then + return true end - if location_config.force_ssl_redirect then - return true + if ngx.var.pass_access_scheme ~= "http" then + return false end return location_config.ssl_redirect and certificate_configured_for_current_request() @@ -105,6 +105,7 @@ end -- phases or redirection function _M.rewrite(location_config) ngx.var.pass_access_scheme = ngx.var.scheme + ngx.var.best_http_host = ngx.var.http_host or ngx.var.host if config.use_forwarded_headers then