From eb112ea06cf1952e2b082ddab1e81f08c325bb53 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Sat, 21 Mar 2020 21:21:52 -0400 Subject: [PATCH] refactoring: use more specific var name --- rootfs/etc/nginx/lua/certificate.lua | 8 +++----- rootfs/etc/nginx/lua/test/certificate_test.lua | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rootfs/etc/nginx/lua/certificate.lua b/rootfs/etc/nginx/lua/certificate.lua index dc5dbf7b7..af8f1b9a0 100644 --- a/rootfs/etc/nginx/lua/certificate.lua +++ b/rootfs/etc/nginx/lua/certificate.lua @@ -56,13 +56,11 @@ local function get_pem_cert_uid(raw_hostname) end function _M.configured_for_current_request() - if ngx.ctx.configured_for_current_request ~= nil then - return ngx.ctx.configured_for_current_request + if ngx.ctx.cert_configured_for_current_request == nil then + ngx.ctx.cert_configured_for_current_request = get_pem_cert_uid(ngx.var.host) ~= nil end - ngx.ctx.configured_for_current_request = get_pem_cert_uid(ngx.var.host) ~= nil - - return ngx.ctx.configured_for_current_request + return ngx.ctx.cert_configured_for_current_request end function _M.call() diff --git a/rootfs/etc/nginx/lua/test/certificate_test.lua b/rootfs/etc/nginx/lua/test/certificate_test.lua index dc9b3dcfd..794a80ca7 100644 --- a/rootfs/etc/nginx/lua/test/certificate_test.lua +++ b/rootfs/etc/nginx/lua/test/certificate_test.lua @@ -135,7 +135,7 @@ describe("Certificate", function() local _ngx = { var = { host = "hostname" } } setmetatable(_ngx, {__index = _G.ngx}) _G.ngx = _ngx - ngx.ctx.configured_for_current_request = nil + ngx.ctx.cert_configured_for_current_request = nil set_certificate("hostname", EXAMPLE_CERT, UUID) end) @@ -150,7 +150,7 @@ describe("Certificate", function() end) it("returns cached value from ngx.ctx", function() - ngx.ctx.configured_for_current_request = false + ngx.ctx.cert_configured_for_current_request = false assert.is_false(certificate.configured_for_current_request()) end) end)