Development

docker/router-dash/app/action_apply_vlans.py

@@ -3,6 +3,7 @@ from auth import require_level
 from config_utils import load_core, save_core, verify_core_hash, queued_msg
 import sanitize
 import ipaddress as _ipaddress
+import validation as validate
 
 bp = Blueprint('action_apply_vlans', __name__)
 
@@ -77,6 +78,10 @@ def add_vlan():
         flash(f'VLAN {vlan_id} (derived from subnet) already exists.', 'error')
         return redirect(VIEW)
 
+    if radius_default and any(v.get('radius_default') for v in vlans):
+        flash('Only one VLAN can be the RADIUS default.', 'error')
+        return redirect(VIEW)
+
     entry = {
         'vlan_id':         vlan_id,
         'name':            name,
@@ -92,6 +97,11 @@ def add_vlan():
     else:
         entry['reservations'] = []
     vlans.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')
@@ -161,6 +171,10 @@ def edit_vlan():
         flash(f'VLAN {vlan_id} (derived from subnet) already exists.', 'error')
         return redirect(VIEW)
 
+    if radius_default and any(i != idx and v.get('radius_default') for i, v in enumerate(vlans)):
+        flash('Only one VLAN can be the RADIUS default.', 'error')
+        return redirect(VIEW)
+
     existing.update({
         'vlan_id':         vlan_id,
         'name':            name,
@@ -171,6 +185,11 @@ def edit_vlan():
         'mdns_reflection': mdns_reflection,
         'use_blocklists':  use_blocklists,
     })
+    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')
@@ -195,6 +214,11 @@ def delete_vlan():
         return redirect(VIEW)
 
     removed = vlans.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')