Development

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

@@ -8,9 +8,12 @@ from auth import require_level
 from config_utils import load_config, record_group, diff_fields, verify_config_hash
 import sanitize
 import mod_validation as validate
+import license
 
 _PAGE = Path(__file__).parent.name
 
+PRO_LICENSE = license.is_pro()
+
 bp = Blueprint(_PAGE, __name__)
 
 
@@ -46,11 +49,16 @@ def vlans_addedit():
     radius_default      = 'radius_default' in request.form
     mdns_reflection     = 'mdns_reflection' in request.form
     dnsmasq_log_queries = 'dnsmasq_log_queries' in request.form
+    restricted_vlan     = 'restricted_vlan' in request.form
     use_blocklists      = sanitize.filterlist(
         request.form.getlist('use_blocklists'),
         {b.get('name') for b in load_config().get('dns_blocking', {}).get('blocklists', [])},
     )
 
+    if restricted_vlan and not PRO_LICENSE:
+        flash('Restricted VLAN requires a Routlin Pro license.', 'error')
+        return redirect(f'/{_PAGE}')
+
     if not name:
         flash('Name is required.', 'error')
         return redirect(f'/{_PAGE}')
@@ -261,6 +269,8 @@ def vlans_addedit():
             'use_blocklists':      use_blocklists,
             'server_identities':   new_identities,
         })
+        if PRO_LICENSE:
+            existing['restricted_vlan'] = restricted_vlan
         if dhcp_info:
             existing['dhcp_information'] = dhcp_info
         else:
@@ -318,6 +328,8 @@ def vlans_addedit():
             'mdns_reflection':     mdns_reflection,
             'server_identities':   new_identities,
         }
+        if PRO_LICENSE:
+            entry['restricted_vlan'] = restricted_vlan
         if dhcp_info:
             entry['dhcp_information'] = dhcp_info
         if is_vpn:

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

@@ -14,6 +14,10 @@
         }
       ]
     },
+    {
+      "type": "raw_html",
+      "html": "<span id=\"js-pro-license\" data-value=\"%PRO_LICENSE_JS%\" hidden></span>"
+    },
     {
       "type": "info_bar",
       "variant": "info",
@@ -88,6 +92,16 @@
             "title_true": "DNS Queries Recorded",
             "title_false": "DNS Queries Not Recorded"
           }
+        },
+        {
+          "label": "Restricted",
+          "field": "restricted_vlan",
+          "class": "col-narrow",
+          "render": "badge_yes_no",
+          "render_options": {
+            "title_true": "Restricted VLAN",
+            "title_false": "Not Restricted"
+          }
         }
       ],
       "row_actions": [
@@ -334,6 +348,13 @@
               "input_type": "checkbox",
               "hint": "Log every DNS query. High volume - enable for debugging only."
             },
+            {
+              "type": "field",
+              "label": "%RESTRICTED_VLAN_LABEL%",
+              "name": "restricted_vlan",
+              "input_type": "checkbox",
+              "hint": "Block devices on this VLAN from communicating with the Internet. Block all LAN traffic as well (except where Inter-VLAN-Exception rules allow)."
+            },
             {
               "type": "button_row",
               "items": [

docker/routlin-dash/app/pages/networklayout/view.py

@@ -1,6 +1,9 @@
 import json
 from config_utils import collect_layout_tokens, load_datasource
 from factory import load_json, build_table, table_token_key, iter_table_items, PAGES_DIR
+import license
+
+PRO_LICENSE = license.is_pro()
 
 
 def collect_tokens(cfg):
@@ -10,6 +13,7 @@ def collect_tokens(cfg):
     tokens['EXISTING_VLAN_IDS_JSON']   = json.dumps([v.get('vlan_id') for v in vlans])
     tokens['EXISTING_VLAN_NAMES_JSON'] = json.dumps([v.get('name')    for v in vlans])
     tokens['RADIUS_DEFAULT_VLAN']      = f'"{dv["name"]}" (VLAN {dv["vlan_id"]})' if dv else 'none set'
+    tokens['RESTRICTED_VLAN_LABEL']    = 'Restricted VLAN' if PRO_LICENSE else 'Restricted VLAN (PRO FEATURE)'
     tokens['BLOCKLIST_NAME_OPTIONS']   = json.dumps([
         {'value': bl.get('name', ''), 'label': bl.get('description', bl.get('name', ''))}
         for bl in cfg.get('dns_blocking', {}).get('blocklists', [])