Development

docker/routlin-dash/app/action_apply_banned_ips.py

@@ -1,12 +1,14 @@
+import copy
+
 from flask import Blueprint, request, redirect, flash
 from auth import require_level
-from config_utils import load_core, save_core, verify_core_hash, queued_msg
+from config_utils import load_core, save_core_with_snapshot, verify_core_hash
 import sanitize
 import validation as validate
 
 bp = Blueprint('action_apply_banned_ips', __name__)
 
-VIEW   = '/view/view_banned_ips'
+VIEW = '/view/view_banned_ips'
 
 
 def _row_index():
@@ -24,7 +26,6 @@ def _hash_ok():
 
 
 def _parse_ip():
-    """Return validated IP string, or None after flashing an error."""
     raw = request.form.get('ip', '').strip()
     if not raw:
         flash('The configuration has not been saved because an IP address, CIDR, or wildcard pattern is required.', 'error')
@@ -43,24 +44,24 @@ def add_banned_ip():
     ip          = _parse_ip()
     if ip is None:
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
-    core = load_core()
-    core.setdefault('banned_ips', []).append({
-        'description': description,
-        'ip':          ip,
-        'enabled':     True,
-    })
+    core  = load_core()
+    entry = {'description': description, 'ip': ip, 'enabled': True}
+    core.setdefault('banned_ips', []).append(entry)
     errors = validate.validate_config(core)
     if errors:
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_core(core)
 
-    flash(queued_msg('core apply'), 'success')
+    flash(save_core_with_snapshot(
+        core,
+        path='banned_ips', key=ip, operation='add',
+        before=None, after=entry,
+        description=f'Added banned IP: {ip}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -71,7 +72,6 @@ def toggle_banned_ip():
     if idx is None:
         flash('Invalid request.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -81,15 +81,21 @@ def toggle_banned_ip():
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
-    items[idx]['enabled'] = not items[idx].get('enabled', True)
+    old_enabled        = items[idx].get('enabled', True)
+    items[idx]['enabled'] = not old_enabled
     errors = validate.validate_config(core)
     if errors:
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_core(core)
 
-    flash(queued_msg('core apply'), 'success')
+    action = 'Enabled' if not old_enabled else 'Disabled'
+    flash(save_core_with_snapshot(
+        core,
+        path='banned_ips', key=items[idx]['ip'], operation='toggle',
+        before={'enabled': old_enabled}, after={'enabled': not old_enabled},
+        description=f'{action} banned IP: {items[idx]["ip"]}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -116,15 +122,20 @@ def edit_banned_ip():
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
+    before = copy.deepcopy(items[idx])
     items[idx].update({'description': description, 'ip': ip, 'enabled': enabled})
     errors = validate.validate_config(core)
     if errors:
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_core(core)
 
-    flash(queued_msg('core apply'), 'success')
+    flash(save_core_with_snapshot(
+        core,
+        path='banned_ips', key=ip, operation='edit',
+        before=before, after=copy.deepcopy(items[idx]),
+        description=f'Edited banned IP: {ip}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -135,7 +146,6 @@ def delete_banned_ip():
     if idx is None:
         flash('Invalid request.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -151,7 +161,11 @@ def delete_banned_ip():
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_core(core)
 
-    flash(queued_msg('core apply'), 'success')
+    flash(save_core_with_snapshot(
+        core,
+        path='banned_ips', key=removed['ip'], operation='delete',
+        before=removed, after=None,
+        description=f'Deleted banned IP: {removed["ip"]}',
+    ), 'success')
     return redirect(VIEW)