{label} '
- f'
'
+ f'
'
f'{rows}'
f'+ {add_lbl} '
f'
{hint_html}
')
@@ -917,7 +1152,10 @@ def _render_table(item, tokens, inherited_req=None):
t_inner = render_items(toolbar.get('items', []), tokens, req)
toolbar_html = f'
{t_inner}
'
- thead = ''.join(f'
{e(c.get("label",""))} ' for c in columns)
+ thead = ''.join(
+ f'
{e(c.get("label",""))} ' if c.get("class") else f'
{e(c.get("label",""))} '
+ for c in columns
+ )
if row_actions:
thead += '
'
@@ -1088,6 +1326,30 @@ def render_layout(view_id, content_html, tokens):
existing_ids = tokens.get('EXISTING_VLAN_IDS_JSON', '[]')
existing_names = tokens.get('EXISTING_VLAN_NAMES_JSON', '[]')
existing_interfaces = tokens.get('EXISTING_VLAN_INTERFACES_JSON', '[]')
+ current_user = session.get('email_address', '')
+ pending = get_pending_entries()
+ my_uuid = next((u for u, t, c, usr in pending if usr == current_user), None)
+
+ secs = _seconds_until_next_run()
+ locked = _is_locked()
+ lock_mtime = _lock_mtime()
+ other_bars = ''
+ seen_other_users = set()
+ for o_uuid, o_ts, o_cmd, o_user in pending:
+ if o_user == current_user:
+ continue
+ if o_user in seen_other_users:
+ continue
+ seen_other_users.add(o_user)
+ if locked and lock_mtime and o_ts < lock_mtime:
+ text = f'{e(o_user)}\'s changes are being applied now...'
+ cls = 'info-bar-warning info-bar-running'
+ else:
+ timing = _format_timing(secs)
+ text = f'{e(o_user)} has pending changes which will be applied {timing}.' if timing else f'{e(o_user)} has pending changes which will be applied on the next timer tick.'
+ cls = 'info-bar-warning'
+ other_bars += f'
{text}
\n'
+
return (f'\n\n\n'
f'
\n'
f'
\n'
@@ -1096,9 +1358,9 @@ def render_layout(view_id, content_html, tokens):
f'\n\n'
f'{titlebar_html}\n'
f'{navbar_html}\n'
- f'
\n{content_html}\n \n'
+ f'
\n{other_bars}{content_html}\n \n'
f'{footer_html}\n'
- f'\n'
+ f'\n'
f'\n'
f'\n')
@@ -1206,6 +1468,146 @@ function networkBitsMessage(octets, prefix) {
return parts.join('; ') + ' for /' + prefix;
}
+function classifyMac(s) {
+ if (!s) return 'empty';
+ if (/[^0-9a-fA-F:]/.test(s)) return 'invalid_char';
+ if (/::/.test(s)) return 'invalid_struct';
+ var groups = s.split(':');
+ if (groups.length > 6) return 'too_many';
+ for (var i = 0; i < groups.length; i++) {
+ if (groups[i].length > 2) return 'invalid_group';
+ }
+ if (groups.length === 6 && groups.every(function(g) { return g.length === 2; })) return 'complete';
+ return 'incomplete';
+}
+
+function classifyIp(s) {
+ if (!s) return 'empty';
+ if (/[^0-9a-fA-F:.]/.test(s)) return 'invalid_char';
+ if (s.indexOf(':') !== -1) {
+ // IPv6
+ if (/:::/.test(s) || (s.match(/::/g) || []).length > 1) return 'invalid_struct';
+ var v6parts = s.split(':').filter(function(p) { return p !== ''; });
+ if (!v6parts.every(function(p) { return /^[0-9a-fA-F]{1,4}$/.test(p) || /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(p); })) return 'invalid';
+ var fullGroups = s.replace(/[^:]/g, '').length;
+ if (s.indexOf('::') !== -1 || fullGroups === 7) return 'complete';
+ return 'incomplete';
+ }
+ // IPv4
+ if (/\.\./.test(s) || s.charAt(0) === '.') return 'invalid_struct';
+ var parts = s.split('.');
+ if (parts.length > 4) return 'invalid_struct';
+ for (var i = 0; i < parts.length; i++) {
+ if (!parts[i]) continue;
+ var n = parseInt(parts[i], 10);
+ if (isNaN(n) || n > 255 || String(n) !== parts[i]) return 'invalid_range';
+ }
+ if (parts.length === 4 && parts.every(function(p) { return p !== ''; })) return 'complete';
+ return 'incomplete';
+}
+
+function classifyIpv4(s) {
+ if (!s) return 'empty';
+ if (s.indexOf(':') !== -1) return 'invalid_struct';
+ return classifyIp(s);
+}
+
+function classifyIpv6(s) {
+ if (!s) return 'empty';
+ if (s.indexOf('.') !== -1 && s.indexOf(':') === -1) return 'invalid_struct';
+ if (s.indexOf(':') === -1) return 'incomplete';
+ return classifyIp(s);
+}
+
+function classifyUrl(s) {
+ if (!s) return 'empty';
+ if (/[^A-Za-z0-9\-._~:/?#\[\]@!$&'()*+,;=%]/.test(s)) return 'invalid_char';
+ var sl = s.toLowerCase();
+ if ('https://'.startsWith(sl) || 'http://'.startsWith(sl)) return 'incomplete';
+ var sep = sl.indexOf('://');
+ if (sep === -1) return 'invalid_struct';
+ var scheme = sl.slice(0, sep);
+ if (scheme !== 'http' && scheme !== 'https') return 'invalid_struct';
+ var afterScheme = s.slice(sep + 3);
+ if (!afterScheme) return 'incomplete';
+ var hostEnd = afterScheme.search(/[/:?#]/);
+ var host = hostEnd === -1 ? afterScheme : afterScheme.slice(0, hostEnd);
+ var rest = hostEnd === -1 ? '' : afterScheme.slice(hostEnd);
+ if (!host) return 'incomplete';
+ if (/\.\./.test(host) || host.charAt(0) === '.' || host.charAt(host.length - 1) === '.') return 'invalid_struct';
+ var labels = host.split('.');
+ for (var i = 0; i < labels.length; i++) {
+ if (!/^[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?$/.test(labels[i])) return 'invalid_struct';
+ }
+ if (rest.charAt(0) === ':') {
+ var portMatch = rest.slice(1).match(/^\d+/);
+ if (!portMatch) return 'incomplete';
+ if (parseInt(portMatch[0]) < 1 || parseInt(portMatch[0]) > 65535) return 'invalid_struct';
+ }
+ return 'complete';
+}
+
+function classifyPort(s) {
+ if (!s) return 'empty';
+ if (/[^0-9]/.test(s)) return 'invalid_char';
+ var n = parseInt(s, 10);
+ if (n < 1 || n > 65535) return 'out_of_range';
+ return 'complete';
+}
+
+function classifyIpv4Cidr(s) {
+ if (!s) return 'empty';
+ var slash = s.indexOf('/');
+ if (slash === -1) return classifyIpv4(s);
+ var ipCls = classifyIpv4(s.slice(0, slash));
+ if (ipCls !== 'complete') return ipCls;
+ var prefix = s.slice(slash + 1);
+ if (!prefix) return 'incomplete';
+ if (/[^0-9]/.test(prefix)) return 'invalid_char';
+ var n = parseInt(prefix, 10);
+ if (n < 0 || n > 32) return 'invalid_struct';
+ return 'complete';
+}
+
+function classifyEndpoint(s) {
+ if (!s) return 'empty';
+ if (s.indexOf(':') !== -1) return classifyIp(s);
+ if (/^[0-9.]+$/.test(s)) return classifyIp(s);
+ return classifyDomainname(s);
+}
+
+function classifyDashname(s) {
+ if (!s) return 'empty';
+ if (/[^a-z0-9-]/.test(s)) return 'invalid_char';
+ if (s.charAt(0) === '-') return 'invalid_struct';
+ if (/--/.test(s)) return 'invalid_struct';
+ if (s.charAt(s.length - 1) === '-') return 'incomplete';
+ return 'complete';
+}
+
+function classifyDomainname(s) {
+ if (!s) return 'empty';
+ if (/[^a-zA-Z0-9.-]/.test(s)) return 'invalid_char';
+ if (s.charAt(0) === '.') return 'invalid_struct';
+ if (/\.\./.test(s)) return 'invalid_struct';
+ if (s.charAt(s.length - 1) === '.') return 'incomplete';
+ var labels = s.split('.');
+ for (var i = 0; i < labels.length; i++) {
+ var l = labels[i];
+ if (l.charAt(0) === '-' || l.charAt(l.length - 1) === '-') return 'invalid_struct';
+ }
+ return 'complete';
+}
+
+function classifyNetworkname(s) {
+ if (!s) return 'empty';
+ if (/[^a-zA-Z0-9_-]/.test(s)) return 'invalid_char';
+ if (s.charAt(0) === '-' || s.charAt(0) === '_') return 'invalid_struct';
+ if (/[-_]{2,}/.test(s)) return 'invalid_struct';
+ if (s.charAt(s.length - 1) === '-' || s.charAt(s.length - 1) === '_') return 'incomplete';
+ return 'complete';
+}
+
function classifySubnet(s) {
if (!s) return 'empty';
if (/[^0-9.]/.test(s)) return 'invalid_char';
@@ -1225,8 +1627,9 @@ function classifySubnet(s) {
function setFieldHint(input, message, state) {
// state: 'error' | 'warning' | 'ok'
var fg = input.closest('.form-group');
- if (fg) {
- var hint = fg.querySelector('.field-dyn-hint');
+ var hintContainer = fg || input.parentElement;
+ if (hintContainer) {
+ var hint = hintContainer.querySelector('.field-dyn-hint');
if (hint) {
hint.textContent = message;
hint.style.display = message ? '' : 'none';
@@ -1443,8 +1846,11 @@ document.addEventListener('click', function(e) {
} else if (inputType === 'credentials') {
td.innerHTML = buildCredentialsHtml(rowData.provider || 'noip', rowData);
} else {
+ var validateAttr = fDef.validate ? ' data-validate="' + esc(fDef.validate) + '"' : '';
+ var hintHtml = fDef.validate ? '
' : '';
td.innerHTML = '
';
+ '" value="' + esc(String(val)) + '" class="form-input inline-edit-input"' + validateAttr + '>' + hintHtml;
+ if (fDef.validate && typeof validateEl === 'function') validateEl(td.querySelector('input'));
}
});
@@ -1531,58 +1937,190 @@ document.querySelectorAll('.js-hide-card').forEach(function(btn) {
});
});
+function _elMakeRow(list, value) {
+ var row = document.createElement('div');
+ row.className = 'editable-list-item';
+ var inp = document.createElement('input');
+ inp.type = 'text'; inp.name = list.dataset.name; inp.value = value;
+ inp.placeholder = list.dataset.placeholder || ''; inp.className = 'form-input';
+ var btn = document.createElement('button');
+ btn.type = 'button'; btn.className = 'btn btn-ghost btn-sm editable-list-remove';
+ btn.textContent = 'Remove';
+ btn.addEventListener('click', function() { row.remove(); });
+ row.appendChild(inp); row.appendChild(btn);
+ return row;
+}
+
+document.querySelectorAll('.editable-list').forEach(function(list) {
+ list.querySelectorAll('.editable-list-item').forEach(function(row) {
+ row.querySelector('.editable-list-remove').addEventListener('click', function() { row.remove(); });
+ });
+ list.querySelector('.editable-list-add').addEventListener('click', function() {
+ list.insertBefore(_elMakeRow(list, ''), this);
+ });
+});
+
+var validateEl;
(function() {
- document.querySelectorAll('form').forEach(function(form) {
- var cancelBtn = form.querySelector('.btn-cancel');
- if (!cancelBtn) return;
- var origValues = {};
- form.querySelectorAll('input, textarea, select').forEach(function(el) {
- if (el.name) origValues[el.name] = el.type === 'checkbox' ? el.checked : el.value;
- });
- function checkChanged() {
- var changed = false;
- form.querySelectorAll('input, textarea, select').forEach(function(el) {
- if (!el.name) return;
- var cur = el.type === 'checkbox' ? el.checked : el.value;
- if (cur !== origValues[el.name]) changed = true;
- });
- cancelBtn.disabled = !changed;
+ var _ipMsgs = { invalid_char: 'Invalid character', invalid_struct: 'Invalid format',
+ invalid_range: 'Octet out of range', invalid: 'Invalid IP address' };
+ var _msgs = {
+ ip: _ipMsgs,
+ ipv4: _ipMsgs,
+ ipv6: _ipMsgs,
+ mac: { invalid_char: 'Invalid character', invalid_struct: 'Invalid format',
+ too_many: 'Too many groups', invalid_group: 'Each group must be exactly 2 hex characters' },
+ subnet: { invalid_char: 'Invalid character', invalid_struct: 'Invalid format',
+ range: 'Octet out of range' },
+ url: { invalid_char: 'Invalid character', invalid_struct: 'Invalid URL format' },
+ port: { invalid_char: 'Digits only', out_of_range: 'Must be between 1 and 65535' },
+ ipv4cidr: { invalid_char: 'Invalid character', invalid_struct: 'Prefix must be 0–32',
+ invalid_range: 'Octet out of range' },
+ endpoint: { invalid_char: 'Invalid character', invalid_struct: 'Invalid hostname or IP',
+ invalid_range: 'Octet out of range', invalid: 'Invalid IP address' },
+ dashname: { invalid_char: 'Lowercase letters, digits and hyphens only',
+ invalid_struct: 'No leading, trailing or consecutive hyphens' },
+ domainname: { invalid_char: 'Letters, digits, hyphens and dots only',
+ invalid_struct: 'Invalid domain format' },
+ networkname: { invalid_char: 'Letters, digits, hyphens and underscores only',
+ invalid_struct: 'No leading, trailing or consecutive special characters' }
+ };
+ var _classifiers = { ip: classifyIp, ipv4: classifyIpv4, ipv6: classifyIpv6, mac: classifyMac,
+ subnet: classifySubnet, url: classifyUrl,
+ port: classifyPort, ipv4cidr: classifyIpv4Cidr,
+ endpoint: classifyEndpoint,
+ dashname: classifyDashname, domainname: classifyDomainname, networkname: classifyNetworkname };
+
+ validateEl = function(el) {
+ var list = el.closest('.editable-list[data-validate]');
+ var vtype = el.dataset.validate || (list ? list.dataset.validate : '');
+ var classify = _classifiers[vtype];
+ if (!classify) return;
+ var cls = classify(el.value);
+ if (list) {
+ el.classList.remove('field-invalid', 'field-warning');
+ if (cls === 'incomplete') el.classList.add('field-warning');
+ else if (cls !== 'empty' && cls !== 'complete') el.classList.add('field-invalid');
+ } else {
+ var msgs = _msgs[vtype] || {};
+ if (cls === 'complete' || cls === 'empty') {
+ setFieldHint(el, el._postValidate ? el._postValidate(cls) : '', 'ok');
+ } else if (cls === 'incomplete') {
+ setFieldHint(el, el._postValidate ? el._postValidate(cls) : '', 'warning');
+ } else {
+ setFieldHint(el, msgs[cls] || 'Invalid', 'error');
+ }
}
- form.addEventListener('input', checkChanged);
- form.addEventListener('change', checkChanged);
- cancelBtn.addEventListener('click', function() {
- form.querySelectorAll('input, textarea, select').forEach(function(el) {
- if (!el.name) return;
- if (el.type === 'checkbox') {
- el.checked = origValues[el.name];
- } else {
- el.value = origValues[el.name];
- }
- });
- cancelBtn.disabled = true;
+ };
+
+ // Regular fields (not inside editable lists) — initial state + expose _triggerValidate
+ document.querySelectorAll('input[data-validate]').forEach(function(el) {
+ if (el.closest('.editable-list')) return;
+ el._triggerValidate = function() { validateEl(el); };
+ validateEl(el);
+ });
+
+ // Document-level delegation for regular fields (covers static + dynamically added inputs)
+ document.addEventListener('input', function(ev) {
+ var el = ev.target;
+ if (el.tagName !== 'INPUT' || !el.dataset.validate || el.closest('.editable-list')) return;
+ validateEl(el);
+ });
+
+ // Editable lists: validate existing items, delegation + MutationObserver for added items
+ document.querySelectorAll('.editable-list[data-validate]').forEach(function(list) {
+ if (!_classifiers[list.dataset.validate]) return;
+ list.querySelectorAll('input').forEach(function(inp) { validateEl(inp); });
+ list.addEventListener('input', function(ev) {
+ if (ev.target.tagName === 'INPUT') validateEl(ev.target);
});
+ new MutationObserver(function(mutations) {
+ mutations.forEach(function(m) {
+ m.addedNodes.forEach(function(node) {
+ if (node.nodeType !== 1) return;
+ var inp = node.querySelector ? node.querySelector('input') : null;
+ if (inp) validateEl(inp);
+ });
+ });
+ }).observe(list, {childList: true});
});
})();
-document.querySelectorAll('.editable-list').forEach(function(list) {
- var name = list.dataset.name;
- var ph = list.dataset.placeholder;
- function attachRemove(row) {
- row.querySelector('.editable-list-remove').addEventListener('click', function() {
- row.remove();
- });
- }
- list.querySelectorAll('.editable-list-item').forEach(attachRemove);
- list.querySelector('.editable-list-add').addEventListener('click', function() {
- var row = document.createElement('div');
- row.className = 'editable-list-item';
- row.innerHTML = '
Remove ';
- list.insertBefore(row, this);
- attachRemove(row);
+(function() {
+ document.querySelectorAll('form').forEach(function(form) {
+ var origInput = form.querySelector('input[name="original_values"]');
+ if (!origInput) return;
+ var original;
+ try { original = JSON.parse(origInput.value); } catch(ex) { return; }
+
+ var submitBtns = form.querySelectorAll('button[type="submit"]');
+ var cancelBtns = form.querySelectorAll('.btn-cancel');
+ submitBtns.forEach(function(b) { b.disabled = true; });
+ cancelBtns.forEach(function(b) { b.disabled = true; });
+
+ // Only track fields named in original — naturally excludes config_hash,
+ // row_index, etc., while including hidden inputs (e.g. picker values).
+ function snapshot() {
+ var state = {};
+ Object.keys(original).forEach(function(k) { if (Array.isArray(original[k])) state[k] = []; });
+ form.querySelectorAll('input, select, textarea').forEach(function(el) {
+ if (!el.name || !(el.name in original)) return;
+ var val = el.type === 'checkbox' ? (el.checked ? '1' : '0') : el.value;
+ if (Array.isArray(state[el.name])) { state[el.name].push(val); }
+ else if (Array.isArray(original[el.name])) { state[el.name] = [val]; }
+ else { state[el.name] = val; }
+ });
+ return JSON.stringify(state);
+ }
+
+ var baseSnap = snapshot();
+
+ function checkDirty() {
+ var dirty = snapshot() !== baseSnap;
+ submitBtns.forEach(function(b) { b.disabled = !dirty; });
+ cancelBtns.forEach(function(b) { b.disabled = !dirty; });
+ }
+
+ function resetToBase() {
+ // Reset editable lists (DOM rebuild)
+ form.querySelectorAll('.editable-list').forEach(function(list) {
+ var addBtn = list.querySelector('.editable-list-add');
+ list.querySelectorAll('.editable-list-item').forEach(function(r) { r.remove(); });
+ (original[list.dataset.name] || []).forEach(function(v) {
+ list.insertBefore(_elMakeRow(list, v), addBtn);
+ });
+ });
+ // Reset all tracked inputs; dispatch change so custom widgets update themselves
+ form.querySelectorAll('input, select, textarea').forEach(function(el) {
+ if (!el.name || !(el.name in original) || el.closest('.editable-list')) return;
+ var orig = original[el.name];
+ var newVal = orig !== undefined ? String(orig) : '';
+ if (el.type === 'checkbox') {
+ el.checked = (orig === '1');
+ el.dispatchEvent(new Event('change', {bubbles: true}));
+ } else if (el.value !== newVal) {
+ el.value = newVal;
+ el.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+ });
+ checkDirty();
+ form.querySelectorAll('input[data-validate]').forEach(function(el) {
+ if (typeof validateEl === 'function') validateEl(el);
+ });
+ }
+
+ cancelBtns.forEach(function(b) { b.addEventListener('click', resetToBase); });
+ form.addEventListener('input', checkDirty);
+ form.addEventListener('change', checkDirty);
+ new MutationObserver(checkDirty).observe(form, {childList: true, subtree: true});
+
+ form._resetDirtyState = function() {
+ baseSnap = snapshot();
+ submitBtns.forEach(function(b) { b.disabled = true; });
+ cancelBtns.forEach(function(b) { b.disabled = true; });
+ };
});
-});
+})();
(function() {
function updateCredFields(container, provider) {
@@ -1602,6 +2140,191 @@ document.querySelectorAll('.editable-list').forEach(function(list) {
sel.addEventListener('change', function() { updateCredFields(container, this.value); });
});
})();
+
+function startApplyPoller(uuid, bar, mine) {
+ var nextIn = null;
+ var pollTimer = null;
+ var tickTimer = null;
+
+ function user() { return bar.getAttribute('data-apply-user') || ''; }
+ function esc(s) { return s.replace(/&/g,'&').replace(//g,'>'); }
+ function setHtml(html) { bar.innerHTML = html; }
+
+ function updateCountdown() {
+ if (nextIn === null) {
+ setHtml(mine ? 'Configuration saved. The command processing service is not installed. Run
core.py --install to enable it, or
core.py --apply to apply manually.'
+ : esc(user()) + ' has pending changes. The command processing service is not installed.');
+ return;
+ }
+ var timing = nextIn <= 5 ? 'momentarily'
+ : nextIn < 60 ? 'in about ' + nextIn + ' seconds'
+ : 'in about ' + Math.round(nextIn / 60) + ' minute' + (Math.round(nextIn / 60) !== 1 ? 's' : '');
+ setHtml(mine ? 'Configuration saved. Changes will be applied ' + timing + '.'
+ : esc(user()) + ' has pending changes which will be applied ' + timing + '.');
+ }
+
+ function onStatus(data) {
+ if (data.status === 'complete') {
+ bar.classList.remove('info-bar-running');
+ setHtml(mine ? 'Changes have been applied.' : esc(user()) + '\'s changes have been applied.');
+ clearTimeout(pollTimer);
+ clearTimeout(tickTimer);
+ return;
+ }
+ if (data.status === 'running') {
+ bar.classList.add('info-bar-running');
+ setHtml(mine ? 'Configuration saved. Changes are being applied now...'
+ : esc(user()) + '\'s changes are being applied now...');
+ } else {
+ bar.classList.remove('info-bar-running');
+ if (data.next_in !== null && data.next_in !== undefined) { nextIn = data.next_in; }
+ updateCountdown();
+ }
+ pollTimer = setTimeout(doPoll, 3000);
+ }
+
+ function doPoll() {
+ fetch('/api/apply-status?uuid=' + encodeURIComponent(uuid))
+ .then(function(r) { return r.json(); })
+ .then(onStatus)
+ .catch(function() { pollTimer = setTimeout(doPoll, 3000); });
+ }
+
+ function tick() {
+ if (nextIn !== null && nextIn > 0) { nextIn--; updateCountdown(); }
+ tickTimer = setTimeout(tick, 1000);
+ }
+
+ doPoll();
+ tick();
+}
+
+(function() {
+ if (typeof APPLY_UUID !== 'undefined' && APPLY_UUID) {
+ var bar = document.querySelector('.info-bar-flash.info-bar-success');
+ if (bar) startApplyPoller(APPLY_UUID, bar, true);
+ }
+ document.querySelectorAll('[data-apply-uuid]').forEach(function(bar) {
+ startApplyPoller(bar.getAttribute('data-apply-uuid'), bar, false);
+ });
+})();
+
+(function() {
+ function closeAll() {
+ document.querySelectorAll('.iface-picker-dropdown.open').forEach(function(d) {
+ d.classList.remove('open');
+ });
+ }
+ document.querySelectorAll('.iface-picker').forEach(function(picker) {
+ var btn = picker.querySelector('.iface-picker-btn');
+ var header = picker.querySelector('.iface-picker-header');
+ var dropdown = picker.querySelector('.iface-picker-dropdown');
+ var hidden = picker.querySelector('input[type="hidden"]');
+
+ function applySelection(iface) {
+ var row = dropdown.querySelector('.iface-picker-row[data-iface="' + iface + '"]');
+ if (!row) return;
+ btn.querySelector('.iface-picker-name').textContent = iface;
+ var badge = btn.querySelector('.iface-picker-badge');
+ if (!badge) { badge = document.createElement('span'); btn.appendChild(badge); }
+ badge.className = 'badge ' + row.dataset.stateClass + ' iface-picker-badge';
+ badge.textContent = row.dataset.stateLabel;
+ var stats = header.querySelector('.iface-picker-stats');
+ if (!stats) {
+ stats = document.createElement('table');
+ stats.className = 'iface-picker-stats';
+ stats.innerHTML = '
Speed MTU MAC ';
+ header.appendChild(stats);
+ }
+ stats.querySelector('tbody tr').innerHTML =
+ '
' + (row.dataset.speed || '-') + ' '
+ + '
' + (row.dataset.mtu || '-') + ' '
+ + '
' + (row.dataset.mac || '-') + ' ';
+ dropdown.querySelectorAll('.iface-picker-row').forEach(function(r) {
+ r.classList.toggle('selected', r === row);
+ });
+ }
+
+ hidden.addEventListener('change', function() { applySelection(hidden.value); });
+
+ btn.addEventListener('click', function(e) {
+ e.stopPropagation();
+ var wasOpen = dropdown.classList.contains('open');
+ closeAll();
+ if (!wasOpen) dropdown.classList.add('open');
+ });
+ dropdown.addEventListener('click', function(e) { e.stopPropagation(); });
+ dropdown.querySelectorAll('.iface-picker-row').forEach(function(row) {
+ row.addEventListener('click', function() {
+ hidden.value = this.dataset.iface;
+ closeAll();
+ hidden.dispatchEvent(new Event('change', {bubbles: true}));
+ });
+ });
+ });
+ document.addEventListener('click', closeAll);
+ document.addEventListener('keydown', function(e) {
+ if (e.key === 'Escape') closeAll();
+ });
+ document.querySelectorAll('.iface-configure-btn').forEach(function(btn) {
+ btn.addEventListener('click', function() {
+ var card = document.getElementById('iface-config-card');
+ if (!card) return;
+ var form = card.querySelector('form');
+ if (!form) return;
+ form.querySelector('[name="iface"]').value = this.dataset.iface;
+ var minMtu = this.dataset.minMtu !== '' ? parseInt(this.dataset.minMtu) : null;
+ var maxMtu = this.dataset.maxMtu !== '' ? parseInt(this.dataset.maxMtu) : null;
+ var mtuSel = form.querySelector('[name="mtu"]');
+ var originalMtu = this.dataset.mtu || '';
+ if (mtuSel) {
+ Array.from(mtuSel.options).forEach(function(opt) {
+ var v = parseInt(opt.value);
+ var out = !isNaN(v) && ((minMtu !== null && v < minMtu) || (maxMtu !== null && v > maxMtu));
+ opt.disabled = out;
+ opt.hidden = out;
+ });
+ mtuSel.value = originalMtu;
+ if (!mtuSel.value || mtuSel.selectedOptions[0].disabled) {
+ var first = Array.from(mtuSel.options).find(function(o) { return !o.disabled; });
+ if (first) mtuSel.value = first.value;
+ originalMtu = mtuSel.value;
+ }
+ }
+ var origMtuField = form.querySelector('[name="original_mtu"]');
+ if (origMtuField) origMtuField.value = originalMtu;
+ var macInput = form.querySelector('[name="mac"]');
+ var originalMac = this.dataset.mac || '';
+ if (macInput) {
+ macInput.dataset.permMac = this.dataset.permMac || '';
+ macInput.value = originalMac;
+ if (macInput._triggerValidate) macInput._triggerValidate();
+ }
+ var origMacField = form.querySelector('[name="original_mac"]');
+ if (origMacField) origMacField.value = originalMac;
+ if (form._resetDirtyState) form._resetDirtyState();
+ card.style.display = '';
+ card.scrollIntoView({behavior: 'smooth', block: 'nearest'});
+ });
+ });
+ document.querySelectorAll('.iface-config-cancel').forEach(function(a) {
+ a.addEventListener('click', function(ev) {
+ ev.preventDefault();
+ var card = document.getElementById('iface-config-card');
+ if (card) card.style.display = 'none';
+ });
+ });
+})();
+(function() {
+ var card = document.getElementById('iface-config-card');
+ if (!card) return;
+ var macInput = card.querySelector('input[name="mac"]');
+ if (!macInput || !macInput._triggerValidate) return;
+ macInput._postValidate = function() {
+ return macInput.dataset.permMac ? 'Factory default: ' + macInput.dataset.permMac : '';
+ };
+ macInput._triggerValidate();
+})();
"""
diff --git a/docker/router-dash/data/page_content.json b/docker/router-dash/data/page_content.json
index 74a9f03..bc4783b 100644
--- a/docker/router-dash/data/page_content.json
+++ b/docker/router-dash/data/page_content.json
@@ -275,7 +275,7 @@
"cells": [
{
"type": "grid_label",
- "text": "Upstream Servers"
+ "text": "DNS Providers"
},
{
"type": "grid_value",
@@ -440,6 +440,10 @@
"text": "Add Provider",
"action": "/action/add_ddns_provider",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -491,41 +495,41 @@
{
"type": "card",
"label": "Network Interfaces",
- "client_requirement": "client_is_viewer+",
+ "client_requirement": "client_is_administrator+",
"items": [
{
- "type": "table",
- "datasource": "config:interfaces",
- "empty_message": "No interfaces configured.",
- "columns": [
+ "type": "form",
+ "action": "/action/apply_interface",
+ "method": "post",
+ "items": [
{
- "label": "Type",
- "field": "iface_type",
- "class": "col-mono"
+ "type": "field",
+ "label": "WAN Interface",
+ "name": "wan_interface",
+ "input_type": "interface_picker",
+ "value": "%GENERAL_WAN_INTERFACE%",
+ "data": "%NETWORK_INTERFACE_DATA_JSON%"
},
{
- "label": "Interface",
- "field": "interface",
- "class": "col-mono"
+ "type": "field",
+ "label": "LAN Interface",
+ "name": "lan_interface",
+ "input_type": "interface_picker",
+ "value": "%GENERAL_LAN_INTERFACE%",
+ "data": "%NETWORK_INTERFACE_DATA_JSON%"
},
{
- "label": "Status",
- "field": "status",
- "render": "interface_status"
- }
- ],
- "row_actions": [
- {
- "text": "Edit",
- "class": "btn-ghost btn-sm",
- "action": "/action/apply_interface",
- "method": "inline_edit",
- "client_requirement": "client_is_administrator+",
- "fields": [
+ "type": "button_row",
+ "items": [
{
- "col": "interface",
- "input_type": "select",
- "options": "%NETWORK_INTERFACE_STATUS_OPTIONS%"
+ "type": "button_primary",
+ "text": "Save",
+ "action": "/action/apply_interface",
+ "method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -535,7 +539,87 @@
},
{
"type": "card",
- "label": "General",
+ "id": "iface-config-card",
+ "label": "Interface Configuration",
+ "hidden": true,
+ "client_requirement": "client_is_administrator+",
+ "items": [
+ {
+ "type": "form",
+ "action": "/action/apply_iface_config",
+ "method": "post",
+ "items": [
+ {
+ "type": "hidden",
+ "name": "original_mtu",
+ "value": ""
+ },
+ {
+ "type": "hidden",
+ "name": "original_mac",
+ "value": ""
+ },
+ {
+ "type": "field_row",
+ "cols": 3,
+ "items": [
+ {
+ "type": "field",
+ "label": "Interface",
+ "name": "iface",
+ "input_type": "text",
+ "readonly": true,
+ "value": ""
+ },
+ {
+ "type": "field",
+ "label": "MTU",
+ "name": "mtu",
+ "input_type": "select",
+ "value": "",
+ "options": [
+ {"value": "576", "label": "576"},
+ {"value": "1280", "label": "1280"},
+ {"value": "1492", "label": "1492"},
+ {"value": "1500", "label": "1500"},
+ {"value": "4096", "label": "4096"},
+ {"value": "9000", "label": "9000"}
+ ]
+ },
+ {
+ "type": "field",
+ "label": "MAC Address",
+ "name": "mac",
+ "input_type": "text",
+ "validate": "mac",
+ "value": ""
+ }
+ ]
+ },
+ {
+ "type": "button_row",
+ "items": [
+ {
+ "type": "button_primary",
+ "text": "Apply",
+ "action": "/action/apply_iface_config",
+ "method": "post"
+ },
+ {
+ "type": "button_secondary",
+ "text": "Cancel",
+ "action": "#",
+ "class": "iface-config-cancel"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "type": "card",
+ "label": "Logging",
"items": [
{
"type": "form",
@@ -630,7 +714,7 @@
"name": "strict_order",
"input_type": "checkbox",
"value": "%DNS_STRICT_ORDER%",
- "hint": "Query upstream servers in list order rather than in parallel."
+ "hint": "Query DNS providers in list order rather than in parallel."
},
{
"type": "field",
@@ -643,11 +727,12 @@
},
{
"type": "editable_list",
- "label": "Upstream Servers",
+ "label": "DNS Providers",
"name": "upstream_servers",
"items": "%DNS_UPSTREAM_SERVERS_JSON%",
"item_placeholder": "e.g. 1.1.1.1",
- "add_label": "Add Server",
+ "add_label": "Add Provider",
+ "validate": "ip",
"hint": "DNS resolvers queried for external hostnames. Supports IPv4 and IPv6."
},
{
@@ -660,9 +745,8 @@
"method": "post"
},
{
- "type": "button_secondary",
- "text": "Cancel",
- "action": "/view/view_upstream_dns"
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -780,6 +864,10 @@
"text": "Add Banned IP",
"action": "/action/add_banned_ip",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -845,11 +933,13 @@
},
{
"col": "host",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "domainname"
},
{
"col": "ip",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "ip"
},
{
"col": "enabled",
@@ -889,6 +979,7 @@
"label": "Hostname",
"name": "host",
"input_type": "text",
+ "validate": "domainname",
"placeholder": "e.g. server.home.local"
},
{
@@ -896,6 +987,7 @@
"label": "Resolves To",
"name": "ip",
"input_type": "text",
+ "validate": "ip",
"placeholder": "e.g. 192.168.1.100"
},
{
@@ -906,6 +998,10 @@
"text": "Add Host Override",
"action": "/action/add_host_override",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -977,7 +1073,8 @@
"fields": [
{
"col": "name",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "dashname"
},
{
"col": "description",
@@ -990,7 +1087,8 @@
},
{
"col": "url",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "url"
}
]
},
@@ -1019,6 +1117,7 @@
"label": "Name",
"name": "name",
"input_type": "text",
+ "validate": "dashname",
"placeholder": "e.g. steven-black"
},
{
@@ -1040,6 +1139,7 @@
"label": "Source URL",
"name": "url",
"input_type": "text",
+ "validate": "url",
"placeholder": "https://..."
},
{
@@ -1050,6 +1150,10 @@
"text": "Add Blocklist",
"action": "/action/add_blocklist",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -1089,40 +1193,44 @@
{
"label": "VLAN ID",
"field": "vlan_id",
- "class": "col-mono"
+ "class": "col-mono col-narrow"
},
{
"label": "Name",
- "field": "name"
+ "field": "name",
+ "class": "col-narrow"
},
{
"label": "Interface",
"field": "interface",
- "class": "col-mono"
+ "class": "col-mono col-narrow"
},
{
"label": "Subnet",
"field": "subnet",
- "class": "col-mono"
+ "class": "col-mono col-narrow"
},
{
"label": "Mask",
"field": "subnet_mask",
- "class": "col-mono"
+ "class": "col-mono col-narrow"
},
{
"label": "Blocklists",
"field": "use_blocklists",
+ "class": "col-expand",
"render": "tag_list"
},
{
"label": "RADIUS Default",
"field": "radius_default",
+ "class": "col-narrow",
"render": "badge_enabled_disabled"
},
{
"label": "mDNS Reflection",
"field": "mdns_reflection",
+ "class": "col-narrow",
"render": "badge_enabled_disabled"
}
],
@@ -1136,7 +1244,8 @@
"fields": [
{
"col": "name",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "dashname"
},
{
"col": "subnet",
@@ -1196,6 +1305,7 @@
"label": "VLAN Name",
"name": "name",
"input_type": "text",
+ "validate": "dashname",
"hint": "Lowercase letters, digits, hyphens. E.g. iot"
},
{
@@ -1277,6 +1387,10 @@
"method": "post",
"class": "add-vlan-btn",
"disabled": true
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -1412,6 +1526,7 @@
"label": "Source",
"name": "src_ip_or_subnet",
"input_type": "text",
+ "validate": "ipv4cidr",
"placeholder": "e.g. 192.168.20.0/24"
},
{
@@ -1419,6 +1534,7 @@
"label": "Destination",
"name": "dst_ip_or_subnet",
"input_type": "text",
+ "validate": "ipv4",
"placeholder": "e.g. 192.168.10.100"
},
{
@@ -1426,6 +1542,7 @@
"label": "Dest Port",
"name": "dst_port",
"input_type": "text",
+ "validate": "port",
"placeholder": "e.g. 8009"
},
{
@@ -1436,6 +1553,10 @@
"text": "Add Exception",
"action": "/action/add_inter_vlan",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -1571,6 +1692,7 @@
"label": "Ext Port",
"name": "dest_port",
"input_type": "text",
+ "validate": "port",
"placeholder": "e.g. 25565"
},
{
@@ -1578,6 +1700,7 @@
"label": "NAT IP",
"name": "nat_ip",
"input_type": "text",
+ "validate": "ipv4",
"placeholder": "e.g. 192.168.1.50"
},
{
@@ -1585,6 +1708,7 @@
"label": "NAT Port",
"name": "nat_port",
"input_type": "text",
+ "validate": "port",
"placeholder": "e.g. 25565"
},
{
@@ -1595,6 +1719,10 @@
"text": "Add Rule",
"action": "/action/add_port_forward",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -1714,15 +1842,18 @@
},
{
"col": "hostname",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "networkname"
},
{
"col": "mac",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "mac"
},
{
"col": "ip",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "ipv4"
},
{
"col": "radius_client",
@@ -1774,6 +1905,7 @@
"label": "Hostname",
"name": "hostname",
"input_type": "text",
+ "validate": "networkname",
"placeholder": "e.g. nas"
},
{
@@ -1781,6 +1913,7 @@
"label": "MAC Address",
"name": "mac",
"input_type": "text",
+ "validate": "mac",
"placeholder": "e.g. aa:bb:cc:dd:ee:ff"
},
{
@@ -1788,6 +1921,7 @@
"label": "IP Address",
"name": "ip",
"input_type": "text",
+ "validate": "ipv4",
"placeholder": "e.g. 192.168.10.50"
},
{
@@ -1805,6 +1939,10 @@
"text": "Add Reservation",
"action": "/action/add_dhcp_reservation",
"method": "post"
+ },
+ {
+ "type": "button_cancel",
+ "text": "Cancel"
}
]
}
@@ -1841,11 +1979,6 @@
"label": "Peer",
"field": "peer_name"
},
- {
- "label": "Interface",
- "field": "interface",
- "class": "col-mono"
- },
{
"label": "Tunnel IP",
"field": "tunnel_ip",
@@ -1883,7 +2016,12 @@
"field": "name"
},
{
- "label": "IP",
+ "label": "Assigned VLAN",
+ "field": "vlan_display",
+ "class": "col-mono"
+ },
+ {
+ "label": "Assigned IP",
"field": "ip",
"class": "col-mono"
},
@@ -1912,7 +2050,8 @@
"fields": [
{
"col": "name",
- "input_type": "text"
+ "input_type": "text",
+ "validate": "dashname"
},
{
"col": "split_tunnel",
@@ -1955,14 +2094,23 @@
"label": "Name",
"name": "peer_name",
"input_type": "text",
+ "validate": "dashname",
"placeholder": "e.g. laptop",
"hint": "Friendly name for this peer."
},
{
"type": "field",
- "label": "IP Address",
+ "label": "Assigned VLAN",
+ "name": "peer_vlan",
+ "input_type": "select",
+ "options": "%VPN_VLAN_OPTIONS%"
+ },
+ {
+ "type": "field",
+ "label": "Assigned IP",
"name": "peer_ip",
"input_type": "text",
+ "validate": "ipv4",
"placeholder": "e.g. 192.168.40.2",
"hint": "Static IP assigned to this peer within the VPN subnet."
},
@@ -1973,6 +2121,13 @@
"input_type": "checkbox",
"hint": "Route only VPN subnet traffic through the tunnel. When unchecked all traffic is routed through the VPN."
},
+ {
+ "type": "field",
+ "label": "Enabled",
+ "name": "enabled",
+ "input_type": "checkbox",
+ "checked": true
+ },
{
"type": "button_row",
"items": [
@@ -2017,6 +2172,7 @@
"label": "Server Endpoint",
"name": "vpn_server_endpoint",
"input_type": "text",
+ "validate": "endpoint",
"value": "%VPN_SERVER_ENDPOINT%",
"placeholder": "e.g. vpn.example.com",
"hint": "Publicly reachable hostname or IP of this server, embedded in client config files."
@@ -2026,6 +2182,7 @@
"label": "Domain",
"name": "vpn_domain",
"input_type": "text",
+ "validate": "dashname",
"value": "%VPN_DOMAIN%",
"placeholder": "e.g. local",
"hint": "DNS search domain pushed to VPN clients."
@@ -2035,6 +2192,7 @@
"label": "DNS Override",
"name": "vpn_dns_server",
"input_type": "text",
+ "validate": "ipv4",
"value": "%VPN_DNS_SERVER%",
"placeholder": "Leave blank to use gateway IP (%VPN_GATEWAY%)",
"hint": "Explicit DNS server pushed to peers. Defaults to the gateway IP."
diff --git a/docker/router-dash/docker-compose.yml b/docker/router-dash/docker-compose.yml
index 1caf2dd..abebb05 100644
--- a/docker/router-dash/docker-compose.yml
+++ b/docker/router-dash/docker-compose.yml
@@ -11,6 +11,7 @@ services:
- $HOME/router:/configs
- $HOME/router/validation.py:/app/validation.py
- /sys/class/net:/sys/class/net:ro
+ - /sys/devices:/sys/devices:ro
environment:
- INITIAL_MANAGER_EMAIL=mgrotke@gmail.com
- SECRET_KEY=ey8hSQCCYE5kQXV8nOg1CB44LSd3AoUet2ZBc3aZlFrwBbazE7aHcxXWyuT97eAObet5jmOL0CjMg0rB1hE4d2SBVYHPfl8De55EiFv307r1QP3Mf5XgOSSCxD3TuD
diff --git a/router/core.py b/router/core.py
index 945b4c0..c6bc10d 100644
--- a/router/core.py
+++ b/router/core.py
@@ -111,9 +111,18 @@ DNSMASQ_CONF_DIR = Path("/etc/dnsmasq-router")
LEASES_DIR = Path("/var/lib/misc")
NETWORKD_DIR = Path("/etc/systemd/network")
SYSTEMD_DIR = Path("/etc/systemd/system")
-TIMER_NAME = "dns-blocklists-update"
-TIMER_FILE = SYSTEMD_DIR / f"{TIMER_NAME}.timer"
-TIMER_SVC_FILE = SYSTEMD_DIR / f"{TIMER_NAME}.service"
+BLIST_TIMER_NAME = "dns-blocklists-update"
+BLIST_TIMER_FILE = SYSTEMD_DIR / f"{BLIST_TIMER_NAME}.timer"
+BLIST_TIMER_SVC_FILE = SYSTEMD_DIR / f"{BLIST_TIMER_NAME}.service"
+DASHB_TIMER_NAME = "router-dashboard-queue"
+DASHB_TIMER_FILE = SYSTEMD_DIR / f"{DASHB_TIMER_NAME}.timer"
+DASHB_TIMER_SVC_FILE = SYSTEMD_DIR / f"{DASHB_TIMER_NAME}.service"
+DASHB_TIMER_INTERVAL_SEC = 60
+DASHB_QUEUE_FILE = SCRIPT_DIR / ".dashboard-queue"
+DASHB_DONE_FILE = SCRIPT_DIR / ".dashboard-done"
+DASHB_LAST_RUN_FILE = SCRIPT_DIR / ".dashboard-last-run"
+DASHB_LOCK_FILE = SCRIPT_DIR / ".dashboard-lock"
+DASHB_SCRIPT_FILE = SCRIPT_DIR / "do_dashboard_queue.sh"
RESOLV_CONF = Path("/etc/resolv.conf")
NAT_SERVICE_NAME = "core-nat"
NAT_SERVICE_FILE = SYSTEMD_DIR / f"{NAT_SERVICE_NAME}.service"
@@ -1729,20 +1738,77 @@ def install_timer(data):
"",
])
- for path, content in ((TIMER_FILE, timer_content), (TIMER_SVC_FILE, service_content)):
+ for path, content in ((BLIST_TIMER_FILE, timer_content), (BLIST_TIMER_SVC_FILE, service_content)):
if not path.exists() or path.read_text() != content:
path.write_text(content)
print(f"Written: {path}")
subprocess.run(["systemctl", "daemon-reload"], capture_output=True, text=True)
- subprocess.run(["systemctl", "enable", "--now", f"{TIMER_NAME}.timer"],
+ subprocess.run(["systemctl", "enable", "--now", f"{BLIST_TIMER_NAME}.timer"],
capture_output=True, text=True)
- print(f"Timer {TIMER_NAME}.timer enabled (runs daily at {execute_time}).")
+ print(f"Timer {BLIST_TIMER_NAME}.timer enabled (runs daily at {execute_time}).")
+
+def install_dashboard_timer():
+ """Install the 1-minute dashboard-queue timer that processes .dashboard-queue."""
+ timer_content = "\n".join([
+ "# Generated by core.py -- do not edit manually.",
+ "",
+ "[Unit]",
+ "Description=Router dashboard pending-update processor",
+ "",
+ "[Timer]",
+ f"OnActiveSec={DASHB_TIMER_INTERVAL_SEC}s",
+ f"OnUnitActiveSec={DASHB_TIMER_INTERVAL_SEC}s",
+ "AccuracySec=10s",
+ "",
+ "[Install]",
+ "WantedBy=timers.target",
+ "",
+ ])
+
+ service_content = "\n".join([
+ "# Generated by core.py -- do not edit manually.",
+ "",
+ "[Unit]",
+ "Description=Router dashboard update processor",
+ "",
+ "[Service]",
+ "Type=oneshot",
+ f"ExecStart=/bin/bash {DASHB_SCRIPT_FILE}",
+ "",
+ ])
+
+ for path, content in ((DASHB_TIMER_FILE, timer_content), (DASHB_TIMER_SVC_FILE, service_content)):
+ if not path.exists() or path.read_text() != content:
+ path.write_text(content)
+ print(f"Written: {path}")
+
+ subprocess.run(["systemctl", "daemon-reload"], capture_output=True, text=True)
+ subprocess.run(["systemctl", "enable", f"{DASHB_TIMER_NAME}.timer"],
+ capture_output=True, text=True)
+ active = subprocess.run(
+ ["systemctl", "is-active", f"{DASHB_TIMER_NAME}.timer"],
+ capture_output=True, text=True
+ ).stdout.strip() == "active"
+ verb = "restart" if active else "start"
+ subprocess.run(["systemctl", verb, f"{DASHB_TIMER_NAME}.timer"],
+ capture_output=True, text=True)
+ print(f"Timer {DASHB_TIMER_NAME}.timer enabled (runs every {DASHB_TIMER_INTERVAL_SEC}s).")
+
+def remove_dashboard_timer():
+ subprocess.run(["systemctl", "disable", "--now", f"{DASHB_TIMER_NAME}.timer"],
+ capture_output=True, text=True)
+ for f in (DASHB_TIMER_FILE, DASHB_TIMER_SVC_FILE):
+ if f.exists():
+ f.unlink()
+ print(f"Removed: {f}")
+ else:
+ print(f"Not found, skipping: {f}")
def remove_timer():
- subprocess.run(["systemctl", "disable", "--now", f"{TIMER_NAME}.timer"],
+ subprocess.run(["systemctl", "disable", "--now", f"{BLIST_TIMER_NAME}.timer"],
capture_output=True, text=True)
- for f in (TIMER_FILE, TIMER_SVC_FILE):
+ for f in (BLIST_TIMER_FILE, BLIST_TIMER_SVC_FILE):
if f.exists():
f.unlink()
print(f"Removed: {f}")
@@ -2252,12 +2318,12 @@ def apply_nftables(data, dry_run=False):
dst = r.get("dst_ip_or_subnet") or r.get("dst_ip", "")
try:
# Single IP -- check if it's in an active subnet
- addr = _ipaddress.IPv4Address(dst)
+ addr = ipaddress.IPv4Address(dst)
return any(addr in net for net in active_subnets)
except ValueError:
try:
# Subnet -- check if it overlaps with any active subnet
- net = _ipaddress.IPv4Network(dst, strict=False)
+ net = ipaddress.IPv4Network(dst, strict=False)
return any(net.overlaps(s) for s in active_subnets)
except ValueError:
return True
@@ -2636,7 +2702,7 @@ def show_status(data):
units.append((vlan_service_name(vlan), "(wg0 not up)", "active"))
else:
units.append((vlan_service_name(vlan), None, "active"))
- units.append((f"{TIMER_NAME}.timer", None, "active"))
+ units.append((f"{BLIST_TIMER_NAME}.timer", None, "active"))
units.append((NAT_SERVICE_NAME, None, "inactive")) # oneshot - exits after running
units.append(("freeradius", None, "active"))
units.append(("avahi-daemon", None, "active"))
@@ -2652,12 +2718,12 @@ def show_status(data):
# Timer next trigger
r = subprocess.run(
- ["systemctl", "show", f"{TIMER_NAME}.timer", "--property=NextElapseUSecRealtime,NextElapseUSecMonotonic"],
+ ["systemctl", "show", f"{BLIST_TIMER_NAME}.timer", "--property=NextElapseUSecRealtime,NextElapseUSecMonotonic"],
capture_output=True, text=True
)
# Fall back to human-readable 'Trigger' field from status output
r2 = subprocess.run(
- ["systemctl", "status", f"{TIMER_NAME}.timer", "--no-pager"],
+ ["systemctl", "status", f"{BLIST_TIMER_NAME}.timer", "--no-pager"],
capture_output=True, text=True
)
for line in r2.stdout.splitlines():
@@ -2983,6 +3049,7 @@ def show_metrics(data):
def stop_instances(data):
"""Remove timer and stop all per-VLAN instances (config files preserved)."""
remove_timer()
+ remove_dashboard_timer()
print()
for vlan in data["vlans"]:
svc = vlan_service_name(vlan)
@@ -3193,7 +3260,7 @@ def _dry_run_timer(data):
print("-- Timer (dry-run) ---------------------------------------------------")
general = data.get("general", {})
execute_time = general.get("daily_execute_time_24hr_local", "02:30")
- for path, label in [(TIMER_FILE, "timer unit"), (TIMER_SVC_FILE, "service unit")]:
+ for path, label in [(BLIST_TIMER_FILE, "timer unit"), (BLIST_TIMER_SVC_FILE, "service unit")]:
action = "update" if path.exists() else "create and enable"
print(f" Would {action}: {path}")
print(f" Schedule: daily at {execute_time} local time (Persistent=true - catches up if missed)")
@@ -3213,7 +3280,7 @@ def _dry_run_disable(data, iface, use_dhcp, static_cidr, resolv_ok, dns_choice,
print()
print("-- Stopping router services (dry-run) --------------------------------")
- print(f" Would disable and stop: {TIMER_NAME}.timer")
+ print(f" Would disable and stop: {BLIST_TIMER_NAME}.timer")
for vlan in data["vlans"]:
svc = vlan_service_name(vlan)
conf = vlan_conf_file(vlan)
@@ -3484,6 +3551,13 @@ def cmd_install(data):
check_root()
check_dependencies()
print("All required packages are installed.")
+ install_dashboard_timer()
+ # Create blank dotfiles for dashboard updates
+ for dotfile in (DASHB_QUEUE_FILE, DASHB_DONE_FILE, DASHB_LAST_RUN_FILE, DASHB_LOCK_FILE):
+ if not dotfile.exists():
+ dotfile.touch()
+ chown_to_script_dir_owner(dotfile)
+ print(f"Created: {dotfile}")
def cmd_apply(data, dry_run=False):
@@ -3580,6 +3654,10 @@ def cmd_apply(data, dry_run=False):
install_timer(data)
print()
+ print("-- Dashboard timer ---------------------------------------------------")
+ install_dashboard_timer()
+ print()
+
print("-- Boot service ------------------------------------------------------")
install_nat_service()
print()