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 22:04:04 -04:00
parent eed1d295dc
commit d9f3bd8289
45 changed files with 635 additions and 666 deletions
Download patch file Download diff file Expand all files Collapse all files

61
docker/routlin-dash/app/pages/portforwarding/action.py
View file

@ -1,3 +1,4 @@
from pathlib import Path
import copy
from flask import Blueprint, request, redirect, flash
@ -6,9 +7,9 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h
import sanitize
import validation as validate
bp = Blueprint('portforwarding', __name__)
_PAGE = Path(__file__).parent.name
VIEW = '/view/view_portforwarding'
bp = Blueprint(_PAGE, __name__)
_VALID_PROTOS_STR = ', '.join(sorted(validate.VALID_PROTOCOLS))
@ -73,14 +74,14 @@ def _parse_entry():
}, None
@bp.route('/action/add_port_forward', methods=['POST'])
@bp.route('/action/portforwarding/addrule_add', methods=['POST'])
@require_level('administrator')
def add_port_forward():
def addrule_add():
entry, err = _parse_entry()
if err:
return redirect(VIEW)
return redirect(f'/{_PAGE}')
if not _hash_ok():
return redirect(VIEW)
return redirect(f'/{_PAGE}')
cfg = load_config()
cfg.setdefault('port_forwarding', []).append(entry)
@ -88,7 +89,7 @@ def add_port_forward():
if errors:
for msg in errors:
flash(msg, 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
key = f'{entry["protocol"]}:{entry["dest_port"]}'
flash(save_config_with_snapshot(
@ -97,24 +98,24 @@ def add_port_forward():
before=None, after=entry,
description=f'Added port forward: {key} → {entry["nat_ip"]}:{entry["nat_port"]}',
), 'success')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
@bp.route('/action/toggle_port_forward', methods=['POST'])
@bp.route('/action/portforwarding/rules_toggle', methods=['POST'])
@require_level('administrator')
def toggle_port_forward():
def rules_toggle():
idx = _row_index()
if idx is None:
flash('Invalid request.', 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
if not _hash_ok():
return redirect(VIEW)
return redirect(f'/{_PAGE}')
cfg = load_config()
items = cfg.get('port_forwarding', [])
if idx < 0 or idx >= len(items):
flash('Entry not found.', 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
old_enabled = items[idx].get('enabled', True)
items[idx]['enabled'] = not old_enabled
@ -122,7 +123,7 @@ def toggle_port_forward():
if errors:
for msg in errors:
flash(msg, 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
key = f'{items[idx]["protocol"]}:{items[idx]["dest_port"]}'
action = 'Enabled' if not old_enabled else 'Disabled'
@ -132,28 +133,28 @@ def toggle_port_forward():
before={'enabled': old_enabled}, after={'enabled': not old_enabled},
description=f'{action} port forward: {key}',
), 'success')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
@bp.route('/action/edit_port_forward', methods=['POST'])
@bp.route('/action/portforwarding/rules_edit', methods=['POST'])
@require_level('administrator')
def edit_port_forward():
def rules_edit():
idx = _row_index()
if idx is None:
flash('Invalid request.', 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
entry, err = _parse_entry()
if err:
return redirect(VIEW)
return redirect(f'/{_PAGE}')
if not _hash_ok():
return redirect(VIEW)
return redirect(f'/{_PAGE}')
cfg = load_config()
items = cfg.get('port_forwarding', [])
if idx < 0 or idx >= len(items):
flash('Entry not found.', 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
before = copy.deepcopy(items[idx])
items[idx] = entry
@ -162,7 +163,7 @@ def edit_port_forward():
if errors:
for msg in errors:
flash(msg, 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
key = f'{entry["protocol"]}:{entry["dest_port"]}'
flash(save_config_with_snapshot(
@ -171,31 +172,31 @@ def edit_port_forward():
before=before, after=copy.deepcopy(items[idx]),
description=f'Edited port forward: {key} → {entry["nat_ip"]}:{entry["nat_port"]}',
), 'success')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
@bp.route('/action/delete_port_forward', methods=['POST'])
@bp.route('/action/portforwarding/rules_delete', methods=['POST'])
@require_level('administrator')
def delete_port_forward():
def rules_delete():
idx = _row_index()
if idx is None:
flash('Invalid request.', 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
if not _hash_ok():
return redirect(VIEW)
return redirect(f'/{_PAGE}')
cfg = load_config()
items = cfg.get('port_forwarding', [])
if idx < 0 or idx >= len(items):
flash('Entry not found.', 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
removed = items.pop(idx)
errors = validate.validate_config(cfg)
if errors:
for msg in errors:
flash(msg, 'error')
return redirect(VIEW)
return redirect(f'/{_PAGE}')
key = f'{removed["protocol"]}:{removed["dest_port"]}'
flash(save_config_with_snapshot(
@ -204,4 +205,4 @@ def delete_port_forward():
before=removed, after=None,
description=f'Deleted port forward: {key}',
), 'success')
return redirect(VIEW)
return redirect(f'/{_PAGE}')

9
docker/routlin-dash/app/pages/portforwarding/content.json
View file

@ -1,5 +1,4 @@
{
"id": "view_portforwarding",
"client_requirement": "client_is_viewer+",
"items": [
{
@ -53,7 +52,7 @@
"row_actions": [
{
"client_requirement": "client_is_administrator+",
"action": "/action/edit_port_forward",
"action": "/action/portforwarding/rules_edit",
"method": "inline_edit",
"text": "Edit",
"class": "btn-ghost btn-sm",
@ -88,7 +87,7 @@
},
{
"client_requirement": "client_is_administrator+",
"action": "/action/delete_port_forward",
"action": "/action/portforwarding/rules_delete",
"method": "post",
"text": "Delete",
"class": "btn-danger btn-sm"
@ -103,7 +102,7 @@
"items": [
{
"type": "form",
"action": "/action/add_port_forward",
"action": "/action/portforwarding/addrule_add",
"method": "post",
"items": [
{
@ -149,7 +148,7 @@
"items": [
{
"type": "button_primary",
"action": "/action/add_port_forward",
"action": "/action/portforwarding/addrule_add",
"method": "post",
"text": "Add Rule"
},