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

Use second as cookie expires unit

Browse source
This commit is contained in:
liuwei 2018-11-02 17:05:38 +08:00
parent ce6e564f82
commit c74e59fa4c
6 changed files with 45 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

33
rootfs/etc/nginx/lua/balancer/sticky.lua
View file

@ -33,32 +33,6 @@ local function encrypted_endpoint_string(self, endpoint_string)
return encrypted
end
local function parse_cookie_expires(expires)
local time = tonumber(string.sub(expires, 0, string.len(expires) - 1))
if time == nil then
return nil, string.format("the time of expires (%s) is wrong", expires)
end
local unit = string.sub(expires, -1)
if unit == "y" then
return time * 60 * 60 * 24 * 365
elseif unit == "M" then
return time * 60 * 60 * 24 * 30
elseif unit == "w" then
return time * 60 * 60 * 24 * 7
elseif unit == "d" then
return time * 60 * 60 * 24
elseif unit == "h" then
return time * 60 * 60
elseif unit == "m" then
return time * 60
elseif unit == "s" then
return time
else
return nil, string.format("the unit of expires (%s) is wrong", expires)
end
end
local function set_cookie(self, value)
local cookie, err = ck:new()
if not cookie then
@ -75,12 +49,7 @@ local function set_cookie(self, value)
local expires
if self.cookie_expires and self.cookie_expires ~= "" then
expires, err = parse_cookie_expires(self.cookie_expires)
if err then
ngx.log(ngx.WARN, string.format("error when parsing cookie expires: %s, ignoring it", tostring(err)))
else
cookie_data.expires = ngx.cookie_time(expires)
end
cookie_data.expires = ngx.cookie_time(tonumber(self.cookie_expires))
end
if self.cookie_max_age and self.cookie_max_age ~= "" then

87
rootfs/etc/nginx/lua/test/balancer/sticky_test.lua
View file

@ -132,91 +132,6 @@ describe("Sticky", function()
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
end)
it("sets an expires cookie (with expires) on the client", function()
local s = {}
local expected_expires
cookie.new = function(self)
local test_backend_hash_fn = test_backend.sessionAffinityConfig.cookieSessionAffinity.hash
local cookie_instance = {
set = function(self, payload)
assert.equal(payload.key, test_backend.sessionAffinityConfig.cookieSessionAffinity.name)
assert.equal(payload.value, util[test_backend_hash_fn .. "_digest"](test_backend_endpoint))
assert.equal(payload.path, ngx.var.location_path)
assert.equal(payload.domain, nil)
assert.equal(payload.httponly, true)
expected_expires = payload.expires
return true, nil
end,
get = function(k) return false end,
}
s = spy.on(cookie_instance, "set")
return cookie_instance, false
end
local temp_backend = util.deepcopy(get_test_backend())
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "1y"
local sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(1 * 60 * 60 * 24 * 365))
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "10M"
sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(10 * 60 * 60 * 24 * 30))
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "8w"
sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(8 * 60 * 60 * 24 * 7))
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "200d"
sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(200 * 60 * 60 * 24))
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "24h"
sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(24 * 60 * 60))
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "30m"
sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(30 * 60))
temp_backend.sessionAffinityConfig.cookieSessionAffinity.expires = "300s"
sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
assert.equal(expected_expires, ngx.cookie_time(300))
end)
it("sets an expires cookie (with max-age) on the client", function()
local s = {}
local cookie_payload = {}
cookie.new = function(self)
local test_backend_hash_fn = test_backend.sessionAffinityConfig.cookieSessionAffinity.hash
local cookie_instance = {
set = function(self, payload)
assert.equal(payload.key, test_backend.sessionAffinityConfig.cookieSessionAffinity.name)
assert.equal(payload.value, util[test_backend_hash_fn .. "_digest"](test_backend_endpoint))
assert.equal(payload.path, ngx.var.location_path)
assert.equal(payload.domain, nil)
assert.equal(payload.httponly, true)
assert.equal(payload.max_age, 1000)
return true, nil
end,
get = function(k) return false end,
}
s = spy.on(cookie_instance, "set")
return cookie_instance, false
end
local temp_backend = util.deepcopy(get_test_backend())
temp_backend.sessionAffinityConfig.cookieSessionAffinity.maxage = "1000"
local sticky_balancer_instance = sticky:new(temp_backend)
assert.has_no.errors(function() sticky_balancer_instance:balance() end)
assert.spy(s).was_called()
end)
end)
context("when client has a cookie set", function()
@ -242,4 +157,4 @@ describe("Sticky", function()
end)
end)
end)
end)
end)