Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lint files

Browse source
This commit is contained in:
Théophile Diot 2023-09-05 11:54:14 +02:00
parent d9d6ed9bb0
commit bceb286026
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
6 changed files with 81 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/core/errors/files/error.html
View file

File diff suppressed because one or more lines are too long

78
src/common/core/headers/headers.lua
View file

@ -17,41 +17,41 @@ function headers:initialize(ctx)
["X_CONTENT_TYPE_OPTIONS"] = "X-Content-Type-Options",
["X_XSS_PROTECTION"] = "X-XSS-Protection"
}
-- Load data from datastore if needed
if ngx.get_phase() ~= "init" then
-- Get custom headers from datastore
local custom_headers, err = self.datastore:get("plugin_headers_custom_headers", true)
if not custom_headers then
self.logger:log(ngx.ERR, err)
return
end
self.custom_headers = {}
-- Extract global headers
if custom_headers.global then
for k, v in pairs(custom_headers.global) do
self.custom_headers[k] = v
end
end
-- Extract and overwrite if needed server headers
if custom_headers[self.ctx.bw.server_name] then
for k, v in pairs(custom_headers[self.ctx.bw.server_name]) do
self.custom_headers[k] = v
end
end
end
-- Load data from datastore if needed
if ngx.get_phase() ~= "init" then
-- Get custom headers from datastore
local custom_headers, err = self.datastore:get("plugin_headers_custom_headers", true)
if not custom_headers then
self.logger:log(ngx.ERR, err)
return
end
self.custom_headers = {}
-- Extract global headers
if custom_headers.global then
for k, v in pairs(custom_headers.global) do
self.custom_headers[k] = v
end
end
-- Extract and overwrite if needed server headers
if custom_headers[self.ctx.bw.server_name] then
for k, v in pairs(custom_headers[self.ctx.bw.server_name]) do
self.custom_headers[k] = v
end
end
end
end
function headers:init()
-- Get variables
local variables, err = utils.get_multiple_variables({ "CUSTOM_HEADER" })
if variables == nil then
return self:ret(false, err)
end
-- Store custom headers name and value
local data = {}
local i = 0
for srv, vars in pairs(variables) do
for var, value in pairs(vars) do
-- Get variables
local variables, err = utils.get_multiple_variables({ "CUSTOM_HEADER" })
if variables == nil then
return self:ret(false, err)
end
-- Store custom headers name and value
local data = {}
local i = 0
for srv, vars in pairs(variables) do
for var, value in pairs(vars) do
if data[srv] == nil then
data[srv] = {}
end
@ -60,13 +60,13 @@ function headers:init()
data[srv][m[1]] = m[2]
end
i = i + 1
end
end
local ok, err = self.datastore:set("plugin_headers_custom_headers", data, nil, true)
if not ok then
return self:ret(false, err)
end
return self:ret(true, "successfully loaded " .. tostring(i) .. " custom headers")
end
end
local ok, err = self.datastore:set("plugin_headers_custom_headers", data, nil, true)
if not ok then
return self:ret(false, err)
end
return self:ret(true, "successfully loaded " .. tostring(i) .. " custom headers")
end
function headers:header()

1
src/common/core/misc/files/default.html
View file

File diff suppressed because one or more lines are too long

96
src/common/core/order.json
View file

@ -1,60 +1,38 @@
{
"init": [
"sessions",
"whitelist",
"blacklist",
"greylist",
"bunkernet",
"limit"
],
"init_worker": [
"redis",
"bunkernet",
"dnsbl"
],
"set": [
"sessions",
"whitelist"
],
"access": [
"whitelist",
"letsencrypt",
"blacklist",
"greylist",
"country",
"dnsbl",
"bunkernet",
"reversescan",
"limit",
"misc",
"cors",
"antibot"
],
"headers": [
"headers",
"cors",
"reverseproxy",
"clientcache",
"antibot"
],
"log": [
"badbheavior",
"bunkernet"
],
"preread": [
"whitelist",
"blacklist",
"greylist",
"country",
"dnsbl",
"reversescan"
],
"log_stream": [
"badbehavior",
"bunkernet"
],
"log_default": [
"badbheavior",
"bunkernet"
]
}
"init": [
"sessions",
"whitelist",
"blacklist",
"greylist",
"bunkernet",
"limit"
],
"init_worker": ["redis", "bunkernet", "dnsbl"],
"set": ["sessions", "whitelist"],
"access": [
"whitelist",
"letsencrypt",
"blacklist",
"greylist",
"country",
"dnsbl",
"bunkernet",
"reversescan",
"limit",
"misc",
"cors",
"antibot"
],
"headers": ["headers", "cors", "reverseproxy", "clientcache", "antibot"],
"log": ["badbheavior", "bunkernet"],
"preread": [
"whitelist",
"blacklist",
"greylist",
"country",
"dnsbl",
"reversescan"
],
"log_stream": ["badbehavior", "bunkernet"],
"log_default": ["badbheavior", "bunkernet"]
}

3
src/common/core/reversescan/reversescan.lua
View file

@ -34,7 +34,8 @@ function reversescan:access()
break
-- Perform scan in a thread
elseif not cached then
local thread = ngx.thread.spawn(self.scan, self.ctx.bw.remote_addr, tonumber(port), tonumber(self.variables["REVERSE_SCAN_TIMEOUT"]))
local thread = ngx.thread.spawn(self.scan, self.ctx.bw.remote_addr, tonumber(port),
tonumber(self.variables["REVERSE_SCAN_TIMEOUT"]))
threads[port] = thread
end
end

2
src/common/db/Database.py
View file

@ -166,7 +166,7 @@ class Database:
bind=self.__sql_engine, autoflush=False, expire_on_commit=False
)
self.suffix_rx = re_compile(r"_\d+$")
if sqlalchemy_string.startswith("sqlite"):
with self.__db_session() as session:
session.execute(text("PRAGMA journal_mode=WAL"))