Development

docker/routlin-dash/app/action_dnsblocking.py

@@ -1,7 +1,8 @@
+import copy
 import re
 from flask import Blueprint, request, redirect, flash
 from auth import require_level
-from config_utils import load_config, save_config, verify_config_hash, queued_msg
+from config_utils import load_config, save_config_with_snapshot, verify_config_hash, queued_msg
 import sanitize
 import validation as validate
 
@@ -62,21 +63,26 @@ def dnsblocking_tableblocklists_rowdelete():
     if not _hash_ok():
         return redirect(VIEW)
 
-    cfg  = load_config()
+    cfg   = load_config()
     items = cfg.get('dns_blocking', {}).get('blocklists', [])
     if idx < 0 or idx >= len(items):
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
+    before = copy.deepcopy(items[idx])
+    name   = before.get('name', str(idx))
     items.pop(idx)
     errors = validate.validate_config(cfg)
     if errors:
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_config(cfg)
-
-    flash(queued_msg('core apply'), 'success')
+    flash(save_config_with_snapshot(
+        cfg, path='dns_blocking', key=name, operation='delete',
+        before=before, after=None,
+        description=f'Deleted blocklist: {name}',
+        queue=False,
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -95,12 +101,13 @@ def dnsblocking_tableblocklists_rowedit():
     if not _hash_ok():
         return redirect(VIEW)
 
-    cfg  = load_config()
+    cfg   = load_config()
     items = cfg.get('dns_blocking', {}).get('blocklists', [])
     if idx < 0 or idx >= len(items):
         flash('Entry not found.', 'error')
         return redirect(VIEW)
 
+    before = copy.deepcopy(items[idx])
     items[idx].update({
         'name':        fields['name'],
         'description': fields['description'],
@@ -112,9 +119,12 @@ def dnsblocking_tableblocklists_rowedit():
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_config(cfg)
-
-    flash(queued_msg('core apply'), 'success')
+    flash(save_config_with_snapshot(
+        cfg, path='dns_blocking', key=fields['name'], operation='edit',
+        before=before, after=copy.deepcopy(items[idx]),
+        description=f'Edited blocklist: {fields["name"]}',
+        queue=False,
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -128,28 +138,32 @@ def dnsblocking_cardaddblocklist_add():
     if not _hash_ok():
         return redirect(VIEW)
 
-    cfg       = load_config()
+    cfg        = load_config()
     blocklists = cfg.setdefault('dns_blocking', {}).setdefault('blocklists', [])
 
     if any(b.get('name', '').lower() == fields['name'].lower() for b in blocklists):
         flash('The configuration has not been saved because a blocklist with that name already exists.', 'error')
         return redirect(VIEW)
 
-    blocklists.append({
+    entry = {
         'name':        fields['name'],
         'description': fields['description'],
         'format':      fields['format'],
         'url':         fields['url'],
         'save_as':     _save_as_from_name(fields['name']),
-    })
+    }
+    blocklists.append(entry)
     errors = validate.validate_config(cfg)
     if errors:
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_config(cfg)
-
-    flash(queued_msg('core apply'), 'success')
+    flash(save_config_with_snapshot(
+        cfg, path='dns_blocking', key=fields['name'], operation='add',
+        before=None, after=copy.deepcopy(entry),
+        description=f'Added blocklist: {fields["name"]}',
+        queue=False,
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -166,11 +180,15 @@ def dnsblocking_cardblocklistrefresh_save():
         flash('Configuration was modified by another session. Please refresh and try again.', 'error')
         return redirect(VIEW)
 
-    cfg = load_config()
+    cfg    = load_config()
+    before = copy.deepcopy(cfg.get('dns_blocking', {}).get('general', {}))
     cfg.setdefault('dns_blocking', {}).setdefault('general', {})['daily_execute_time_24hr_local'] = daily_execute_time
-    save_config(cfg)
-
-    flash(queued_msg('core apply'), 'success')
+    flash(save_config_with_snapshot(
+        cfg, path='dns_blocking', key='general', operation='edit',
+        before=before, after=copy.deepcopy(cfg['dns_blocking']['general']),
+        description='Updated daily blocklist refresh time',
+        cmd='core apply',
+    ), 'success')
     return redirect(VIEW)
 
 
@@ -196,7 +214,8 @@ def dnsblocking_cardlogging_save():
         flash('Configuration was modified by another session. Please refresh and try again.', 'error')
         return redirect(VIEW)
 
-    cfg = load_config()
+    cfg    = load_config()
+    before = copy.deepcopy(cfg.get('dns_blocking', {}).get('general', {}))
     cfg.setdefault('dns_blocking', {}).setdefault('general', {}).update({
         'log_max_kb':      log_max_kb,
         'log_errors_only': log_errors_only,
@@ -206,7 +225,10 @@ def dnsblocking_cardlogging_save():
         for msg in errors:
             flash(msg, 'error')
         return redirect(VIEW)
-    save_config(cfg)
-
-    flash(queued_msg('core apply'), 'success')
+    flash(save_config_with_snapshot(
+        cfg, path='dns_blocking', key='general', operation='edit',
+        before=before, after=copy.deepcopy(cfg['dns_blocking']['general']),
+        description='Updated DNS blocking log settings',
+        queue=False,
+    ), 'success')
     return redirect(VIEW)