Cavemanon/haproxy-protection
8
Fork 0
mirror of https://gitgud.io/fatchan/haproxy-protection.git synced 2025-05-09 02:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set cookie expiry properly instead of lasting forever

Browse Source
This commit is contained in:
Thomas Lynch
2023-12-15 00:02:23 +11:00
parent 4c473532f6
commit 33f9e76c4f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lua/scripts/bot-check.lua
View File

@ -73,7 +73,7 @@ else
captcha_backend_name = "recaptcha" captcha_backend_name = "recaptcha"
end end
function secondsToDate(seconds) function _M.secondsToDate(seconds)
local formattedDate = os.date("!%a, %d-%b-%y %H:%M:%S GMT", seconds) local formattedDate = os.date("!%a, %d-%b-%y %H:%M:%S GMT", seconds)
return formattedDate return formattedDate
end end
@ -250,6 +250,7 @@ function _M.view(applet)
-- if they fail, set a var for use in ACLs later -- if they fail, set a var for use in ACLs later
local valid_submission = false local valid_submission = false
local number_expiry = nil
-- parsed POST body -- parsed POST body
local parsed_body = url.parseQuery(applet.receive(applet)) local parsed_body = url.parseQuery(applet.receive(applet))
@ -276,7 +277,7 @@ function _M.view(applet)
local given_answer = split_response[5] local given_answer = split_response[5]
-- expiry check -- expiry check
local number_expiry = tonumber(given_expiry, 10) number_expiry = tonumber(given_expiry, 10)
if number_expiry ~= nil and number_expiry > core.now()['sec'] then if number_expiry ~= nil and number_expiry > core.now()['sec'] then
-- regenerate the challenge and compare it -- regenerate the challenge and compare it
@ -304,7 +305,7 @@ function _M.view(applet)
-- the answer was good, give them a cookie -- the answer was good, give them a cookie
local signature = sha.hmac(sha.sha3_256, hmac_cookie_secret, given_user_key .. given_challenge_hash .. given_expiry .. given_answer) local signature = sha.hmac(sha.sha3_256, hmac_cookie_secret, given_user_key .. given_challenge_hash .. given_expiry .. given_answer)
local combined_cookie = given_user_key .. "#" .. given_challenge_hash .. "#" .. given_expiry .. "#" .. given_answer .. "#" .. signature local combined_cookie = given_user_key .. "#" .. given_challenge_hash .. "#" .. given_expiry .. "#" .. given_answer .. "#" .. signature
local expiry_date_p = secondsToDate(expiry) local expiry_date_p = _M.secondsToDate(number_expiry)
applet:add_header( applet:add_header(
"set-cookie", "set-cookie",
string.format( string.format(
@ -370,7 +371,7 @@ function _M.view(applet)
local user_hash = utils.generate_challenge(applet, captcha_cookie_secret, user_key, ddos_config, true) local user_hash = utils.generate_challenge(applet, captcha_cookie_secret, user_key, ddos_config, true)
local signature = sha.hmac(sha.sha3_256, hmac_cookie_secret, user_key .. user_hash .. matched_expiry) local signature = sha.hmac(sha.sha3_256, hmac_cookie_secret, user_key .. user_hash .. matched_expiry)
local combined_cookie = user_key .. "#" .. user_hash .. "#" .. matched_expiry .. "#" .. signature local combined_cookie = user_key .. "#" .. user_hash .. "#" .. matched_expiry .. "#" .. signature
local expiry_date_c = secondsToDate(expiry) local expiry_date_c = _M.secondsToDate(number_expiry)
applet:add_header( applet:add_header(
"set-cookie", "set-cookie",
string.format( string.format(