Development

docker/router-dash/app/action_apply_vlans.py

@@ -2,7 +2,6 @@ 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 ipaddress as _ipaddress
 import validation as validate
 
 bp = Blueprint('action_apply_vlans', __name__)
@@ -24,21 +23,6 @@ def _hash_ok():
     return True
 
 
-def _derive_vlan_id(subnet, prefix):
-    """Return VLAN ID (1-4094) derived from the active octet of the network address,
-    or None if not derivable. byte_index = (prefix-1) // 8."""
-    try:
-        network  = _ipaddress.ip_network(f'{subnet}/{prefix}', strict=False)
-        octets   = list(network.network_address.packed)
-        byte_idx = (prefix - 1) // 8
-        vlan_id  = octets[byte_idx]
-        if 1 <= vlan_id <= 4094:
-            return vlan_id
-        return None
-    except Exception:
-        return None
-
-
 @bp.route('/action/add_vlan', methods=['POST'])
 @require_level('administrator')
 def add_vlan():
@@ -63,7 +47,7 @@ def add_vlan():
         flash('Invalid subnet prefix (must be 1-30).', 'error')
         return redirect(VIEW)
 
-    vlan_id = _derive_vlan_id(subnet, subnet_mask)
+    vlan_id = validate.derive_vlan_id(subnet, subnet_mask)
     if vlan_id is None:
         flash('Cannot derive a valid VLAN ID (1-4094) from this subnet/prefix combination.', 'error')
         return redirect(VIEW)
@@ -74,7 +58,7 @@ def add_vlan():
     core  = load_core()
     vlans = core.setdefault('vlans', [])
 
-    if any(v.get('vlan_id') == vlan_id for v in vlans):
+    if any(validate.derive_vlan_id(v.get('subnet', ''), v.get('subnet_mask', 24)) == vlan_id for v in vlans):
         flash(f'VLAN {vlan_id} (derived from subnet) already exists.', 'error')
         return redirect(VIEW)
 
@@ -83,7 +67,6 @@ def add_vlan():
         return redirect(VIEW)
 
     entry = {
-        'vlan_id':         vlan_id,
         'name':            name,
         'is_vpn':          is_vpn,
         'subnet':          subnet,
@@ -157,17 +140,20 @@ def edit_vlan():
     # Use submitted subnet_mask, or fall back to whatever is already stored.
     final_mask = subnet_mask if subnet_mask is not None else existing.get('subnet_mask', 24)
 
-    vlan_id = _derive_vlan_id(subnet, final_mask)
+    vlan_id = validate.derive_vlan_id(subnet, final_mask)
     if vlan_id is None:
         flash('Cannot derive a valid VLAN ID (1-4094) from this subnet/prefix combination.', 'error')
         return redirect(VIEW)
 
-    current_id = existing.get('vlan_id')
+    current_id = validate.derive_vlan_id(existing.get('subnet', ''), existing.get('subnet_mask', 24))
     if current_id == 1 and vlan_id != 1:
         flash('VLAN 1 is the physical interface; change its subnet so the derived ID remains 1.', 'error')
         return redirect(VIEW)
 
-    if vlan_id != current_id and any(i != idx and v.get('vlan_id') == vlan_id for i, v in enumerate(vlans)):
+    if vlan_id != current_id and any(
+        validate.derive_vlan_id(v.get('subnet', ''), v.get('subnet_mask', 24)) == vlan_id
+        for i, v in enumerate(vlans) if i != idx
+    ):
         flash(f'VLAN {vlan_id} (derived from subnet) already exists.', 'error')
         return redirect(VIEW)
 
@@ -176,7 +162,6 @@ def edit_vlan():
         return redirect(VIEW)
 
     existing.update({
-        'vlan_id':         vlan_id,
         'name':            name,
         'is_vpn':          is_vpn,
         'subnet':          subnet,