Development

docker/routlin-dash/app/action_apply_host_overrides.py

@@ -1,14 +1,15 @@
+import copy
 import ipaddress
 
 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_host_overrides', __name__)
 
-VIEW   = '/view/view_host_overrides'
+VIEW = '/view/view_host_overrides'
 
 
 def _vlan_networks(core):
@@ -18,14 +19,13 @@ def _vlan_networks(core):
         mask   = v.get('subnet_mask', '')
         if subnet and mask:
             try:
-                nets.append(ipaddress.IPv4Network(f"{subnet}/{mask}", strict=False))
+                nets.append(ipaddress.IPv4Network(f'{subnet}/{mask}', strict=False))
             except ValueError:
                 pass
     return nets
 
 
 def _ip_in_vlan(ip_str, core):
-    """Return True if ip_str falls within at least one configured VLAN subnet."""
     try:
         addr = ipaddress.IPv4Address(ip_str)
     except ValueError:
@@ -58,7 +58,6 @@ def add_host_override():
     if not host or not ip:
         flash('Hostname and IP address are required.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -67,20 +66,20 @@ def add_host_override():
         flash('IP address does not fall within any configured VLAN subnet.', 'error')
         return redirect(VIEW)
 
-    core.setdefault('host_overrides', []).append({
-        'description': description,
-        'host':        host,
-        'ip':          ip,
-        'enabled':     True,
-    })
+    entry = {'description': description, 'host': host, 'ip': ip, 'enabled': True}
+    core.setdefault('host_overrides', []).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='host_overrides', key=host, operation='add',
+        before=None, after=entry,
+        description=f'Added host override: {host} → {ip}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -91,7 +90,6 @@ def toggle_host_override():
     if idx is None:
         flash('Invalid request.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -101,15 +99,21 @@ def toggle_host_override():
         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='host_overrides', key=items[idx]['host'], operation='toggle',
+        before={'enabled': old_enabled}, after={'enabled': not old_enabled},
+        description=f'{action} host override: {items[idx]["host"]}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -129,11 +133,10 @@ def edit_host_override():
     if not host or not ip:
         flash('Hostname and IP address are required.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
-    core  = load_core()
+    core = load_core()
     if not _ip_in_vlan(ip, core):
         flash('IP address does not fall within any configured VLAN subnet.', 'error')
         return redirect(VIEW)
@@ -143,15 +146,20 @@ def edit_host_override():
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
+    before = copy.deepcopy(items[idx])
     items[idx].update({'description': description, 'host': host, '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='host_overrides', key=host, operation='edit',
+        before=before, after=copy.deepcopy(items[idx]),
+        description=f'Edited host override: {host} → {ip}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -162,7 +170,6 @@ def delete_host_override():
     if idx is None:
         flash('Invalid request.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -178,7 +185,11 @@ def delete_host_override():
         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='host_overrides', key=removed['host'], operation='delete',
+        before=removed, after=None,
+        description=f'Deleted host override: {removed["host"]}',
+    ), 'success')
     return redirect(VIEW)