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

Fix UI bans page shenanigans when ban ips

Browse source
This commit is contained in:
Théophile Diot 2024-01-24 10:15:30 +01:00
parent 8194d0f989
commit 43cdf98d5a
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/ui/main.py
View file

@ -1683,6 +1683,7 @@ def bans():
data = json_loads(request.form["data"])
assert isinstance(data, list)
except BaseException:
app.logger.exception(f"Couldn't load data: {request.form['data']}")
flash("Data must be a list of dict", "error")
return redirect(url_for("bans"))
@ -1691,8 +1692,11 @@ def bans():
try:
unban = json_loads(unban.replace('"', '"').replace("'", '"'))
except BaseException:
flash(f"Invalid unban: {unban}, skipping it ...", "error")
app.logger.exception(f"Couldn't unban {unban['ip']}")
continue
if "ip" not in unban:
flash(f"Invalid unban: {unban}, skipping it ...", "error")
continue
resp = app.config["INSTANCES"].unban(unban["ip"])
if resp:
@ -1701,17 +1705,17 @@ def bans():
flash(f"Successfully unbanned {unban['ip']}")
elif request.form["operation"] == "ban":
for ban in data:
try:
ban = json_loads(ban.replace('"', '"').replace("'", '"'))
except BaseException:
if not isinstance(ban, dict) or "ip" not in ban:
flash(f"Invalid ban: {ban}, skipping it ...", "error")
continue
if "ip" not in ban:
continue
try:
ban_end = float(ban.get("ban_end", 86400))
except BaseException:
continue
resp = app.config["INSTANCES"].ban(ban["ip"], ban_end, ban.get("reason", "manual"))
ban_end = 86400.0
if "ban_end" in ban:
try:
ban_end = float(ban["ban_end"])
except ValueError:
continue
ban_end = (datetime.fromtimestamp(ban_end) - datetime.now()).total_seconds()
resp = app.config["INSTANCES"].ban(ban["ip"], ban_end, ban.get("reason", "ui"))
if resp:
flash(f"Couldn't ban {ban['ip']} on the following instances: {', '.join(resp)}", "error")
else: