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

log - replace some WARN tags from LUA logs with NOTICE to avoid confusion

Browse Source
This commit is contained in:
bunkerity 2021-04-27 09:57:07 +02:00
parent 19fa0eb25f
commit 843644f806
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confs/global/api-temp.conf
View File

@ -13,7 +13,7 @@ rewrite_by_lua_block {
if api.is_api_call(api_uri) then if api.is_api_call(api_uri) then
ngx.header.content_type = 'text/plain' ngx.header.content_type = 'text/plain'
if api.do_api_call(api_uri) then if api.do_api_call(api_uri) then
ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[API] API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
ngx.say("ok") ngx.say("ok")
else else
ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr) ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)

2
confs/global/api.conf
View File

@ -6,7 +6,7 @@ rewrite_by_lua_block {
if api.is_api_call(api_uri) then if api.is_api_call(api_uri) then
ngx.header.content_type = 'text/plain' ngx.header.content_type = 'text/plain'
if api.do_api_call(api_uri) then if api.do_api_call(api_uri) then
ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[API] API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
ngx.say("ok") ngx.say("ok")
else else
ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr) ngx.log(ngx.WARN, "[API] API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)

2
confs/global/crowdsec.conf
View File

@ -5,5 +5,5 @@ init_by_lua_block {
ngx.log(ngx.ERR, "[Crowdsec] " .. err) ngx.log(ngx.ERR, "[Crowdsec] " .. err)
error() error()
end end
ngx.log(ngx.WARN, "[Crowdsec] Initialisation done") ngx.log(ngx.NOTICE, "[Crowdsec] Initialisation done")
} }

2
confs/global/nginx.conf
View File

@ -50,7 +50,7 @@ http {
# write logs to local syslog # write logs to local syslog
log_format logf '%LOG_FORMAT%'; log_format logf '%LOG_FORMAT%';
access_log syslog:server=unix:/tmp/log,nohostname,facility=local0,severity=notice logf; access_log syslog:server=unix:/tmp/log,nohostname,facility=local0,severity=notice logf;
error_log syslog:server=unix:/tmp/log,nohostname,facility=local0 warn; error_log syslog:server=unix:/tmp/log,nohostname,facility=local0 notice;
# temp paths # temp paths
proxy_temp_path /tmp/proxy_temp; proxy_temp_path /tmp/proxy_temp;

8
confs/site/antibot-captcha.conf
View File

@ -7,7 +7,7 @@ location = %ANTIBOT_URI% {
local cookie = require "cookie" local cookie = require "cookie"
local captcha = require "captcha" local captcha = require "captcha"
if not cookie.is_set("uri") then if not cookie.is_set("uri") then
ngx.log(ngx.WARN, "[ANTIBOT] captcha fail (1) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (1) for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
local img, res = captcha.get_challenge() local img, res = captcha.get_challenge()
@ -22,19 +22,19 @@ location = %ANTIBOT_URI% {
local cookie = require "cookie" local cookie = require "cookie"
local captcha = require "captcha" local captcha = require "captcha"
if not cookie.is_set("captchares") then if not cookie.is_set("captchares") then
ngx.log(ngx.WARN, "[ANTIBOT] captcha fail (2) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (2) for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
ngx.req.read_body() ngx.req.read_body()
local args, err = ngx.req.get_post_args(1) local args, err = ngx.req.get_post_args(1)
if err == "truncated" or not args or not args["captcha"] then if err == "truncated" or not args or not args["captcha"] then
ngx.log(ngx.WARN, "[ANTIBOT] captcha fail (3) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (3) for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
local captcha_user = args["captcha"] local captcha_user = args["captcha"]
local check = captcha.check(captcha_user, cookie.get("captchares")) local check = captcha.check(captcha_user, cookie.get("captchares"))
if not check then if not check then
ngx.log(ngx.WARN, "[ANTIBOT] captcha fail (4) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] captcha fail (4) for " .. ngx.var.remote_addr)
return ngx.redirect("%ANTIBOT_URI%") return ngx.redirect("%ANTIBOT_URI%")
end end
cookie.set({captcha = "ok"}) cookie.set({captcha = "ok"})

8
confs/site/antibot-recaptcha.conf
View File

@ -7,7 +7,7 @@ location = %ANTIBOT_URI% {
local cookie = require "cookie" local cookie = require "cookie"
local recaptcha = require "recaptcha" local recaptcha = require "recaptcha"
if not cookie.is_set("uri") then if not cookie.is_set("uri") then
ngx.log(ngx.WARN, "[ANTIBOT] recaptcha fail (1) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (1) for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
local code = recaptcha.get_code("%ANTIBOT_URI%", "%ANTIBOT_RECAPTCHA_SITEKEY%") local code = recaptcha.get_code("%ANTIBOT_URI%", "%ANTIBOT_RECAPTCHA_SITEKEY%")
@ -20,19 +20,19 @@ location = %ANTIBOT_URI% {
local cookie = require "cookie" local cookie = require "cookie"
local recaptcha = require "recaptcha" local recaptcha = require "recaptcha"
if not cookie.is_set("uri") then if not cookie.is_set("uri") then
ngx.log(ngx.WARN, "[ANTIBOT] recaptcha fail (2) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (2) for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
ngx.req.read_body() ngx.req.read_body()
local args, err = ngx.req.get_post_args(1) local args, err = ngx.req.get_post_args(1)
if err == "truncated" or not args or not args["token"] then if err == "truncated" or not args or not args["token"] then
ngx.log(ngx.WARN, "[ANTIBOT] recaptcha fail (3) for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (3) for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
local token = args["token"] local token = args["token"]
local check = recaptcha.check(token, "%ANTIBOT_RECAPTCHA_SECRET%") local check = recaptcha.check(token, "%ANTIBOT_RECAPTCHA_SECRET%")
if check < %ANTIBOT_RECAPTCHA_SCORE% then if check < %ANTIBOT_RECAPTCHA_SCORE% then
ngx.log(ngx.WARN, "[ANTIBOT] recaptcha fail (4) for " .. ngx.var.remote_addr .. " (score = " .. tostring(check) .. ")") ngx.log(ngx.NOTICE, "[ANTIBOT] recaptcha fail (4) for " .. ngx.var.remote_addr .. " (score = " .. tostring(check) .. ")")
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
end end
cookie.set({recaptcha = "ok"}) cookie.set({recaptcha = "ok"})

14
confs/site/main-lua.conf
View File

@ -70,7 +70,7 @@ end
-- check if URI is whitelisted -- check if URI is whitelisted
for k, v in pairs(whitelist_uri) do for k, v in pairs(whitelist_uri) do
if ngx.var.request_uri == v then if ngx.var.request_uri == v then
ngx.log(ngx.WARN, "[WHITELIST] URI " .. v .. " is whitelisted") ngx.log(ngx.NOTICE, "[WHITELIST] URI " .. v .. " is whitelisted")
ngx.exit(ngx.OK) ngx.exit(ngx.OK)
end end
end end
@ -99,26 +99,26 @@ if use_user_agent and ngx.var.bad_user_agent == "yes" then
local block = false local block = false
for k, v in pairs(whitelist_user_agent) do for k, v in pairs(whitelist_user_agent) do
if string.match(ngx.var.http_user_agent, v) then if string.match(ngx.var.http_user_agent, v) then
ngx.log(ngx.WARN, "[ALLOW] User-Agent " .. ngx.var.http_user_agent .. " is whitelisted") ngx.log(ngx.NOTICE, "[ALLOW] User-Agent " .. ngx.var.http_user_agent .. " is whitelisted")
block = false block = false
break break
end end
end end
if block then if block then
ngx.log(ngx.WARN, "[BLOCK] User-Agent " .. ngx.var.http_user_agent .. " is blacklisted") ngx.log(ngx.NOTICE, "[BLOCK] User-Agent " .. ngx.var.http_user_agent .. " is blacklisted")
ngx.exit(ngx.HTTP_FORBIDDEN) ngx.exit(ngx.HTTP_FORBIDDEN)
end end
end end
-- check if referrer is allowed -- check if referrer is allowed
if use_referrer and ngx.var.bad_referrer == "yes" then if use_referrer and ngx.var.bad_referrer == "yes" then
ngx.log(ngx.WARN, "[BLOCK] Referrer " .. ngx.var.http_referer .. " is blacklisted") ngx.log(ngx.NOTICE, "[BLOCK] Referrer " .. ngx.var.http_referer .. " is blacklisted")
ngx.exit(ngx.HTTP_FORBIDDEN) ngx.exit(ngx.HTTP_FORBIDDEN)
end end
-- check if country is allowed -- check if country is allowed
if use_country and ngx.var.allowed_country == "no" then if use_country and ngx.var.allowed_country == "no" then
ngx.log(ngx.WARN, "[BLOCK] Country of " .. ngx.var.remote_addr .. " is blacklisted") ngx.log(ngx.NOTICE, "[BLOCK] Country of " .. ngx.var.remote_addr .. " is blacklisted")
ngx.exit(ngx.HTTP_FORBIDDEN) ngx.exit(ngx.HTTP_FORBIDDEN)
end end
@ -136,7 +136,7 @@ if use_crowdsec then
ngx.log(ngx.ERR, "[Crowdsec] " .. err) ngx.log(ngx.ERR, "[Crowdsec] " .. err)
end end
if not ok then if not ok then
ngx.log(ngx.WARN, "[Crowdsec] denied '" .. ngx.var.remote_addr .. "'") ngx.log(ngx.NOTICE, "[Crowdsec] denied '" .. ngx.var.remote_addr .. "'")
ngx.exit(ngx.HTTP_FORBIDDEN) ngx.exit(ngx.HTTP_FORBIDDEN)
end end
end end
@ -148,7 +148,7 @@ if use_antibot_cookie then
cookie.set({uri = ngx.var.request_uri}) cookie.set({uri = ngx.var.request_uri})
return ngx.redirect(antibot_uri) return ngx.redirect(antibot_uri)
end end
ngx.log(ngx.WARN, "[ANTIBOT] cookie fail for " .. ngx.var.remote_addr) ngx.log(ngx.NOTICE, "[ANTIBOT] cookie fail for " .. ngx.var.remote_addr)
return ngx.exit(ngx.HTTP_FORBIDDEN) return ngx.exit(ngx.HTTP_FORBIDDEN)
else else
if ngx.var.request_uri == antibot_uri then if ngx.var.request_uri == antibot_uri then

4
lua/blacklist.lua
View File

@ -26,7 +26,7 @@ function M.check_ip ()
if #ip_list > 0 then if #ip_list > 0 then
if iputils.ip_in_cidrs(ip, blacklist) then if iputils.ip_in_cidrs(ip, blacklist) then
ngx.shared.blacklist_ip_cache:set(ip, "ko", 86400) ngx.shared.blacklist_ip_cache:set(ip, "ko", 86400)
ngx.log(ngx.WARN, "ip " .. ip .. " is in blacklist") ngx.log(ngx.NOTICE, "ip " .. ip .. " is in blacklist")
return true return true
end end
end end
@ -41,7 +41,7 @@ function M.check_reverse ()
for k, v in ipairs(reverse_list) do for k, v in ipairs(reverse_list) do
if rdns:sub(-#v) == v then if rdns:sub(-#v) == v then
ngx.shared.blacklist_reverse_cache:set(ip, "ko", 86400) ngx.shared.blacklist_reverse_cache:set(ip, "ko", 86400)
ngx.log(ngx.WARN, "reverse " .. rdns .. " is in blacklist") ngx.log(ngx.NOTICE, "reverse " .. rdns .. " is in blacklist")
return true return true
end end
end end

2
lua/dnsbl.lua
View File

@ -20,7 +20,7 @@ function M.check ()
local a,b,c,d = v2:match("([%d]+).([%d]+).([%d]+).([%d]+)") local a,b,c,d = v2:match("([%d]+).([%d]+).([%d]+).([%d]+)")
if a == "127" then if a == "127" then
ngx.shared.dnsbl_cache:set(ip, "ko", 86400) ngx.shared.dnsbl_cache:set(ip, "ko", 86400)
ngx.log(ngx.WARN, "ip " .. ip .. " is in DNSBL " .. v) ngx.log(ngx.NOTICE, "ip " .. ip .. " is in DNSBL " .. v)
return true return true
end end
end end

4
lua/whitelist.lua
View File

@ -26,7 +26,7 @@ function M.check_ip ()
if #ip_list > 0 then if #ip_list > 0 then
if iputils.ip_in_cidrs(ip, whitelist) then if iputils.ip_in_cidrs(ip, whitelist) then
ngx.shared.whitelist_ip_cache:set(ip, "ok", 86400) ngx.shared.whitelist_ip_cache:set(ip, "ok", 86400)
ngx.log(ngx.WARN, "ip " .. ip .. " is in whitelist") ngx.log(ngx.NOTICE, "ip " .. ip .. " is in whitelist")
return true return true
end end
end end
@ -50,7 +50,7 @@ function M.check_reverse ()
for k, v in ipairs(ips) do for k, v in ipairs(ips) do
if v == ip then if v == ip then
ngx.shared.whitelist_reverse_cache:set(ip, "ok", 86400) ngx.shared.whitelist_reverse_cache:set(ip, "ok", 86400)
ngx.log(ngx.WARN, "reverse " .. rdns .. " is in whitelist") ngx.log(ngx.NOTICE, "reverse " .. rdns .. " is in whitelist")
return true return true
end end
end end