From 74d77224f71ddbf8bbcdea35d29465da3606d128 Mon Sep 17 00:00:00 2001 From: forest Date: Fri, 9 Jul 2021 14:35:23 -0500 Subject: [PATCH] finishing touches and fixes on managed IPs database migration 16 --- capsulflask/auth.py | 4 ++-- capsulflask/schema_migrations/16_up_managed_ips.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/capsulflask/auth.py b/capsulflask/auth.py index 7bcdb1a..f3731a2 100644 --- a/capsulflask/auth.py +++ b/capsulflask/auth.py @@ -38,10 +38,10 @@ def admin_account_required(view): @functools.wraps(view) def wrapped_view(**kwargs): if session.get("account") is None or session.get("csrf-token") is None: - return redirect(url_for("auth.login")) + return abort(404) if session.get("account") not in current_app.config["ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES"].split(","): - return redirect(url_for("auth.login")) + return abort(404) return view(**kwargs) diff --git a/capsulflask/schema_migrations/16_up_managed_ips.sql b/capsulflask/schema_migrations/16_up_managed_ips.sql index 968ce16..f8eb80c 100644 --- a/capsulflask/schema_migrations/16_up_managed_ips.sql +++ b/capsulflask/schema_migrations/16_up_managed_ips.sql @@ -13,8 +13,8 @@ ALTER TABLE vms RENAME COLUMN last_seen_ipv4 TO public_ipv4; ALTER TABLE vms RENAME COLUMN last_seen_ipv6 TO public_ipv6; ALTER TABLE vms ADD COLUMN network_name TEXT; -UPDATE vms SET network_name = 'virbr1' WHERE public_ipv6 < '69.61.2.192'; -UPDATE vms SET network_name = 'virbr2' WHERE public_ipv6 >= '69.61.2.192'; +UPDATE vms SET network_name = 'virbr1' WHERE public_ipv4 < '69.61.2.192' OR public_ipv4 is NULL; +UPDATE vms SET network_name = 'virbr2' WHERE public_ipv4 >= '69.61.2.192'; ALTER TABLE vms ALTER COLUMN network_name SET NOT NULL;