Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

session secret fix

Browse Source
This commit is contained in:
bunkerity 2020-10-16 17:31:53 +02:00
parent c1d44387b5
commit ccf4392280
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confs/main-lua.conf
View File

@ -1,3 +1,5 @@
set $session_secret %ANTIBOT_SESSION_SECRET%;
access_by_lua_block { access_by_lua_block {
local use_whitelist_ip = %USE_WHITELIST_IP% local use_whitelist_ip = %USE_WHITELIST_IP%

1
confs/server.conf
View File

@ -1,5 +1,6 @@
server { server {
include /server-confs/*.conf; include /server-confs/*.conf;
set $session_secret %ANTIBOT_SESSION_SECRET%;
include /etc/nginx/main-lua.conf; include /etc/nginx/main-lua.conf;
%LISTEN_HTTP% %LISTEN_HTTP%
%USE_HTTPS% %USE_HTTPS%

7
entrypoint.sh
View File

@ -156,6 +156,7 @@ SELF_SIGNED_SSL_CN="${SELF_SIGNED_SSL_CN-bunkerity-nginx}"
ANTIBOT_URI="${ANTIBOT_URI-/challenge}" ANTIBOT_URI="${ANTIBOT_URI-/challenge}"
USE_ANTIBOT="${USE_ANTIBOT-cookie}" USE_ANTIBOT="${USE_ANTIBOT-cookie}"
ANTIBOT_RECAPTCHA_SCORE="${ANTIBOT_RECAPTCHA_SCORE-0.7}" ANTIBOT_RECAPTCHA_SCORE="${ANTIBOT_RECAPTCHA_SCORE-0.7}"
ANTIBOT_SESSION_SECRET="${ANTIBOT_SESSION_SECRET-random}"
# install additional modules if needed # install additional modules if needed
if [ "$ADDITIONAL_MODULES" != "" ] ; then if [ "$ADDITIONAL_MODULES" != "" ] ; then
@ -497,8 +498,12 @@ fi
list=$(spaces_to_lua "$DNSBL_LIST") list=$(spaces_to_lua "$DNSBL_LIST")
replace_in_file "/usr/local/lib/lua/dnsbl.lua" "%DNSBL_LIST%" "$list" replace_in_file "/usr/local/lib/lua/dnsbl.lua" "%DNSBL_LIST%" "$list"
# antibot uri # antibot uri and session secret
replace_in_file "/etc/nginx/main-lua.conf" "%ANTIBOT_URI%" "$ANTIBOT_URI" replace_in_file "/etc/nginx/main-lua.conf" "%ANTIBOT_URI%" "$ANTIBOT_URI"
if [ "$ANTIBOT_SESSION_SECRET" = "random" ] ; then
ANTIBOT_SESSION_SECRET=$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)
fi
replace_in_file "/etc/nginx/main-lua.conf" "%ANTIBOT_SESSION_SECRET%" "$ANTIBOT_SESSION_SECRET"
# antibot via cookie # antibot via cookie
if [ "$USE_ANTIBOT" = "cookie" ] ; then if [ "$USE_ANTIBOT" = "cookie" ] ; then

7
lua/cookie.lua
View File

@ -3,11 +3,10 @@ local M = {}
local session = require "resty.session" local session = require "resty.session"
function M.session () function M.session ()
local s = session:open() if not ngx.ctx.session then
if not s.started then ngx.ctx.session = session:start()
s:start()
end end
return s return ngx.ctx.session
end end
function M.is_set (key) function M.is_set (key)