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

Development

Browse source
This commit is contained in:
Matthew Grotke 2026-05-27 03:00:52 -04:00
parent a59d96942e
commit 29b06b250c
3 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
docker/routlin-dash/app/action_networklayout.py
View file

@ -199,6 +199,17 @@ def networklayout_tablevlans_edit():
entry.pop('hostname', None)
new_identities.append(entry)
gateway_override = 'gateway_override' in request.form
gateway_raw = sanitize.ip(request.form.get('gateway', ''))
if gateway_override:
if not gateway_raw:
flash('Gateway IP is required when override is enabled.', 'error')
return redirect(VIEW)
if gateway_raw not in identity_ips:
flash(f"Gateway '{gateway_raw}' must match one of the server identity IPs.", 'error')
return redirect(VIEW)
_existing_gateway = existing.get('dhcp_information', {}).get('explicit_overrides', {}).get('gateway', '')
_ids_unchanged = (
len(new_identities) == len(old_identities) and
all(
@ -215,7 +226,8 @@ def networklayout_tablevlans_edit():
and radius_default == bool(existing.get('radius_default', False))
and mdns_reflection == bool(existing.get('mdns_reflection', False))
and sorted(use_blocklists) == sorted(existing.get('use_blocklists', []))
and _ids_unchanged):
and _ids_unchanged
and (gateway_raw if gateway_override else '') == _existing_gateway):
flash('No changes were made.', 'info')
return redirect(VIEW)
@ -231,6 +243,11 @@ def networklayout_tablevlans_edit():
'use_blocklists': use_blocklists,
'server_identities': new_identities,
})
dhcp_overrides = existing.setdefault('dhcp_information', {}).setdefault('explicit_overrides', {})
if gateway_override:
dhcp_overrides['gateway'] = gateway_raw
else:
dhcp_overrides.pop('gateway', None)
errors = validate.validate_config(cfg)
if errors:
for msg in errors:

3
docker/routlin-dash/app/view_page.py
View file

@ -322,6 +322,9 @@ def _config_datasource(name):
row['server_identity_hostnames'] = json.dumps([
s.get('hostname', '') for s in v.get('server_identities', []) if s.get('ip')
])
row['server_identity_gateway'] = (
v.get('dhcp_information', {}).get('explicit_overrides', {}).get('gateway', '')
)
rows.append(row)
return rows

3
docker/routlin-dash/data/page_content.json
View file

@ -1585,7 +1585,8 @@
"pair_label": "Description (Opt)",
"pair_col2": "server_identity_hostnames",
"pair_label2": "Hostname (Opt)",
"pair_validate2": "networkname"
"pair_validate2": "networkname",
"gateway_col": "server_identity_gateway"
},
{
"col": "radius_default",