Development

docker/router-dash/app/action_apply_port_forwarding.py

@@ -2,7 +2,7 @@ from flask import Blueprint, request, redirect, flash
 from auth import require_level
 from config_utils import load_core, save_core, verify_core_hash, queued_msg
 import sanitize
-import validate
+import validation as validate
 
 bp = Blueprint('action_apply_port_forwarding', __name__)
 
@@ -84,6 +84,11 @@ def add_port_forward():
 
     core = load_core()
     core.setdefault('port_forwarding', []).append(entry)
+    errors = validate.validate_config(core)
+    if errors:
+        for msg in errors:
+            flash(msg, 'error')
+        return redirect(VIEW)
     save_core(core)
 
     flash(queued_msg('core apply'), 'success')
@@ -108,6 +113,11 @@ def toggle_port_forward():
         return redirect(VIEW)
 
     items[idx]['enabled'] = not items[idx].get('enabled', True)
+    errors = validate.validate_config(core)
+    if errors:
+        for msg in errors:
+            flash(msg, 'error')
+        return redirect(VIEW)
     save_core(core)
 
     flash(queued_msg('core apply'), 'success')
@@ -137,6 +147,11 @@ def edit_port_forward():
 
     items[idx] = entry
     items[idx]['enabled'] = request.form.get('enabled') == 'on'
+    errors = validate.validate_config(core)
+    if errors:
+        for msg in errors:
+            flash(msg, 'error')
+        return redirect(VIEW)
     save_core(core)
 
     flash(queued_msg('core apply'), 'success')
@@ -161,6 +176,11 @@ def delete_port_forward():
         return redirect(VIEW)
 
     removed = items.pop(idx)
+    errors = validate.validate_config(core)
+    if errors:
+        for msg in errors:
+            flash(msg, 'error')
+        return redirect(VIEW)
     save_core(core)
 
     flash(queued_msg('core apply'), 'success')