diff --git a/docker/routlin-dash/app/config_utils.py b/docker/routlin-dash/app/config_utils.py
index 2e4a963..0019dd3 100644
--- a/docker/routlin-dash/app/config_utils.py
+++ b/docker/routlin-dash/app/config_utils.py
@@ -14,7 +14,7 @@ DASHBOARD_DONE = f'{CONFIGS_DIR}/.dashboard-done'
DASHBOARD_LAST_RUN = f'{CONFIGS_DIR}/.dashboard-last-run'
DASHBOARD_LOCK = f'{CONFIGS_DIR}/.dashboard-lock'
DASHBOARD_PENDING = f'{CONFIGS_DIR}/.dashboard-pending'
-SNAPSHOTS_DIR = f'{CONFIGS_DIR}/.snapshots'
+DASHBOARD_DB = f'{CONFIGS_DIR}/.dashboard-snapshots'
HEALTH_FILE = f'{CONFIGS_DIR}/.health'
PRODUCT_NAME = os.environ.get('PRODUCT_NAME', 'routlin')
DASHB_TIMER_NAME = f'{PRODUCT_NAME}-dashboard-queue'
@@ -339,153 +339,225 @@ def queued_msg(cmd=None, description='', action_label='Configuration saved'):
# Snapshot system ===================================================
-def _pending_uuid_set():
- return {item[0] for item in _read_dashboard_pending()}
+import re as _re
+import sqlite3 as _sqlite3
-def _find_snapshot_dependencies(path, key):
- """Return UUIDs of still-pending snapshots that modified the same path+key."""
- try:
- pending = _pending_uuid_set()
- deps = []
- for fname in sorted(os.listdir(SNAPSHOTS_DIR)):
- if not fname.endswith('.json'):
- continue
- try:
- with open(os.path.join(SNAPSHOTS_DIR, fname)) as f:
- snap = json.load(f)
- if (snap.get('path') == path
- and snap.get('key') == str(key)
- and snap.get('uuid') in pending):
- deps.append(snap['uuid'])
- except Exception:
- pass
- return deps
- except Exception:
- return []
+def _db():
+ conn = _sqlite3.connect(DASHBOARD_DB)
+ conn.row_factory = _sqlite3.Row
+ conn.execute('PRAGMA journal_mode=WAL')
+ conn.executescript('''
+ CREATE TABLE IF NOT EXISTS groups (
+ uuid TEXT PRIMARY KEY,
+ ts INTEGER NOT NULL,
+ cmd TEXT,
+ user TEXT,
+ parent_path TEXT NOT NULL,
+ item_key TEXT,
+ item_value TEXT,
+ reverts_group TEXT
+ );
+ CREATE TABLE IF NOT EXISTS changes (
+ group_id TEXT NOT NULL REFERENCES groups(uuid),
+ field TEXT NOT NULL,
+ before TEXT,
+ after TEXT,
+ value_type TEXT NOT NULL,
+ PRIMARY KEY (group_id, field)
+ );
+ CREATE INDEX IF NOT EXISTS idx_changes_group ON changes(group_id);
+ ''')
+ return conn
-def _items_match(item, ref):
- """Return True if item and ref refer to the same entity by a common identifier field."""
- if not isinstance(item, dict) or not isinstance(ref, dict):
- return item == ref
- for field in ('ip', 'name', 'mac_address', 'host', 'id', 'address'):
- if field in ref and field in item:
- return item[field] == ref[field]
- return item == ref
+def _py_value_type(val):
+ if val is None: return 'null'
+ if isinstance(val, bool): return 'bool'
+ if isinstance(val, int): return 'int'
+ if isinstance(val, float): return 'float'
+ if isinstance(val, (dict, list)): return 'json'
+ return 'str'
-def revert_snapshot_to_config(entry_uuid):
- """Apply the inverse of a snapshot to config.json and queue a new pending change.
+def _serialize_value(val):
+ if val is None:
+ return None
+ if isinstance(val, bool):
+ return 'true' if val else 'false'
+ if isinstance(val, (dict, list)):
+ return json.dumps(val, separators=(',', ':'))
+ return str(val)
- Returns (flash_message, success_bool).
+
+def _deserialize_value(text, value_type):
+ if text is None:
+ return None
+ if value_type == 'int': return int(text)
+ if value_type == 'float': return float(text)
+ if value_type == 'bool': return text == 'true'
+ if value_type in ('json', 'null'): return json.loads(text)
+ return text
+
+
+def diff_fields(before_dict, after_dict):
+ """Return list of (field, before_text, after_text, value_type) for changed fields."""
+ bd = before_dict or {}
+ ad = after_dict or {}
+ result = []
+ for key in sorted(set(bd) | set(ad)):
+ bval = bd.get(key)
+ aval = ad.get(key)
+ if bval == aval:
+ continue
+ ref = aval if aval is not None else bval
+ result.append((
+ key,
+ _serialize_value(bval),
+ _serialize_value(aval),
+ _py_value_type(ref),
+ ))
+ return result
+
+
+_PATH_SEG = _re.compile(r'([^\.\[]+)(?:\[([^\]=]+)=([^\]]+)\])?')
+
+
+def _parse_path(path):
+ """Parse 'vlans[name=trusted].field' into [(field, sel_key, sel_val), ...]."""
+ return [(m.group(1), m.group(2), m.group(3)) for m in _PATH_SEG.finditer(path)]
+
+
+def _nav_get(cfg, path):
+ """Navigate config to the value at path."""
+ for field, sel_key, sel_val in _parse_path(path):
+ cfg = cfg[field]
+ if sel_key:
+ cfg = next(x for x in cfg if str(x.get(sel_key, '')) == str(sel_val))
+ return cfg
+
+
+def _nav_parent(cfg, path):
+ """Return (parent_obj, final_key) for setting/deleting the last path segment."""
+ segs = _parse_path(path)
+ for field, sel_key, sel_val in segs[:-1]:
+ cfg = cfg[field]
+ if sel_key:
+ cfg = next(x for x in cfg if str(x.get(sel_key, '')) == str(sel_val))
+ return cfg, segs[-1][0]
+
+
+def record_group(cfg, parent_path, item_key, item_value, changes, cmd,
+ reverts_group=None, queue=True):
+ """Insert a group + changes into sqlite, save config, and queue the command.
+
+ Returns a flash message string.
"""
- snap = load_snapshot_for_uuid(entry_uuid)
- if not snap:
- return f'Snapshot not found for {entry_uuid[:8]}.', False
-
- path = snap['path']
- key = snap['key']
- before = snap['before'] # original state to restore
- after = snap['after'] # applied state to undo
- operation = snap['operation']
-
- if operation == 'revert':
- return 'This change is already a revert; cannot revert again.', False
-
- core = load_config()
-
- if key == 'global':
- if before is None:
- core.pop(path, None)
- else:
- core[path] = before
- else:
- items = core.setdefault(path, [])
- if operation == 'add':
- core[path] = [x for x in items if not _items_match(x, after)]
- elif operation == 'delete':
- if before:
- core[path].append(before)
- else:
- if before and after:
- for i, item in enumerate(items):
- if _items_match(item, after):
- items[i] = before
- break
-
- msg = save_config_with_snapshot(
- core, path=path, key=key, operation='revert',
- before=after, after=before,
- description=f"Reverted: {snap.get('description', '')}",
- cmd=snap.get('cmd', 'core apply'),
- reverts=entry_uuid,
- )
- return msg or 'Reverted.', True
-
-
-def load_snapshot_for_uuid(entry_uuid):
- """Return the snapshot dict for the given UUID, or None if not found."""
- try:
- for fname in os.listdir(SNAPSHOTS_DIR):
- if fname.endswith(f'-{entry_uuid}.json'):
- with open(os.path.join(SNAPSHOTS_DIR, fname)) as f:
- return json.load(f)
- except Exception:
- pass
- return None
-
-
-def save_config_with_snapshot(new_config, path, key, operation, before, after,
- description='', cmd='core apply', queue=True, reverts=None):
- """
- Write a .snapshots/{ts}-{uuid}.json file, save new_config to disk, and
- optionally create a pending queue entry. Returns a flash message string.
-
- queue=False: skips queueing and records the change directly in
- .dashboard-done so it appears in Change History without a pending step.
- """
- entry_uuid = str(uuid.uuid4())
+ group_uuid = str(uuid.uuid4())
entry_ts = int(datetime.now().timestamp())
current_user = session.get('email_address', 'unknown')
- depends_on = _find_snapshot_dependencies(path, key)
+ conn = _db()
+ try:
+ conn.execute(
+ 'INSERT INTO groups '
+ '(uuid,ts,cmd,user,parent_path,item_key,item_value,reverts_group) '
+ 'VALUES (?,?,?,?,?,?,?,?)',
+ (group_uuid, entry_ts, cmd, current_user,
+ parent_path, item_key, item_value, reverts_group)
+ )
+ for field, before, after, value_type in changes:
+ conn.execute(
+ 'INSERT INTO changes (group_id,field,before,after,value_type) '
+ 'VALUES (?,?,?,?,?)',
+ (group_uuid, field, before, after, value_type)
+ )
+ conn.commit()
+ finally:
+ conn.close()
- os.makedirs(SNAPSHOTS_DIR, exist_ok=True)
- snapshot = {
- 'uuid': entry_uuid,
- 'ts': entry_ts,
- 'cmd': cmd,
- 'user': current_user,
- 'operation': operation,
- 'description': description,
- 'path': path,
- 'key': str(key),
- 'before': before,
- 'after': after,
- 'depends_on': depends_on,
- 'reverts': reverts,
- }
- with open(os.path.join(SNAPSHOTS_DIR, f'{entry_ts}-{entry_uuid}.json'), 'w') as f:
- json.dump(snapshot, f, indent=2)
-
- save_config(new_config)
+ save_config(cfg)
if not queue:
with open(DASHBOARD_DONE, 'a') as f:
- f.write(f'{entry_uuid} {entry_ts}\n')
+ f.write(f'{group_uuid} {entry_ts}\n')
return 'Saved.'
if _apply_changes_immediately():
with open(DASHBOARD_QUEUE, 'a') as f:
- f.write(f'{entry_uuid} {entry_ts} [{cmd}] ({current_user})\n')
+ f.write(f'{group_uuid} {entry_ts} [{cmd}] ({current_user})\n')
_trim_if_needed()
else:
- _queue_pending_presigned(cmd, entry_uuid, entry_ts)
+ _queue_pending_presigned(cmd, group_uuid, entry_ts)
return _build_timing_msg(entry_ts)
+def load_all_groups():
+ """Return list of (group_dict, [change_dicts]) sorted newest first."""
+ conn = _db()
+ try:
+ gs = conn.execute('SELECT * FROM groups ORDER BY ts DESC').fetchall()
+ result = []
+ for g in gs:
+ cs = conn.execute(
+ 'SELECT * FROM changes WHERE group_id=? ORDER BY field', (g['uuid'],)
+ ).fetchall()
+ result.append((dict(g), [dict(c) for c in cs]))
+ return result
+ finally:
+ conn.close()
+
+
+def revert_group(group_uuid):
+ """Revert a change group. Returns (flash_message, success_bool)."""
+ conn = _db()
+ try:
+ g = conn.execute('SELECT * FROM groups WHERE uuid=?', (group_uuid,)).fetchone()
+ if not g:
+ return f'Snapshot not found for {group_uuid[:8]}.', False
+ g = dict(g)
+ changes = [dict(c) for c in conn.execute(
+ 'SELECT * FROM changes WHERE group_id=?', (group_uuid,)
+ ).fetchall()]
+ finally:
+ conn.close()
+
+ if g['reverts_group']:
+ return 'Cannot revert a revert.', False
+
+ cfg = load_config()
+ parent_path = g['parent_path']
+ item_key = g['item_key']
+ item_value = g['item_value']
+
+ all_before_null = all(c['before'] is None for c in changes)
+ all_after_null = all(c['after'] is None for c in changes)
+
+ if all_before_null:
+ parent_obj, lst_key = _nav_parent(cfg, parent_path)
+ parent_obj[lst_key] = [
+ x for x in parent_obj[lst_key]
+ if str(x.get(item_key, '')) != str(item_value)
+ ]
+ elif all_after_null:
+ item = {c['field']: _deserialize_value(c['before'], c['value_type']) for c in changes}
+ _nav_get(cfg, parent_path).append(item)
+ else:
+ item_path = f'{parent_path}[{item_key}={item_value}]' if item_key else parent_path
+ for c in changes:
+ parent_obj, field = _nav_parent(cfg, f'{item_path}.{c["field"]}')
+ if c['before'] is None:
+ parent_obj.pop(field, None)
+ else:
+ parent_obj[field] = _deserialize_value(c['before'], c['value_type'])
+
+ inv = [(c['field'], c['after'], c['before'], c['value_type']) for c in changes]
+ msg = record_group(cfg, parent_path, item_key, item_value, inv,
+ g['cmd'], reverts_group=group_uuid)
+ return msg, True
+
+
# Misc ==============================================================
def run_apply():
diff --git a/docker/routlin-dash/app/factory.py b/docker/routlin-dash/app/factory.py
index 0bf5e9b..373c1e3 100644
--- a/docker/routlin-dash/app/factory.py
+++ b/docker/routlin-dash/app/factory.py
@@ -92,40 +92,41 @@ def passes(req, level):
# Snapshot helpers ====================================================
-def snap_text(val):
- """Return the plain-text representation of a snapshot before/after value."""
- if val is None:
+def build_snap_val(changes):
+ """Return a brief summary of changed field names for the history table cell."""
+ if not changes:
return ''
- if isinstance(val, dict) and len(val) == 1:
- k, v = next(iter(val.items()))
- return f'{k}: {v}'
- if isinstance(val, (dict, list)):
- return json.dumps(val, separators=(',', ':'))
- return str(val)
+ fields = [c['field'] for c in changes]
+ if len(fields) <= 2:
+ return e(', '.join(fields))
+ return e(f'{fields[0]}, {fields[1]} (+{len(fields) - 2} more)')
-def build_snap_val(val):
- """Return truncated escaped HTML for a snapshot before/after table cell."""
- text = snap_text(val)
- if not text:
+def snap_expand_row(changes, colspan):
+ """Return a hidden with a per-field change table."""
+ if not changes:
return ''
- trunc = (text[:23] + '…') if len(text) > 24 else text
- return e(trunc)
-
-
-def snap_expand_row(before_val, after_val, colspan):
- """Return a hidden that expands with full before/after content."""
- def box(label, val):
- text = snap_text(val) if val is not None else ''
- if isinstance(val, (dict, list)):
- text = json.dumps(val, indent=2)
- body = e(text) if text else '(none) '
- return (
- ''
- f'
{label} '
- f'
{body} '
+ f'{e(c["field"])} '
+ f'{e(bval) if bval else "(none) "} '
+ f'{e(aval) if aval else "(none) "} '
+ ' '
)
- inner = f'{box("Before", before_val)}{box("After", after_val)}
'
+ inner = (
+ ''
+ ''
+ 'Field '
+ 'Before '
+ 'After '
+ ' {rows} '
+ '
'
+ )
return f'{inner} '
@@ -690,27 +689,33 @@ def collect_tokens():
if pending_items else ''
)
done_ts_map = get_done_timestamps()
- if all_snaps:
- # UUIDs that cannot be reverted: revert entries themselves, and entries
- # that have already been reverted (referenced in another snap's 'reverts').
+ if all_groups:
_no_revert = set()
- for _s in all_snaps:
- if _s.get('operation') == 'revert':
- _no_revert.add(_s.get('uuid', ''))
- if _s.get('reverts'):
- _no_revert.add(_s['reverts'])
+ for g, _ in all_groups:
+ if g['reverts_group']:
+ _no_revert.add(g['uuid'])
+ _no_revert.add(g['reverts_group'])
hist_rows = ''
_hist_onclick = (
'onclick="if(event.target.type!==\'checkbox\')'
'this.nextElementSibling.hidden=!this.nextElementSibling.hidden"'
)
- for snap in all_snaps:
- _uuid = snap.get('uuid', '')
+ for g, changes in all_groups:
+ _uuid = g['uuid']
applied_ts = done_ts_map.get(_uuid)
dt_str = datetime.fromtimestamp(applied_ts).strftime('%Y-%m-%d %H:%M') if applied_ts else '-'
- snap_desc = e(snap.get('description', ''))
- before_val = snap.get('before')
- after_val = snap.get('after')
+ all_before_null = all(c['before'] is None for c in changes)
+ all_after_null = all(c['after'] is None for c in changes)
+ if g['reverts_group']:
+ verb = 'Reverted'
+ elif all_before_null:
+ verb = 'Added'
+ elif all_after_null:
+ verb = 'Deleted'
+ else:
+ verb = 'Edited'
+ item = g.get('item_value') or ''
+ summary = f'{verb} {g["parent_path"]}: {item}' if item else f'{verb} {g["parent_path"]}'
snap_tag = (
f''
f'{e(_uuid[:8])} '
@@ -718,19 +723,18 @@ def collect_tokens():
f'{e(_uuid[:8])} '
'
'
)
- snap_user = e(snap.get('user', ''))
+ snap_user = e(g.get('user', ''))
_cb_attrs = 'disabled title="Cannot revert"' if _uuid in _no_revert else ''
hist_rows += (
f''
f'{e(dt_str)} '
- f'{snap_desc} '
- f'{build_snap_val(before_val)} '
- f'{build_snap_val(after_val)} '
+ f'{e(summary)} '
+ f'{build_snap_val(changes)} '
f'{snap_tag} '
f'{snap_user} '
' '
- f'{snap_expand_row(before_val, after_val, 7)}'
+ f'{snap_expand_row(changes, 6)}'
)
select_all = (
''
f''
''
- ''
- ''
- ''
- ''
+ ''
+ ''
+ ''
''
' '
f'{hist_rows} '
@@ -754,7 +757,7 @@ def collect_tokens():
history_html = 'No change history.
'
tokens['CHANGE_HISTORY_HTML'] = history_html
- tokens['NO_HISTORY'] = 'true' if not all_snaps else ''
+ tokens['NO_HISTORY'] = 'true' if not all_groups else ''
servers = dns.get('upstream_servers', [])
tokens['DNS_STRICT_ORDER'] = 'true' if dns.get('strict_order') else 'false'