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

hotfix - fix API in autoconf swarm mode

Browse Source
This commit is contained in:
bunkerity 2021-04-28 17:40:54 +02:00
parent 3bb164395e
commit 01eba177d2
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
entrypoint/global-config.sh
View File

@ -220,6 +220,7 @@ if [ "$USE_API" = "yes" ] ; then
API_URI="/$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" API_URI="/$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)"
echo "[*] Generated API URI : $API_URI" echo "[*] Generated API URI : $API_URI"
fi fi
replace_in_file "/etc/nginx/api.conf" "%API_URI%" "$API_URI"
else else
replace_in_file "/etc/nginx/nginx.conf" "%USE_API%" "" replace_in_file "/etc/nginx/nginx.conf" "%USE_API%" ""
fi fi

4
lua/api.lua
View File

@ -1,8 +1,8 @@
local M = {} local M = {}
local api_list = {} local api_list = {}
local api_whitelist_ip = {%API_WHITELIST_IP%} local api_whitelist_ip = {%API_WHITELIST_IP%}
local iputils = require "resty.iputils"
local whitelist = iputils.parse_cidrs(api_whitelist_ip) local whitelist = iputils.parse_cidrs(api_whitelist_ip)
local ip = ngx.var.remote_addr
api_list["^/ping$"] = function () api_list["^/ping$"] = function ()
return true return true
@ -13,7 +13,7 @@ api_list["^/reload$"] = function ()
end end
function M.is_api_call (api_uri) function M.is_api_call (api_uri)
if iputils.ip_in_cidrs(ip, whitelist) and ngx.var.request_uri:sub(1, #api_uri) .. "/" == api_uri .. "/" then if iputils.ip_in_cidrs(ngx.var.remote_addr, whitelist) and ngx.var.request_uri:sub(1, #api_uri) .. "/" == api_uri .. "/" then
for uri, code in pairs(api_list) do for uri, code in pairs(api_list) do
if string.match(ngx.var.request_uri:sub(#api_uri + 1), uri) then if string.match(ngx.var.request_uri:sub(#api_uri + 1), uri) then
return true return true