Development

docker/routlin-dash/app/pages/radius/action.py

@@ -1,7 +1,8 @@
+import copy
 from pathlib import Path
-from flask import Blueprint, redirect, flash
+from flask import Blueprint, request, redirect, flash
 from auth import require_level
-from config_utils import CONFIGS_DIR
+from config_utils import CONFIGS_DIR, load_config, record_group, diff_fields
 
 _PAGE = Path(__file__).parent.name
 
@@ -9,6 +10,11 @@ bp = Blueprint(_PAGE, __name__)
 
 RADIUS_SECRET_FILE = Path(CONFIGS_DIR) / '.radius-secret'
 
+_VALID_MAC_FORMATS = {
+    'aabbccddeeff', 'aa-bb-cc-dd-ee-ff', 'aa:bb:cc:dd:ee:ff',
+    'AABBCCDDEEFF', 'AA-BB-CC-DD-EE-FF', 'AA:BB:CC:DD:EE:FF',
+}
+
 
 @bp.route('/action/radius/regenerate', methods=['POST'])
 @require_level('administrator')
@@ -20,3 +26,27 @@ def regenerate():
         return redirect(f'/{_PAGE}')
     flash('Secret deleted. A new secret will be generated when the pending command is applied.', 'success')
     return redirect(f'/{_PAGE}')
+
+
+@bp.route('/action/radius/options_save', methods=['POST'])
+@require_level('administrator')
+def options_save():
+    mac_format = request.form.get('mac_format', 'aabbccddeeff')
+    apply_to   = request.form.get('apply_to', 'all')
+    logging    = 'logging' in request.form
+
+    if mac_format not in _VALID_MAC_FORMATS:
+        flash('Invalid MAC format.', 'error')
+        return redirect(f'/{_PAGE}')
+    if apply_to not in ('all', 'wireless'):
+        flash('Invalid apply_to value.', 'error')
+        return redirect(f'/{_PAGE}')
+
+    cfg    = load_config()
+    before = copy.deepcopy(cfg.get('radius_options', {}))
+    after  = {'mac_format': mac_format, 'apply_to': apply_to, 'logging': logging}
+    cfg['radius_options'] = after
+
+    changes = diff_fields(before, after)
+    flash(record_group(cfg, 'radius_options', 'setting', 'radius_options', changes, 'core apply'), 'success')
+    return redirect(f'/{_PAGE}')

docker/routlin-dash/app/pages/radius/content.json

@@ -43,6 +43,68 @@
           ]
         }
       ]
+    },
+    {
+      "type": "card",
+      "label": "Options",
+      "client_requirement": "client_is_administrator+",
+      "items": [
+        {
+          "type": "form",
+          "action": "/action/radius/options_save",
+          "method": "post",
+          "items": [
+            {
+              "type": "field",
+              "label": "MAC Address Format",
+              "name": "mac_format",
+              "input_type": "select",
+              "value": "%RADIUS_MAC_FORMAT%",
+              "options": [
+                {"value": "aabbccddeeff",      "label": "aabbccddeeff"},
+                {"value": "aa-bb-cc-dd-ee-ff", "label": "aa-bb-cc-dd-ee-ff"},
+                {"value": "aa:bb:cc:dd:ee:ff", "label": "aa:bb:cc:dd:ee:ff"},
+                {"value": "AABBCCDDEEFF",      "label": "AABBCCDDEEFF"},
+                {"value": "AA-BB-CC-DD-EE-FF", "label": "AA-BB-CC-DD-EE-FF"},
+                {"value": "AA:BB:CC:DD:EE:FF", "label": "AA:BB:CC:DD:EE:FF"}
+              ],
+              "hint": "Format used in the FreeRADIUS users file. Must match your AP/controller's expected format."
+            },
+            {
+              "type": "field",
+              "label": "Apply DEFAULT Rule To",
+              "name": "apply_to",
+              "input_type": "select",
+              "value": "%RADIUS_APPLY_TO%",
+              "options": [
+                {"value": "all",      "label": "All clients"},
+                {"value": "wireless", "label": "Wireless clients only (NAS-Port-Type = Wireless-802.11)"}
+              ],
+              "hint": "Scoping to wireless only prevents the DEFAULT rule from assigning a VLAN to unknown wired switch ports."
+            },
+            {
+              "type": "field",
+              "label": "Auth Logging",
+              "name": "logging",
+              "input_type": "checkbox",
+              "checkbox_label": "Log auth requests",
+              "value": "%RADIUS_LOGGING%",
+              "hint": "Enables auth logging in radiusd.conf (auth, auth_accept, auth_reject). High volume on busy networks."
+            },
+            {
+              "type": "button_row",
+              "items": [
+                {
+                  "type": "button_primary",
+                  "action": "/action/radius/options_save",
+                  "method": "post",
+                  "text": "Save"
+                }
+              ]
+            }
+          ]
+        }
+      ]
     }
   ]
 }

docker/routlin-dash/app/view_page.py

@@ -819,6 +819,10 @@ def collect_tokens():
         tokens['RADIUS_SECRET'] = open(f'{CONFIGS_DIR}/.radius-secret').read().strip()
     except OSError:
         tokens['RADIUS_SECRET'] = '(Generation is pending - visit Actions to apply generation command)'
+    _radius_opts = cfg.get('radius_options', {})
+    tokens['RADIUS_MAC_FORMAT'] = _radius_opts.get('mac_format', 'aabbccddeeff')
+    tokens['RADIUS_APPLY_TO']   = _radius_opts.get('apply_to', 'all')
+    tokens['RADIUS_LOGGING']    = 'true' if _radius_opts.get('logging', False) else ''
     tokens['STAT_BANNED_IP_COUNT'] = str(sum(1 for b in cfg.get('banned_ips',  []) if b.get('enabled', True)))
     tokens['STAT_BLOCKLIST_COUNT'] = str(len(cfg.get('dns_blocking', {}).get('blocklists', [])))
     tokens['BLOCKLIST_STATS_HTML'] = _blocklist_stats_html(cfg)