Development

docker/router-dash/app/action_apply_dhcp_reservations.py

@@ -1,8 +1,10 @@
+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
 import sanitize
-import validate
+import validation as validate
 
 bp = Blueprint('action_apply_dhcp_reservations', __name__)
 
@@ -46,12 +48,30 @@ def _parse_ip():
     return ip
 
 
+def _check_ip_conflicts(ip, vlan):
+    """Return an error message if ip conflicts with pool range or server identities, else None."""
+    dhcp = vlan.get('dhcp_information', {})
+    pool_start = dhcp.get('dynamic_pool_start')
+    pool_end   = dhcp.get('dynamic_pool_end')
+    if pool_start and pool_end:
+        try:
+            if (ipaddress.IPv4Address(pool_start) <= ipaddress.IPv4Address(ip)
+                    <= ipaddress.IPv4Address(pool_end)):
+                return f'{ip} falls within the dynamic pool range ({pool_start}–{pool_end}).'
+        except Exception:
+            pass
+    identity_ips = {s['ip'] for s in vlan.get('server_identities', []) if s.get('ip')}
+    if ip in identity_ips:
+        return f'{ip} is already assigned as a server identity IP.'
+    return None
+
+
 @bp.route('/action/add_dhcp_reservation', methods=['POST'])
 @require_level('administrator')
 def add_dhcp_reservation():
     vlan_name     = sanitize.name(request.form.get('vlan_name', ''))
     description   = sanitize.text(request.form.get('description', ''))
-    hostname      = sanitize.domainname(request.form.get('hostname', ''))
+    hostname      = validate.domainname(request.form.get('hostname', ''))
     mac           = sanitize.mac(request.form.get('mac', ''))
     ip            = _parse_ip()
     radius_client = 'radius_client' in request.form
@@ -76,6 +96,11 @@ def add_dhcp_reservation():
         flash(f'The configuration has not been saved because VLAN "{vlan_name}" was not found.', 'error')
         return redirect(VIEW)
 
+    conflict = _check_ip_conflicts(ip, vlan)
+    if conflict:
+        flash(f'The configuration has not been saved because {conflict}', 'error')
+        return redirect(VIEW)
+
     vlan.setdefault('reservations', []).append({
         'description':   description,
         'hostname':      hostname,
@@ -84,6 +109,11 @@ def add_dhcp_reservation():
         'radius_client': radius_client,
         'enabled':       True,
     })
+    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')
@@ -110,6 +140,11 @@ def toggle_dhcp_reservation():
 
     res = vlans[vi]['reservations'][ri]
     res['enabled'] = not res.get('enabled', True)
+    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')
@@ -125,7 +160,7 @@ def edit_dhcp_reservation():
         return redirect(VIEW)
 
     description   = sanitize.text(request.form.get('description', ''))
-    hostname      = sanitize.domainname(request.form.get('hostname', ''))
+    hostname      = validate.domainname(request.form.get('hostname', ''))
     mac           = sanitize.mac(request.form.get('mac', ''))
     ip            = _parse_ip()
     radius_client = 'radius_client' in request.form
@@ -146,6 +181,11 @@ def edit_dhcp_reservation():
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
+    conflict = _check_ip_conflicts(ip, vlans[vi])
+    if conflict:
+        flash(f'The configuration has not been saved because {conflict}', 'error')
+        return redirect(VIEW)
+
     res = vlans[vi]['reservations'][ri]
     res.update({
         'description':   description,
@@ -155,6 +195,11 @@ def edit_dhcp_reservation():
         'radius_client': radius_client,
         'enabled':       'enabled' in request.form,
     })
+    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')
@@ -180,6 +225,11 @@ def delete_dhcp_reservation():
         return redirect(VIEW)
 
     removed = vlans[vi]['reservations'].pop(ri)
+    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')