diff --git a/docker/routlin-dash/app/action_upstreamdns.py b/docker/routlin-dash/app/action_dnsserver.py similarity index 90% rename from docker/routlin-dash/app/action_upstreamdns.py rename to docker/routlin-dash/app/action_dnsserver.py index 09674c8..76261c7 100644 --- a/docker/routlin-dash/app/action_upstreamdns.py +++ b/docker/routlin-dash/app/action_dnsserver.py @@ -5,14 +5,14 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h import sanitize import validation as validate -bp = Blueprint('action_upstreamdns', __name__) +bp = Blueprint('action_dnsserver', __name__) -_VIEW = '/view/view_upstream_dns' +_VIEW = '/view/view_dns_server' -@bp.route('/action/upstreamdns_cardupstreamdns_save', methods=['POST']) +@bp.route('/action/dnsserver_cardupstreamdns_save', methods=['POST']) @require_level('administrator') -def upstreamdns_cardupstreamdns_save(): +def dnsserver_cardupstreamdns_save(): strict_order = 'strict_order' in request.form submitted = request.form.getlist('upstream_servers') @@ -59,9 +59,9 @@ def upstreamdns_cardupstreamdns_save(): return redirect(_VIEW) -@bp.route('/action/upstreamdns_cardforwardingdnsservice_save', methods=['POST']) +@bp.route('/action/dnsserver_carddnsforwarding_save', methods=['POST']) @require_level('administrator') -def upstreamdns_cardforwardingdnsservice_save(): +def dnsserver_carddnsforwarding_save(): cache_size = validate.int_range(request.form.get('cache_size', '').strip(), 0, None) if cache_size is None: flash('Cache Size must be a non-negative integer.', 'error') diff --git a/docker/routlin-dash/app/action_apply_vlans.py b/docker/routlin-dash/app/action_networklayout.py similarity index 94% rename from docker/routlin-dash/app/action_apply_vlans.py rename to docker/routlin-dash/app/action_networklayout.py index 46c5674..82499d7 100644 --- a/docker/routlin-dash/app/action_apply_vlans.py +++ b/docker/routlin-dash/app/action_networklayout.py @@ -6,9 +6,9 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h import sanitize import validation as validate -bp = Blueprint('action_apply_vlans', __name__) +bp = Blueprint('action_networklayout', __name__) -VIEW = '/view/view_vlans' +VIEW = '/view/view_network_layout' _VLAN_FIELDS = ['name', 'is_vpn', 'subnet', 'subnet_mask', 'dnsmasq_log_queries', 'radius_default', 'mdns_reflection', 'use_blocklists'] @@ -28,9 +28,9 @@ def _hash_ok(): return True -@bp.route('/action/add_vlan', methods=['POST']) +@bp.route('/action/networklayout_cardaddvlan_addvlan', methods=['POST']) @require_level('administrator') -def add_vlan(): +def networklayout_cardaddvlan_addvlan(): name = sanitize.name(request.form.get('name', '')) is_vpn = 'is_vpn' in request.form subnet = sanitize.ip(request.form.get('subnet', '')) @@ -101,9 +101,9 @@ def add_vlan(): return redirect(VIEW) -@bp.route('/action/edit_vlan', methods=['POST']) +@bp.route('/action/networklayout_tablevlans_edit', methods=['POST']) @require_level('administrator') -def edit_vlan(): +def networklayout_tablevlans_edit(): idx = _row_index() if idx is None: flash('Invalid request.', 'error') @@ -194,9 +194,9 @@ def edit_vlan(): return redirect(VIEW) -@bp.route('/action/delete_vlan', methods=['POST']) +@bp.route('/action/networklayout_tablevlans_delete', methods=['POST']) @require_level('administrator') -def delete_vlan(): +def networklayout_tablevlans_delete(): idx = _row_index() if idx is None: flash('Invalid request.', 'error') diff --git a/docker/routlin-dash/app/action_networkinterfaces.py b/docker/routlin-dash/app/action_physicalinterfaces.py similarity index 91% rename from docker/routlin-dash/app/action_networkinterfaces.py rename to docker/routlin-dash/app/action_physicalinterfaces.py index 6067337..af9b379 100644 --- a/docker/routlin-dash/app/action_networkinterfaces.py +++ b/docker/routlin-dash/app/action_physicalinterfaces.py @@ -7,9 +7,9 @@ from config_utils import load_config, save_config_with_snapshot, verify_config_h import sanitize import validation as validate -bp = Blueprint('action_networkinterfaces', __name__) +bp = Blueprint('action_physicalinterfaces', __name__) -_VIEW = '/view/view_network_interfaces' +_VIEW = '/view/view_physical_interfaces' _EXCLUDE_PREFIXES = ('lo', 'wg', 'docker', 'br-', 'veth', 'tun', 'tap', 'ppp', 'virbr', @@ -31,9 +31,9 @@ def _valid_interface(name): return name in _get_system_interfaces() -@bp.route('/action/networkinterfaces_cardnetworkinterface_save', methods=['POST']) +@bp.route('/action/physicalinterfaces_cardphysicalinterface_save', methods=['POST']) @require_level('administrator') -def networkinterfaces_cardnetworkinterface_save(): +def physicalinterfaces_cardphysicalinterface_save(): wan = sanitize.interface_name(request.form.get('wan_interface', '')) lan = sanitize.interface_name(request.form.get('lan_interface', '')) @@ -74,9 +74,9 @@ def networkinterfaces_cardnetworkinterface_save(): return redirect(_VIEW) -@bp.route('/action/networkinterfaces_cardinterfaceconfiguration_apply', methods=['POST']) +@bp.route('/action/physicalinterfaces_cardinterfaceconfiguration_apply', methods=['POST']) @require_level('administrator') -def networkinterfaces_cardinterfaceconfiguration_apply(): +def physicalinterfaces_cardinterfaceconfiguration_apply(): if not verify_config_hash(request.form.get('config_hash', '')): flash('Configuration was modified by another session. Please refresh and try again.', 'error') return redirect(_VIEW) diff --git a/docker/routlin-dash/app/main.py b/docker/routlin-dash/app/main.py index f9bb026..592a751 100644 --- a/docker/routlin-dash/app/main.py +++ b/docker/routlin-dash/app/main.py @@ -2,14 +2,14 @@ import os, json, sys from flask import Flask from view_page import bp as view_page_bp from action_actions import bp as action_actions_bp -from action_networkinterfaces import bp as action_networkinterfaces_bp -from action_upstreamdns import bp as action_upstreamdns_bp +from action_physicalinterfaces import bp as action_physicalinterfaces_bp +from action_dnsserver import bp as action_dnsserver_bp from action_apply_mdns import bp as action_apply_mdns_bp from action_apply_vpn import bp as action_apply_vpn_bp from action_apply_banned_ips import bp as action_apply_banned_ips_bp from action_apply_host_overrides import bp as action_apply_host_overrides_bp from action_dnsblocking import bp as action_dnsblocking_bp -from action_apply_vlans import bp as action_apply_vlans_bp +from action_networklayout import bp as action_networklayout_bp from action_apply_inter_vlan import bp as action_apply_inter_vlan_bp from action_apply_port_forwarding import bp as action_apply_port_forwarding_bp from action_apply_dhcp_reservations import bp as action_apply_dhcp_reservations_bp @@ -28,14 +28,14 @@ app = Flask(__name__) app.secret_key = os.environ.get('SECRET_KEY', os.urandom(24)) app.register_blueprint(view_page_bp) app.register_blueprint(action_actions_bp) -app.register_blueprint(action_networkinterfaces_bp) -app.register_blueprint(action_upstreamdns_bp) +app.register_blueprint(action_physicalinterfaces_bp) +app.register_blueprint(action_dnsserver_bp) app.register_blueprint(action_apply_mdns_bp) app.register_blueprint(action_apply_vpn_bp) app.register_blueprint(action_apply_banned_ips_bp) app.register_blueprint(action_apply_host_overrides_bp) app.register_blueprint(action_dnsblocking_bp) -app.register_blueprint(action_apply_vlans_bp) +app.register_blueprint(action_networklayout_bp) app.register_blueprint(action_apply_inter_vlan_bp) app.register_blueprint(action_apply_port_forwarding_bp) app.register_blueprint(action_apply_dhcp_reservations_bp) diff --git a/docker/routlin-dash/data/navbar_content.json b/docker/routlin-dash/data/navbar_content.json index e098d03..f4db5f5 100644 --- a/docker/routlin-dash/data/navbar_content.json +++ b/docker/routlin-dash/data/navbar_content.json @@ -11,14 +11,14 @@ "label": "%MENU_LABEL%", "client_requirement": "client_is_viewer+", "items": [ - { "type": "nav_item", "label": "Network Interfaces", "map_to": "view_network_interfaces", "client_requirement": "client_is_administrator+" }, - { "type": "nav_item", "label": "DNS", "map_to": "view_upstream_dns", "client_requirement": "client_is_administrator+" }, + { "type": "nav_item", "label": "Physical Interfaces", "map_to": "view_physical_interfaces", "client_requirement": "client_is_administrator+" }, + { "type": "nav_item", "label": "DNS Server", "map_to": "view_dns_server", "client_requirement": "client_is_administrator+" }, { "type": "nav_item", "label": "DNS Blocking", "map_to": "view_dns_blocking", "client_requirement": "client_is_administrator+" }, - { "type": "nav_item", "label": "DDNS", "map_to": "view_ddns" }, - { "type": "nav_item", "label": "VLANs", "map_to": "view_vlans", "client_requirement": "client_is_administrator+" }, + { "type": "nav_item", "label": "Network Layout", "map_to": "view_network_layout", "client_requirement": "client_is_administrator+" }, { "type": "nav_item", "label": "Inter-VLAN Exceptions", "map_to": "view_inter_vlan", "client_requirement": "client_is_administrator+" }, { "type": "nav_item", "label": "Port Forwarding", "map_to": "view_port_forwarding", "client_requirement": "client_is_administrator+" }, { "type": "nav_item", "label": "DHCP", "map_to": "view_dhcp" }, + { "type": "nav_item", "label": "DDNS", "map_to": "view_ddns" }, { "type": "nav_item", "label": "Host Overrides", "map_to": "view_host_overrides", "client_requirement": "client_is_administrator+" }, { "type": "nav_item", "label": "VPN", "map_to": "view_vpn" }, { "type": "nav_item", "label": "Banned IPs", "map_to": "view_banned_ips", "client_requirement": "client_is_administrator+" } diff --git a/docker/routlin-dash/data/page_content.json b/docker/routlin-dash/data/page_content.json index 062377c..50496ef 100644 --- a/docker/routlin-dash/data/page_content.json +++ b/docker/routlin-dash/data/page_content.json @@ -697,7 +697,7 @@ ] }, { - "id": "view_network_interfaces", + "id": "view_physical_interfaces", "client_requirement": "client_is_administrator+", "items": [ { @@ -705,7 +705,7 @@ "items": [ { "type": "h1", - "text": "Network Interfaces" + "text": "Physical Interfaces" }, { "type": "p", @@ -715,12 +715,12 @@ }, { "type": "card", - "label": "Network Interfaces", + "label": "Physical Interfaces", "client_requirement": "client_is_administrator+", "items": [ { "type": "form", - "action": "/action/networkinterfaces_cardnetworkinterface_save", + "action": "/action/physicalinterfaces_cardphysicalinterface_save", "method": "post", "items": [ { @@ -744,7 +744,7 @@ "items": [ { "type": "button_primary", - "action": "/action/networkinterfaces_cardnetworkinterface_save", + "action": "/action/physicalinterfaces_cardphysicalinterface_save", "method": "post", "text": "Save" }, @@ -767,7 +767,7 @@ "items": [ { "type": "form", - "action": "/action/networkinterfaces_cardinterfaceconfiguration_apply", + "action": "/action/physicalinterfaces_cardinterfaceconfiguration_apply", "method": "post", "items": [ { @@ -840,7 +840,7 @@ "items": [ { "type": "button_primary", - "action": "/action/networkinterfaces_cardinterfaceconfiguration_apply", + "action": "/action/physicalinterfaces_cardinterfaceconfiguration_apply", "method": "post", "text": "Apply" }, @@ -863,7 +863,7 @@ ] }, { - "id": "view_upstream_dns", + "id": "view_dns_server", "client_requirement": "client_is_administrator+", "items": [ { @@ -871,7 +871,7 @@ "items": [ { "type": "h1", - "text": "DNS" + "text": "DNS Server" }, { "type": "p", @@ -886,7 +886,7 @@ "items": [ { "type": "form", - "action": "/action/upstreamdns_cardupstreamdns_save", + "action": "/action/dnsserver_cardupstreamdns_save", "method": "post", "items": [ { @@ -912,7 +912,7 @@ "items": [ { "type": "button_primary", - "action": "/action/upstreamdns_cardupstreamdns_save", + "action": "/action/dnsserver_cardupstreamdns_save", "method": "post", "text": "Save" }, @@ -928,12 +928,12 @@ }, { "type": "card", - "label": "Forwarding DNS Service", + "label": "DNS Forwarding", "client_requirement": "client_is_administrator+", "items": [ { "type": "form", - "action": "/action/upstreamdns_cardforwardingdnsservice_save", + "action": "/action/dnsserver_carddnsforwarding_save", "method": "post", "items": [ { @@ -950,7 +950,7 @@ "items": [ { "type": "button_primary", - "action": "/action/upstreamdns_cardforwardingdnsservice_save", + "action": "/action/dnsserver_carddnsforwarding_save", "method": "post", "text": "Save" }, @@ -1470,7 +1470,7 @@ ] }, { - "id": "view_vlans", + "id": "view_network_layout", "client_requirement": "client_is_viewer+", "items": [ { @@ -1478,7 +1478,7 @@ "items": [ { "type": "h1", - "text": "VLANs" + "text": "Network Layout" }, { "type": "p", @@ -1549,7 +1549,7 @@ "row_actions": [ { "client_requirement": "client_is_administrator+", - "action": "/action/edit_vlan", + "action": "/action/networklayout_tablevlans_edit", "method": "inline_edit", "text": "Edit", "class": "btn-ghost btn-sm", @@ -1593,7 +1593,7 @@ }, { "client_requirement": "client_is_administrator+", - "action": "/action/delete_vlan", + "action": "/action/networklayout_tablevlans_delete", "method": "post", "text": "Delete", "class": "btn-danger btn-sm", @@ -1612,7 +1612,7 @@ "items": [ { "type": "form", - "action": "/action/add_vlan", + "action": "/action/networklayout_cardaddvlan_addvlan", "method": "post", "items": [ { @@ -1708,7 +1708,7 @@ "items": [ { "type": "button_primary", - "action": "/action/add_vlan", + "action": "/action/networklayout_cardaddvlan_addvlan", "method": "post", "text": "Add VLAN", "class": "add-vlan-btn", diff --git a/routlin/config.json b/routlin/config.json index f6abad6..e0ed06d 100644 --- a/routlin/config.json +++ b/routlin/config.json @@ -793,4 +793,4 @@ } ] } -} \ No newline at end of file +}