Development

docker/routlin-dash/app/action_apply_inter_vlan.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_inter_vlan', __name__)
 
-VIEW   = '/view/view_inter_vlan'
+VIEW = '/view/view_inter_vlan'
 
 _VALID_PROTOS_STR = ', '.join(sorted(validate.VALID_PROTOCOLS))
 
@@ -26,7 +28,6 @@ def _hash_ok():
 
 
 def _parse_entry():
-    """Parse and validate form fields. Returns (entry_dict, None) or (None, already_flashed)."""
     description  = sanitize.text(request.form.get('description', ''))
     protocol     = sanitize.filtervalue(request.form.get('protocol', ''), validate.VALID_PROTOCOLS)
     src_raw      = request.form.get('src_ip_or_subnet', '').strip()
@@ -71,13 +72,17 @@ def _parse_entry():
     }, None
 
 
+def _entry_key(entry):
+    port = f':{entry["dst_port"]}' if entry.get('dst_port') else ''
+    return f'{entry["protocol"]}:{entry["src_ip_or_subnet"]}→{entry["dst_ip_or_subnet"]}{port}'
+
+
 @bp.route('/action/add_inter_vlan', methods=['POST'])
 @require_level('administrator')
 def add_inter_vlan():
     entry, err = _parse_entry()
     if err:
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -88,9 +93,14 @@ def add_inter_vlan():
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_core(core)
 
-    flash(queued_msg('core apply'), 'success')
+    key = _entry_key(entry)
+    flash(save_core_with_snapshot(
+        core,
+        path='inter_vlan_exceptions', key=key, operation='add',
+        before=None, after=entry,
+        description=f'Added inter-VLAN rule: {key}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -101,7 +111,6 @@ def toggle_inter_vlan():
     if idx is None:
         flash('Invalid request.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -111,15 +120,22 @@ def toggle_inter_vlan():
         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')
+    key    = _entry_key(items[idx])
+    action = 'Enabled' if not old_enabled else 'Disabled'
+    flash(save_core_with_snapshot(
+        core,
+        path='inter_vlan_exceptions', key=key, operation='toggle',
+        before={'enabled': old_enabled}, after={'enabled': not old_enabled},
+        description=f'{action} inter-VLAN rule: {key}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -134,7 +150,6 @@ def edit_inter_vlan():
     entry, err = _parse_entry()
     if err:
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -144,16 +159,22 @@ def edit_inter_vlan():
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
-    items[idx] = entry
+    before        = copy.deepcopy(items[idx])
+    items[idx]    = entry
     items[idx]['enabled'] = request.form.get('enabled') == 'on'
     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')
+    key = _entry_key(entry)
+    flash(save_core_with_snapshot(
+        core,
+        path='inter_vlan_exceptions', key=key, operation='edit',
+        before=before, after=copy.deepcopy(items[idx]),
+        description=f'Edited inter-VLAN rule: {key}',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -164,7 +185,6 @@ def delete_inter_vlan():
     if idx is None:
         flash('Invalid request.', 'error')
         return redirect(VIEW)
-
     if not _hash_ok():
         return redirect(VIEW)
 
@@ -174,13 +194,18 @@ def delete_inter_vlan():
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
-    items.pop(idx)
+    removed = items.pop(idx)
     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')
+    key = _entry_key(removed)
+    flash(save_core_with_snapshot(
+        core,
+        path='inter_vlan_exceptions', key=key, operation='delete',
+        before=removed, after=None,
+        description=f'Deleted inter-VLAN rule: {key}',
+    ), 'success')
     return redirect(VIEW)