mgrotke/linuxrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI improvements and input validations

Browse source
This commit is contained in:
Matthew Grotke 2026-05-20 04:06:50 -04:00
parent b8c4914a52
commit 270856b391
22 changed files with 1548 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

16
docker/router-dash/app/action_apply_vlans.py
View file

@ -1,6 +1,6 @@
from flask import Blueprint, request, redirect, flash
from auth import require_level
from config_utils import load_core, save_core, verify_core_hash, apply_msg
from config_utils import load_core, save_core, verify_core_hash, queued_msg
import sanitize
import ipaddress as _ipaddress
@ -24,7 +24,7 @@ def _hash_ok():
def _derive_vlan_id(subnet, prefix):
"""Return VLAN ID (1–4094) derived from the active octet of the network address,
"""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)
@ -64,7 +64,7 @@ def add_vlan():
vlan_id = _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')
flash('Cannot derive a valid VLAN ID (1-4094) from this subnet/prefix combination.', 'error')
return redirect(VIEW)
if not _hash_ok():
@ -94,7 +94,7 @@ def add_vlan():
vlans.append(entry)
save_core(core)
flash(apply_msg(), 'success')
flash(queued_msg('core apply'), 'success')
return redirect(VIEW)
@ -142,14 +142,14 @@ def edit_vlan():
return redirect(VIEW)
existing = vlans[idx]
# is_vpn is never changed via edit — toggling it would invalidate peers/reservations.
# is_vpn is never changed via edit -- toggling it would invalidate peers/reservations.
is_vpn = existing.get('is_vpn', False)
# 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)
if vlan_id is None:
flash('Cannot derive a valid VLAN ID (1–4094) from this subnet/prefix combination.', 'error')
flash('Cannot derive a valid VLAN ID (1-4094) from this subnet/prefix combination.', 'error')
return redirect(VIEW)
current_id = existing.get('vlan_id')
@ -173,7 +173,7 @@ def edit_vlan():
})
save_core(core)
flash(apply_msg(), 'success')
flash(queued_msg('core apply'), 'success')
return redirect(VIEW)
@ -197,5 +197,5 @@ def delete_vlan():
removed = vlans.pop(idx)
save_core(core)
flash(apply_msg(), 'success')
flash(queued_msg('core apply'), 'success')
return redirect(VIEW)