Development

docker/router-dash/app/action_apply_general.py

@@ -2,6 +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 validation as validate
 
 bp = Blueprint('action_apply_general', __name__)
 
@@ -14,11 +15,8 @@ def apply_general():
     dnsmasq_log_queries = 'dnsmasq_log_queries' in request.form
     daily_execute_time  = sanitize.time_24h(request.form.get('daily_execute_time_24hr_local', ''))
 
-    try:
-        log_max_kb = int(log_max_kb_raw)
-        if log_max_kb < 64:
-            raise ValueError
-    except (ValueError, TypeError):
+    log_max_kb = validate.int_range(log_max_kb_raw, 64, None)
+    if log_max_kb is None:
         flash('Max Log Size must be a number >= 64.', 'error')
         return redirect('/view/view_general')
 
@@ -33,6 +31,11 @@ def apply_general():
         'dnsmasq_log_queries':           dnsmasq_log_queries,
         'daily_execute_time_24hr_local': daily_execute_time,
     })
+    errors = validate.validate_config(core)
+    if errors:
+        for msg in errors:
+            flash(msg, 'error')
+        return redirect('/view/view_general')
     save_core(core)
 
     flash(queued_msg('core apply'), 'success')