diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor index a6e9fbc..f074ea4 100644 --- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigFieldDisplay.razor @@ -44,13 +44,10 @@ } else if (Descriptor.IsMultiValue) { - var items = _hasPendingChange && _effectiveValue is IReadOnlyList pendingList - ? pendingList.Select(s => new ValueWithSource(s, null)).ToList() - : Descriptor.GetItems(); - var allReadonly = items != null && items.Count > 0 && items.All(i => i.Source?.IsReadOnly == true); - } else @@ -98,6 +95,15 @@ else private bool _wasActive; private ExitAction _exitAction = ExitAction.None; + /// Cached for multi-value: items to pass to the row (with sources preserved for draft merge). + private IReadOnlyList? _multiValueItems; + /// Cached for multi-value: true when there is an uncommitted draft list. + private bool _multiValueHasDraft; + /// Cached for multi-value: row-level source for badge (readonly when all items readonly and not edit mode). + private ConfigValueSource? _multiValueRowSource; + /// Cached for multi-value: whether row should show ok/cancel (session pending or local draft). + private bool _multiValueHasPendingOrDraft; + protected override void OnParametersSet() { _customFragment = RenderFragmentRegistry.BuildFieldComponentFragment(Descriptor.SectionId, Descriptor.OptionName); @@ -112,6 +118,8 @@ else : Descriptor.GetValue(); _hasPendingChange = pending != null; _effectiveValue = pending != null ? pending.NewValue : descriptorValue; + if (Descriptor.IsMultiValue) + ComputeMultiValueState(Descriptor.GetItems(), pending?.NewValue as IReadOnlyList, _draftValue as IReadOnlyList); if (!_wasActive && IsActive) _valueAtActivation = descriptorValue; if (_wasActive && !IsActive && _exitAction == ExitAction.None) @@ -121,6 +129,45 @@ else _wasActive = IsActive; } + private void ComputeMultiValueState(IReadOnlyList? descriptorItems, IReadOnlyList? pendingList, IReadOnlyList? draftList) + { + var descriptorValues = descriptorItems?.Select(i => i.Value).ToList() ?? new List(); + _multiValueHasDraft = draftList != null && !ValuesEqual(descriptorValues, draftList); + if (_multiValueHasDraft && draftList != null) + { + _multiValueItems = BuildItemsWithSource(descriptorItems, draftList); + } + else if (_hasPendingChange && pendingList != null) + { + _multiValueItems = BuildItemsWithSource(descriptorItems, pendingList); + } + else + { + _multiValueItems = descriptorItems; + } + var allReadonly = _multiValueItems != null && _multiValueItems.Count > 0 && _multiValueItems.All(i => i.Source?.IsReadOnly == true); + _multiValueRowSource = allReadonly && !IsEditMode ? _multiValueItems?.FirstOrDefault()?.Source : null; + _multiValueHasPendingOrDraft = _hasPendingChange || _multiValueHasDraft; + } + + private static IReadOnlyList BuildItemsWithSource(IReadOnlyList? descriptorItems, IReadOnlyList values) + { + var pool = descriptorItems?.ToList() ?? new List(); + var list = new List(values.Count); + foreach (var s in values) + { + var idx = pool.FindIndex(x => string.Equals(x.Value, s, StringComparison.Ordinal)); + if (idx >= 0) + { + list.Add(pool[idx]); + pool.RemoveAt(idx); + } + else + list.Add(new ValueWithSource(s, null)); + } + return list; + } + private void HandleValueChanged(object? value) { _draftValue = value; @@ -145,7 +192,13 @@ else } var source = Descriptor.GetSource(); - var args = new EffectiveConfigEditCommittedArgs(Descriptor.SectionId, Descriptor.OptionName, _valueAtActivation, newValue, source?.FilePath); + object? valueToCommit = newValue; + if (newValue is IReadOnlyList list) + { + var deduped = list.Distinct(StringComparer.Ordinal).ToList(); + valueToCommit = deduped; + } + var args = new EffectiveConfigEditCommittedArgs(Descriptor.SectionId, Descriptor.OptionName, _valueAtActivation, valueToCommit, source?.FilePath); if (Ui != null) await Ui.CommitFieldAsync(args); } @@ -171,6 +224,9 @@ else private void HandleMultiValueChanged(IReadOnlyList values) { _draftValue = values.ToList(); + if (Descriptor.IsMultiValue) + ComputeMultiValueState(Descriptor.GetItems(), _effectiveValue as IReadOnlyList, _draftValue as IReadOnlyList); + StateHasChanged(); } private async Task HandleConfirmEdit() diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueItem.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueItem.razor index 95e04a5..5574ff6 100644 --- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueItem.razor +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueItem.razor @@ -2,9 +2,12 @@ @using DnsmasqWebUI.Models.Dnsmasq @using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig - + @Value - + @code { @@ -13,4 +16,7 @@ [Parameter] public string OptionName { get; set; } = ""; [Parameter] public bool IsEditMode { get; set; } [Parameter] public string? ReadonlyBadgeAnchorId { get; set; } + [Parameter] public string? FieldKey { get; set; } + [Parameter] public bool ReadonlyClickActivatesField { get; set; } + [Parameter] public string? ReadonlyTitleOverride { get; set; } } diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor new file mode 100644 index 0000000..2e147f5 --- /dev/null +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor @@ -0,0 +1,167 @@ +@namespace DnsmasqWebUI.Components.EffectiveConfig +@using DnsmasqWebUI.Models.Dnsmasq +@using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig + + +
    + @if (SourceItems?.Count > 0) + { + @for (var i = 0; i < SourceItems.Count; i++) + { + var item = SourceItems[i]; + var anchorId = $"{ReadonlyBadgeAnchorIdBase}-{i}"; + var itemReadonly = item.Source?.IsReadOnly == true; + var rowIndex = i; + var rowValue = item.Value; + +
  1. + @if (_editingIndex == rowIndex && !itemReadonly) + { + + + + + + } + else + { + @rowValue + + + + @if (!itemReadonly) + { + + } + + } +
    2. + } + } + else + { +
  2. + (none) +
    3. + } + + @if (AllowAddManagedValue) + { +
  3. + @if (_addingNew) + { + + + + + + } + else + { + + } +
    4. + } +
+ + +@code { + [Parameter] public IReadOnlyList? SourceItems { get; set; } + [Parameter] public string OptionName { get; set; } = ""; + [Parameter] public string ReadonlyBadgeAnchorIdBase { get; set; } = ""; + + [Parameter] public bool IsEditMode { get; set; } + [Parameter] public bool AllowAddManagedValue { get; set; } = true; + + [Parameter] public EventCallback> OnValuesChanged { get; set; } + + private const string AddItemKey = "add-item"; + private int? _editingIndex; + private bool _addingNew; + private string _draftValue = ""; + + private void BeginEdit(int index, string current) + { + _addingNew = false; + _editingIndex = index; + _draftValue = current; + } + + private void BeginAdd() + { + _editingIndex = null; + _addingNew = true; + _draftValue = ""; + } + + private void CancelInline() + { + _editingIndex = null; + _addingNew = false; + _draftValue = ""; + } + + private async Task SaveEdit(int index) + { + var next = (SourceItems ?? Array.Empty()) + .Select(x => x.Value) + .ToList(); + if (index < 0 || index >= next.Count) return; + + next[index] = (_draftValue ?? "").Trim(); + await OnValuesChanged.InvokeAsync(next); + CancelInline(); + } + + private async Task SaveNew() + { + var value = (_draftValue ?? "").Trim(); + if (value.Length == 0) return; + + var next = (SourceItems ?? Array.Empty()) + .Select(x => x.Value) + .ToList(); + + next.Add(value); + await OnValuesChanged.InvokeAsync(next); + CancelInline(); + } + + private async Task RemoveAt(int index) + { + if (SourceItems == null || index < 0 || index >= SourceItems.Count) return; + var item = SourceItems[index]; + if (item?.Source?.IsReadOnly == true) return; + + var next = (SourceItems ?? Array.Empty()) + .Select(x => x.Value) + .ToList(); + if (index < 0 || index >= next.Count) return; + + next.RemoveAt(index); + await OnValuesChanged.InvokeAsync(next); + } +} diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor.css b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor.css new file mode 100644 index 0000000..16c6a92 --- /dev/null +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueListEditor.razor.css @@ -0,0 +1,65 @@ +/* Editor block: distinct from display mode (border + background) */ +.ec-multi-list-editor { + display: block; + padding: 0.75rem 1rem; + margin-top: 0.25rem; + border: 1px solid var(--bs-border-color, #dee2e6); + border-radius: 0.375rem; + background-color: var(--bs-body-bg, #fff); +} + +.ec-multi-list-editor .ec-field-value-list { + margin-bottom: 0; +} + +.ec-multi-list-row { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.5rem; + min-height: 2rem; +} + +.ec-multi-list-row .ec-field-value-item { + min-width: 0; +} + +.ec-multi-list-row .status-badge-inline { + display: inline-flex; + align-items: center; + gap: 0.25rem; + flex-shrink: 0; +} + +.ec-multi-list-row .form-control.ec-multi-list-input { + max-width: 28rem; + flex-shrink: 0; +} + +.ec-multi-list-empty-hint { + list-style: none; + margin-left: -1.25rem; +} + +.ec-multi-list-add-item { + list-style: none; + margin-left: -1.25rem; + margin-top: 0.25rem; + padding-top: 0.25rem; + border-top: 1px dashed var(--bs-border-color, #dee2e6); + flex-wrap: nowrap; +} + +.ec-multi-list-add-item .form-control.ec-multi-list-input { + flex: 1 1 auto; + max-width: none; + min-width: 12rem; +} + +.ec-multi-list-add-item .status-badge-inline { + margin-left: auto; +} + +.ec-multi-list-add-btn { + font-size: 0.875rem; +} diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor index 095d387..3044d35 100644 --- a/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Fields/EffectiveConfigMultiValueRow.razor @@ -6,13 +6,17 @@ @Label: @if (IsActiveEditor) { - - - - + + } else { @@ -23,7 +27,7 @@ @foreach (var (item, index) in Items!.Select((item, index) => (item, index))) { var anchorId = ReadonlyBadgeAnchorIdBase != null ? ReadonlyBadgeAnchorIdBase + "-" + index : ""; -
    • +
    • } } @@ -31,10 +35,6 @@ { (none) } -     } @@ -56,22 +56,4 @@ [Parameter] public EventCallback OnConfirmRequested { get; set; } [Parameter] public EventCallback OnCancelRequested { get; set; } [Parameter] public EventCallback OnRevertRequested { get; set; } - - private string _editLines = ""; - - protected override void OnParametersSet() - { - if (Items != null && Items.Count > 0) - _editLines = string.Join("\n", Items.Select(i => i.Value)); - else - _editLines = ""; - } - - private async Task OnLinesInput(ChangeEventArgs e) - { - var text = e.Value?.ToString() ?? ""; - _editLines = text; - var lines = text.Split('\n', StringSplitOptions.RemoveEmptyEntries).Select(l => l.Trim()).Where(l => l.Length > 0).ToList(); - await ItemsChanged.InvokeAsync(lines); - } } diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveFlow.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveFlow.razor index 88c870e..c425dae 100644 --- a/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveFlow.razor +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveFlow.razor @@ -28,6 +28,7 @@ Review, Saving, WriteFailed, + ValidateFailed, ReloadFailed, RestoreInProgress, RestoreFailed @@ -83,7 +84,9 @@ return; } - if (result.Saved && !result.Restarted) + if (result.Saved && result.IsValidateFailed) + _saveState = SaveUiState.ValidateFailed; + else if (result.Saved && !result.Restarted) _saveState = SaveUiState.ReloadFailed; else if (!result.Saved) _saveState = SaveUiState.WriteFailed; diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor index 5f52bde..3f8e1ae 100644 --- a/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Modals/EffectiveConfigSaveModal.razor @@ -15,7 +15,28 @@ {
    -

    @(SaveState == EffectiveConfigSaveFlow.SaveUiState.Saving ? "Saving and restarting…" : "Restoring backup and restarting…")

    +

    @(SaveState == EffectiveConfigSaveFlow.SaveUiState.Saving ? "Saving, validating and restarting…" : "Restoring backup and restarting…")

    +
    + } + else if (SaveState == EffectiveConfigSaveFlow.SaveUiState.ValidateFailed && SaveResult != null) + { +
    +
    + +
    + Config was saved, but validation failed. Restart was not attempted. You can restore the backup or keep editing. +
    +
    + @if (SaveResult.BackupPath != null) + { +

    + Backup: @SaveResult.BackupPath +

    + } +
    +

    Validation output

    + 
    @GetValidationFailedOutput(SaveResult)
    +
    } else if (SaveState == EffectiveConfigSaveFlow.SaveUiState.WriteFailed && SaveResult != null) @@ -129,7 +150,7 @@ }
    - @if (SaveState == EffectiveConfigSaveFlow.SaveUiState.ReloadFailed && SaveResult?.BackupPath != null) + @if ((SaveState == EffectiveConfigSaveFlow.SaveUiState.ReloadFailed || SaveState == EffectiveConfigSaveFlow.SaveUiState.ValidateFailed) && SaveResult?.BackupPath != null) { @@ -172,6 +193,18 @@ private string? ManagedFilePath => Status?.ManagedFilePath; + private static string GetValidationFailedOutput(EffectiveConfigSaveResult result) + { + var err = (result.ValidationStdErr ?? "").Trim(); + var outp = (result.ValidationStdOut ?? "").Trim(); + if (err.Length > 0 && outp.Length > 0) + return err + "\n\n" + outp; + if (err.Length > 0) return err; + if (outp.Length > 0) return outp; + var exitInfo = result.ValidationExitCode >= 0 ? $"Exit code: {result.ValidationExitCode}." : ""; + return string.IsNullOrEmpty(exitInfo) ? "(No output captured)" : exitInfo + " (No output captured)"; + } + private static string GetRestartFailedOutput(EffectiveConfigSaveResult result) { var err = (result.RestartStdErr ?? "").Trim(); diff --git a/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/OptionStateBadge.razor b/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/OptionStateBadge.razor index 5f06319..5ee9408 100644 --- a/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/OptionStateBadge.razor +++ b/src/DnsmasqWebUI/Components/EffectiveConfig/Popovers/OptionStateBadge.razor @@ -4,17 +4,25 @@ @if (Source?.IsReadOnly == true) { - @if (IsInteractive && Ui != null) + var readonlyTitle = !string.IsNullOrEmpty(ReadonlyTitleOverride) ? ReadonlyTitleOverride : Source?.GetReadOnlyTooltip(); + if (ReadonlyClickActivatesField && Ui != null && !string.IsNullOrEmpty(FieldKey)) { + } + else if (IsInteractive && Ui != null) + { + } else { } } @@ -71,6 +79,12 @@ else if (ShowEditableBadge) [Parameter] public EventCallback OnCancelRequested { get; set; } [Parameter] public EventCallback OnRevertRequested { get; set; } [Parameter] public string? FieldKey { get; set; } + /// Optional: when set, editable-badge click invokes this instead of activating the field by key (e.g. list editor per-item edit). + [Parameter] public EventCallback OnEditableClickRequested { get; set; } + /// When true, readonly badge click activates the field for editing instead of showing the readonly popover (e.g. for multi-value where new items can still be added). + [Parameter] public bool ReadonlyClickActivatesField { get; set; } + /// Optional tooltip for readonly badge when is true (e.g. "New values can still be added. Click to edit."). + [Parameter] public string? ReadonlyTitleOverride { get; set; } [CascadingParameter] public EffectiveConfigUiContext? Ui { get; set; } private async Task OnConfirmClick() @@ -93,10 +107,15 @@ else if (ShowEditableBadge) await OnRevertRequested.InvokeAsync(); } - private Task OnEditableClick() + private async Task OnEditableClick() { - if (Ui == null || string.IsNullOrEmpty(FieldKey)) return Task.CompletedTask; - return Ui.ActivateFieldAsync(FieldKey); + if (OnEditableClickRequested.HasDelegate) + { + await OnEditableClickRequested.InvokeAsync(); + return; + } + if (Ui != null && !string.IsNullOrEmpty(FieldKey)) + await Ui.ActivateFieldAsync(FieldKey); } private Task OnReadonlyClick() diff --git a/src/DnsmasqWebUI/Components/Layout/NavMenu.razor b/src/DnsmasqWebUI/Components/Layout/NavMenu.razor index 5e42e66..0cee9eb 100644 --- a/src/DnsmasqWebUI/Components/Layout/NavMenu.razor +++ b/src/DnsmasqWebUI/Components/Layout/NavMenu.razor @@ -1,8 +1,10 @@ @namespace DnsmasqWebUI.Components.Layout @using System.Reflection +@using DnsmasqWebUI.Infrastructure.Services.UI.Notifications.Abstractions @inject IOptions AppOptions @inject ISettingsModalService SettingsModalService @inject IUpdateCheckService UpdateCheckService +@inject INotificationService NotificationService @implements IDisposable
    @@ -110,6 +112,12 @@ private async Task ForceCheckAsync() { await UpdateCheckService.CheckNowAsync(); + if (UpdateCheckService.LastCheckFailed) + NotificationService.ShowError("Update check failed: " + (UpdateCheckService.LastCheckErrorMessage ?? "Unknown error.")); + else if (UpdateCheckService.NewerVersionAvailable) + NotificationService.ShowSuccess($"New version {UpdateCheckService.NewerVersionTag} is available."); + else + NotificationService.ShowInfo("You're up to date."); } private void OpenAllSettings() => SettingsModalService.Open(SettingsModalContext.All, "Settings"); diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs index e906367..0780c50 100644 --- a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs +++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Config/DnsmasqConfigService.cs @@ -64,18 +64,54 @@ public class DnsmasqConfigService : IDnsmasqConfigService return "line:" + e.LineNumber; } - /// When managedHostsPath is set, ensures the managed config has exactly one addn-hosts line pointing to it (replaces the first AddnHosts line or inserts at start). So dnsmasq loads our managed hosts file last. - private static void EnsureOneAddnHostsLine(List configLines, string? managedHostsPath) + /// + /// Applies managed-config invariants (system-owned directives) that are not user option edits. + /// This runs at write-time and is intentionally outside the pending-changes model. + /// + private static void EnsureManagedConfigInvariants(List configLines, string? managedHostsPath) { - if (string.IsNullOrEmpty(managedHostsPath)) + if (!string.IsNullOrEmpty(managedHostsPath)) + { + EnsureUniqueDirective( + configLines, + DnsmasqConfKeys.AddnHosts, + managedHostsPath, + lineNumber => new AddnHostsLine { LineNumber = lineNumber, AddnHostsPath = managedHostsPath }); + } + } + + /// + /// Ensures exactly one directive with the given key/value exists in the managed file. + /// If multiple exist, keeps the first and removes the rest. + /// + private static void EnsureUniqueDirective( + List configLines, + string key, + string value, + Func? lineFactory = null) + { + var matchingIndices = new List(); + for (var i = 0; i < configLines.Count; i++) + { + var raw = DnsmasqConfFileLineParser.ToLine(configLines[i]); + var kv = DnsmasqConfDirectiveParser.TryParseKeyValue(raw); + if (kv != null && + string.Equals(kv.Value.key, key, StringComparison.Ordinal) && + string.Equals(kv.Value.value.Trim(), value, StringComparison.Ordinal)) + matchingIndices.Add(i); + } + + if (matchingIndices.Count == 0) + { + configLines.Insert(0, lineFactory?.Invoke(1) ?? new OtherLine { LineNumber = 1, RawLine = $"{key}={value}" }); return; - var idx = configLines.FindIndex(c => c.Kind == DnsmasqConfLineKind.AddnHosts); - var lineNumber = idx >= 0 ? configLines[idx].LineNumber : 1; - var line = new AddnHostsLine { LineNumber = lineNumber, AddnHostsPath = managedHostsPath }; - if (idx >= 0) - configLines[idx] = line; - else - configLines.Insert(0, line); + } + + var keepIdx = matchingIndices[0]; + var keepLineNumber = configLines[keepIdx].LineNumber; + configLines[keepIdx] = lineFactory?.Invoke(keepLineNumber) ?? new OtherLine { LineNumber = keepLineNumber, RawLine = $"{key}={value}" }; + for (var i = matchingIndices.Count - 1; i >= 1; i--) + configLines.RemoveAt(matchingIndices[i]); } /// Creates the managed hosts file empty if it does not exist, so dnsmasq does not error when we add addn-hosts=<path> to the managed config. @@ -124,7 +160,7 @@ public class DnsmasqConfigService : IDnsmasqConfigService rawLines = Array.Empty(); var configLines = DnsmasqConfFileLineParser.ParseFile(rawLines).ToList(); - EnsureOneAddnHostsLine(configLines, set.ManagedHostsFilePath); + EnsureManagedConfigInvariants(configLines, set.ManagedHostsFilePath); var fileEntries = configLines.OfType().Select(c => c.DhcpHost).ToList(); AssignStableIds(fileEntries); @@ -148,8 +184,10 @@ public class DnsmasqConfigService : IDnsmasqConfigService await File.WriteAllLinesAsync(tmpPath, output, DnsmasqFileEncoding.Utf8NoBom, ct); File.Move(tmpPath, path, overwrite: true); EnsureManagedHostsFileExists(set.ManagedHostsFilePath); - var effectiveHostsPathDhcp = configLines.OfType().FirstOrDefault()?.AddnHostsPath ?? ""; - _configSetCache.NotifyWeWroteManagedConfig(new ManagedConfigContent(configLines, effectiveHostsPathDhcp)); + + var writtenLines = DnsmasqConfFileLineParser.ParseFile(output).ToList(); + var effectiveHostsPathDhcp = writtenLines.OfType().FirstOrDefault()?.AddnHostsPath ?? ""; + _configSetCache.NotifyWeWroteManagedConfig(new ManagedConfigContent(writtenLines, effectiveHostsPathDhcp)); _logger.LogInformation("Wrote managed config file: {Path}", path); } @@ -187,8 +225,9 @@ public class DnsmasqConfigService : IDnsmasqConfigService public async Task ApplyEffectiveConfigChangesAsync(IReadOnlyList changes, CancellationToken ct = default) { if (changes.Count == 0) return; - var content = await ReadManagedConfigAsync(ct); - var list = content.Lines.ToList(); + var snapshot = await _configSetCache.GetSnapshotAsync(ct); + var readonlyByOption = await ReadReadonlyMultiValuesByOptionAsync(snapshot.Set, ct); + var list = snapshot.ManagedContent.Lines.ToList(); var maxLineNumber = list.Count > 0 ? list.Max(l => l.LineNumber) : 0; foreach (var c in changes) { @@ -198,13 +237,15 @@ public class DnsmasqConfigService : IDnsmasqConfigService bool MatchesOption(DnsmasqConfLine line) { - if (line is not OtherLine o) return false; - var raw = o.RawLine.Trim(); - return raw == confKey || raw.StartsWith(confKey + "=", StringComparison.Ordinal); + var raw = DnsmasqConfFileLineParser.ToLine(line); + var kv = DnsmasqConfDirectiveParser.TryParseKeyValue(raw); + return kv != null && string.Equals(kv.Value.key, confKey, StringComparison.Ordinal); } if (behavior == EffectiveConfigParserBehavior.Multi && TryGetMultiValues(c.NewValue, out var values)) { + IReadOnlyList readonlyValues = readonlyByOption.TryGetValue(confKey, out var listValues) ? listValues : Array.Empty(); + var valuesToWrite = FilterManagedOnly(values, readonlyValues); var matchingIndices = new List(); for (var i = 0; i < list.Count; i++) { @@ -213,10 +254,10 @@ public class DnsmasqConfigService : IDnsmasqConfigService for (var i = matchingIndices.Count - 1; i >= 0; i--) list.RemoveAt(matchingIndices[i]); var insertIdx = matchingIndices.Count > 0 ? matchingIndices[0] : list.Count; - for (var i = 0; i < values.Count; i++) + for (var i = 0; i < valuesToWrite.Count; i++) { var lineKey = confKey; - var lineText = string.IsNullOrEmpty(values[i]) ? lineKey : lineKey + "=" + values[i]; + var lineText = string.IsNullOrEmpty(valuesToWrite[i]) ? lineKey : lineKey + "=" + valuesToWrite[i]; var lineObj = new OtherLine { LineNumber = maxLineNumber + 1, RawLine = lineText }; maxLineNumber++; list.Insert(insertIdx + i, lineObj); @@ -248,6 +289,61 @@ public class DnsmasqConfigService : IDnsmasqConfigService await WriteManagedConfigAsync(list, ct); } + /// + /// Keeps only values that should be written to managed config by subtracting values provided by + /// non-managed files (multiset subtraction, order preserved). + /// + private static IReadOnlyList FilterManagedOnly( + IReadOnlyList requestedValues, + IReadOnlyList readonlyValues) + { + if (readonlyValues.Count == 0) + return requestedValues; + + var readonlyCounts = new Dictionary(StringComparer.Ordinal); + foreach (var value in readonlyValues) + readonlyCounts[value] = readonlyCounts.TryGetValue(value, out var count) ? count + 1 : 1; + + var result = new List(requestedValues.Count); + foreach (var value in requestedValues) + { + if (readonlyCounts.TryGetValue(value, out var count) && count > 0) + { + readonlyCounts[value] = count - 1; + continue; + } + result.Add(value); + } + return result; + } + + /// Reads all multi-value directive values from non-managed config files, grouped by option name. Single pass per save. + private static async Task>> ReadReadonlyMultiValuesByOptionAsync(DnsmasqConfigSet set, CancellationToken ct) + { + var result = new Dictionary>(StringComparer.Ordinal); + foreach (var file in set.Files.Where(f => !f.IsManaged)) + { + if (!File.Exists(file.Path)) + continue; + var lines = await File.ReadAllLinesAsync(file.Path, DnsmasqFileEncoding.Utf8NoBom, ct); + foreach (var line in lines) + { + var kv = DnsmasqConfDirectiveParser.TryParseKeyValue(line); + if (kv == null) + continue; + var key = kv.Value.key; + var value = kv.Value.value.Trim(); + if (!result.TryGetValue(key, out var list)) + { + list = new List(); + result[key] = list; + } + list.Add(value); + } + } + return result; + } + private static bool TryGetMultiValues(object? value, out IReadOnlyList values) { values = null!; @@ -291,7 +387,7 @@ public class DnsmasqConfigService : IDnsmasqConfigService Directory.CreateDirectory(dir); var list = lines.ToList(); - EnsureOneAddnHostsLine(list, set.ManagedHostsFilePath); + EnsureManagedConfigInvariants(list, set.ManagedHostsFilePath); var output = list.Select(DnsmasqConfFileLineParser.ToLine).ToList(); var tmpPath = path + ".tmp"; diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Validation/Abstractions/IConfigValidationService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Validation/Abstractions/IConfigValidationService.cs new file mode 100644 index 0000000..05160dc --- /dev/null +++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Validation/Abstractions/IConfigValidationService.cs @@ -0,0 +1,19 @@ +using DnsmasqWebUI.Infrastructure.Services.Registration.Abstractions; + +namespace DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation.Abstractions; + +/// Runs the configured config validation command (e.g. dnsmasq --test --conf-file=...). Used before restart in the save flow. +public interface IConfigValidationService : IApplicationScopedService +{ + /// Runs the validation command. When not configured, returns success without running. + Task ValidateAsync(CancellationToken ct = default); +} + +/// Result of running the validation command. +public record ConfigValidationResult( + bool Success, + bool Attempted, + int ExitCode, + string? StdOut, + string? StdErr, + string? UserMessage); diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Validation/ConfigValidationService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Validation/ConfigValidationService.cs new file mode 100644 index 0000000..e04ffae --- /dev/null +++ b/src/DnsmasqWebUI/Infrastructure/Services/Dnsmasq/Validation/ConfigValidationService.cs @@ -0,0 +1,64 @@ +using DnsmasqWebUI.Infrastructure.Services.Common.Process.Abstractions; +using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation.Abstractions; +using DnsmasqWebUI.Models.Config; +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; + +namespace DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation; + +public sealed class ConfigValidationService : IConfigValidationService +{ + private readonly DnsmasqOptions _options; + private readonly IProcessRunner _processRunner; + private readonly ILogger _logger; + + public ConfigValidationService( + IOptions options, + IProcessRunner processRunner, + ILogger logger) + { + _options = options.Value; + _processRunner = processRunner; + _logger = logger; + } + + public async Task ValidateAsync(CancellationToken ct = default) + { + if (string.IsNullOrWhiteSpace(_options.ValidateCommand)) + { + return new ConfigValidationResult( + Success: true, + Attempted: false, + ExitCode: 0, + StdOut: null, + StdErr: null, + UserMessage: "Validation command not configured."); + } + + var command = _options.ValidateCommand! + .Replace("{{MainConfigPath}}", _options.MainConfigPath, StringComparison.Ordinal); + + var run = await _processRunner.RunAsync(command, _options.ValidateTimeout, ct); + + var stderr = run.Stderr; + if (run.TimedOut) + stderr = (string.IsNullOrEmpty(stderr) ? "" : stderr + "\n") + + $"Validation timed out after {_options.ValidateTimeoutSeconds} seconds."; + if (!string.IsNullOrWhiteSpace(run.ExceptionMessage)) + stderr = (string.IsNullOrEmpty(stderr) ? "" : stderr + "\n") + run.ExceptionMessage; + + var success = run.ExitCode == 0; + if (!success) + _logger.LogWarning("Config validation failed: exit {ExitCode}, stderr: {Stderr}", run.ExitCode, stderr); + + return new ConfigValidationResult( + Success: success, + Attempted: true, + ExitCode: run.ExitCode ?? -1, + StdOut: run.Stdout, + StdErr: stderr, + UserMessage: success + ? "Configuration validated." + : "Configuration validation failed."); + } +} diff --git a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs index 0192391..5e96ac1 100644 --- a/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs +++ b/src/DnsmasqWebUI/Infrastructure/Services/EffectiveConfig/EffectiveConfigSaveService.cs @@ -1,5 +1,6 @@ using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Config.Abstractions; using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Reload.Abstractions; +using DnsmasqWebUI.Infrastructure.Services.Dnsmasq.Validation.Abstractions; using DnsmasqWebUI.Infrastructure.Services.EffectiveConfig.Abstractions; using DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig; using Microsoft.Extensions.Logging; @@ -10,17 +11,20 @@ public sealed class EffectiveConfigSaveService : IEffectiveConfigSaveService { private readonly IDnsmasqConfigSetService _configSetService; private readonly IDnsmasqConfigService _configService; + private readonly IConfigValidationService _validationService; private readonly IReloadService _reloadService; private readonly ILogger _logger; public EffectiveConfigSaveService( IDnsmasqConfigSetService configSetService, IDnsmasqConfigService configService, + IConfigValidationService validationService, IReloadService reloadService, ILogger logger) { _configSetService = configSetService; _configService = configService; + _validationService = validationService; _reloadService = reloadService; _logger = logger; } @@ -38,8 +42,8 @@ public sealed class EffectiveConfigSaveService : IEffectiveConfigSaveService { _logger.LogWarning("Save skipped: managed config path is not configured"); return new EffectiveConfigSaveResult( - false, null, false, false, -1, null, null, - "missing_managed_path", "Managed config path is not configured."); + false, null, false, false, -1, null, null, false, -1, null, null, + EffectiveConfigSaveResult.ErrorCodes.MissingManagedPath, "Managed config path is not configured."); } var managedPath = set.ManagedFilePath!; @@ -61,13 +65,38 @@ public sealed class EffectiveConfigSaveService : IEffectiveConfigSaveService false, -1, null, + null, + false, + -1, + null, ex.Message, - "write_failed", + EffectiveConfigSaveResult.ErrorCodes.WriteFailed, "Failed to write config."); } - var restartResult = await _reloadService.ReloadAsync(ct); var backupCreated = File.Exists(backupPath); + var validateResult = await _validationService.ValidateAsync(ct); + + if (!validateResult.Success) + { + _logger.LogWarning("Config saved but validation failed: exit {ExitCode}, stderr: {Stderr}", validateResult.ExitCode, validateResult.StdErr); + return new EffectiveConfigSaveResult( + BackupCreated: backupCreated, + BackupPath: backupCreated ? backupPath : null, + Saved: true, + Validated: false, + ValidationExitCode: validateResult.ExitCode, + ValidationStdOut: validateResult.StdOut, + ValidationStdErr: validateResult.StdErr, + Restarted: false, + RestartExitCode: -1, + RestartStdOut: null, + RestartStdErr: null, + ErrorCode: EffectiveConfigSaveResult.ErrorCodes.ValidateFailed, + UserMessage: "Saved, but validation failed. Restart was not attempted."); + } + + var restartResult = await _reloadService.ReloadAsync(ct); if (!restartResult.Success) _logger.LogWarning("Config saved but restart command failed: exit {ExitCode}, stderr: {Stderr}", restartResult.ExitCode, restartResult.StdErr); @@ -76,12 +105,18 @@ public sealed class EffectiveConfigSaveService : IEffectiveConfigSaveService BackupCreated: backupCreated, BackupPath: backupCreated ? backupPath : null, Saved: true, + Validated: true, + ValidationExitCode: 0, + ValidationStdOut: validateResult.StdOut, + ValidationStdErr: validateResult.StdErr, Restarted: restartResult.Success, RestartExitCode: restartResult.ExitCode, RestartStdOut: restartResult.StdOut, RestartStdErr: restartResult.StdErr, - ErrorCode: restartResult.Success ? null : "restart_failed", - UserMessage: restartResult.Success ? "Saved and dnsmasq restarted." : "Saved, but the restart command failed."); + ErrorCode: restartResult.Success ? null : EffectiveConfigSaveResult.ErrorCodes.RestartFailed, + UserMessage: restartResult.Success + ? "Saved, validated, and dnsmasq restarted." + : "Saved and validated, but the restart command failed."); } /// diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Updates/Abstractions/IUpdateCheckService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Updates/Abstractions/IUpdateCheckService.cs index d6772a2..112c895 100644 --- a/src/DnsmasqWebUI/Infrastructure/Services/Updates/Abstractions/IUpdateCheckService.cs +++ b/src/DnsmasqWebUI/Infrastructure/Services/Updates/Abstractions/IUpdateCheckService.cs @@ -24,6 +24,12 @@ public interface IUpdateCheckService : IApplicationSingleton /// When the last check completed (success or failure), or null if never run. DateTime? LastCheckTime { get; } + /// True if the last check threw an error (e.g. network failure). + bool LastCheckFailed { get; } + + /// Error message from the last failed check, or null if the last check succeeded. + string? LastCheckErrorMessage { get; } + /// True while a check is in progress. bool CheckInProgress { get; } diff --git a/src/DnsmasqWebUI/Infrastructure/Services/Updates/UpdateCheckService.cs b/src/DnsmasqWebUI/Infrastructure/Services/Updates/UpdateCheckService.cs index eb3bf86..98149ef 100644 --- a/src/DnsmasqWebUI/Infrastructure/Services/Updates/UpdateCheckService.cs +++ b/src/DnsmasqWebUI/Infrastructure/Services/Updates/UpdateCheckService.cs @@ -21,6 +21,8 @@ public sealed class UpdateCheckService : IUpdateCheckService private string? _newerVersionUrl; private DateTime? _lastCheckTime; private bool _checkInProgress; + private bool _lastCheckFailed; + private string? _lastCheckErrorMessage; public UpdateCheckService(IHttpClientFactory httpClientFactory, IOptions options) { @@ -34,6 +36,8 @@ public sealed class UpdateCheckService : IUpdateCheckService public string? NewerVersionTag => _newerVersionTag; public string? NewerVersionUrl => _newerVersionUrl; public DateTime? LastCheckTime => _lastCheckTime; + public bool LastCheckFailed => _lastCheckFailed; + public string? LastCheckErrorMessage => _lastCheckErrorMessage; public bool CheckInProgress => _checkInProgress; public async Task CheckNowAsync() @@ -46,6 +50,12 @@ public sealed class UpdateCheckService : IUpdateCheckService try { + lock (_lock) + { + _lastCheckFailed = false; + _lastCheckErrorMessage = null; + } + var client = _httpClientFactory.CreateClient(ServiceCollectionExtensions.GitHubClientName); var response = await client.GetAsync("repos/alexhopeoconnor/dnsmasq-webui/releases/latest"); string? newTag = null; @@ -79,12 +89,14 @@ public sealed class UpdateCheckService : IUpdateCheckService ResultChanged?.Invoke(this, EventArgs.Empty); } - catch + catch (Exception ex) { lock (_lock) { _lastCheckTime = DateTime.UtcNow; _checkInProgress = false; + _lastCheckFailed = true; + _lastCheckErrorMessage = ex.Message; } ResultChanged?.Invoke(this, EventArgs.Empty); } diff --git a/src/DnsmasqWebUI/Models/Config/DnsmasqOptions.cs b/src/DnsmasqWebUI/Models/Config/DnsmasqOptions.cs index c77a139..416337f 100644 --- a/src/DnsmasqWebUI/Models/Config/DnsmasqOptions.cs +++ b/src/DnsmasqWebUI/Models/Config/DnsmasqOptions.cs @@ -35,6 +35,9 @@ public class DnsmasqOptions /// Command to run after config changes when is not set (e.g. "systemctl reload dnsmasq" or "pkill -HUP -x dnsmasq"). SIGHUP only re-reads hosts/addn-hosts etc., not .conf files. Runs in the same environment as the app. public string? ReloadCommand { get; set; } + /// Optional command to validate config before restart (e.g. "dnsmasq --test --conf-file=\"{{MainConfigPath}}\""). Token {{MainConfigPath}} is replaced with . When set, run after write and before restart; if it fails, restart is not attempted. When unset, validation is skipped. + public string? ValidateCommand { get; set; } = "dnsmasq --test --conf-file=\"{{MainConfigPath}}\""; + /// Optional command to check dnsmasq service state (e.g. "systemctl is-active dnsmasq" or "pgrep -x dnsmasq"). Runs in the same environment as the app; if app is in a container, this checks for dnsmasq in the container, not on the host. public string? StatusCommand { get; set; } @@ -58,6 +61,9 @@ public class DnsmasqOptions /// Timeout in seconds for . Default 10. public int LogsTimeoutSeconds { get; set; } = 10; + /// Timeout in seconds for . Default 10. + public int ValidateTimeoutSeconds { get; set; } = 10; + /// as . public TimeSpan RestartTimeout => TimeSpan.FromSeconds(RestartTimeoutSeconds); @@ -69,4 +75,7 @@ public class DnsmasqOptions /// as . public TimeSpan LogsTimeout => TimeSpan.FromSeconds(LogsTimeoutSeconds); + + /// as . + public TimeSpan ValidateTimeout => TimeSpan.FromSeconds(ValidateTimeoutSeconds); } diff --git a/src/DnsmasqWebUI/Models/Config/DnsmasqOptionsValidator.cs b/src/DnsmasqWebUI/Models/Config/DnsmasqOptionsValidator.cs index a4ff80e..4cdc7c9 100644 --- a/src/DnsmasqWebUI/Models/Config/DnsmasqOptionsValidator.cs +++ b/src/DnsmasqWebUI/Models/Config/DnsmasqOptionsValidator.cs @@ -44,6 +44,8 @@ public sealed class DnsmasqOptionsValidator : IApplicationOptionsValidator maxTimeoutSeconds) failures.Add($"Dnsmasq:LogsTimeoutSeconds must be between {minTimeoutSeconds} and {maxTimeoutSeconds}. Current value: {options.LogsTimeoutSeconds}."); + if (options.ValidateTimeoutSeconds < minTimeoutSeconds || options.ValidateTimeoutSeconds > maxTimeoutSeconds) + failures.Add($"Dnsmasq:ValidateTimeoutSeconds must be between {minTimeoutSeconds} and {maxTimeoutSeconds}. Current value: {options.ValidateTimeoutSeconds}."); if (failures.Count == 0) return ValidateOptionsResult.Success; diff --git a/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigSaveResult.cs b/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigSaveResult.cs index 0e47b1b..acb7ba9 100644 --- a/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigSaveResult.cs +++ b/src/DnsmasqWebUI/Models/Dnsmasq/EffectiveConfig/EffectiveConfigSaveResult.cs @@ -1,19 +1,27 @@ namespace DnsmasqWebUI.Models.Dnsmasq.EffectiveConfig; -/// Result of the effective-config save flow (backup, write, restart). Used by UI to drive state and show restore/continue options. +/// Result of the effective-config save flow (backup, write, validate, restart). Used by UI to drive state and show restore/continue options. /// True when a backup file was created before write. /// Path to the backup file when one was created; null otherwise. /// True when the managed config was written successfully. -/// True when the restart command succeeded after write (config changes require restart, not SIGHUP). +/// True when validation was run and succeeded (or was skipped). When validation ran and failed, restart is not attempted. +/// Validation command exit code; -1 when not run or failed to start. +/// Standard output from the validation command. +/// Standard error from the validation command. +/// True when the restart command succeeded after write (and after validation if run). /// Restart command process exit code; -1 when not run or failed to start. /// Standard output from the restart command. /// Standard error from the restart command. -/// Machine-readable code: no_changes, missing_managed_path, write_failed, restart_failed, or null when success. +/// Machine-readable code: see ; null when success. /// Short message for the user. public record EffectiveConfigSaveResult( bool BackupCreated, string? BackupPath, bool Saved, + bool Validated, + int ValidationExitCode, + string? ValidationStdOut, + string? ValidationStdErr, bool Restarted, int RestartExitCode, string? RestartStdOut, @@ -21,7 +29,20 @@ public record EffectiveConfigSaveResult( string? ErrorCode, string? UserMessage) { + /// Machine-readable error codes for . + public static class ErrorCodes + { + public const string NoChanges = "no_changes"; + public const string MissingManagedPath = "missing_managed_path"; + public const string WriteFailed = "write_failed"; + public const string ValidateFailed = "validate_failed"; + public const string RestartFailed = "restart_failed"; + } + + /// True when config was written but validation failed (restart not attempted). + public bool IsValidateFailed => ErrorCode == ErrorCodes.ValidateFailed; + /// Result when there are no pending changes to apply. public static EffectiveConfigSaveResult NoChanges() => - new(false, null, false, false, -1, null, null, "no_changes", "No pending changes."); + new(false, null, false, false, -1, null, null, false, -1, null, null, ErrorCodes.NoChanges, "No pending changes."); } diff --git a/src/DnsmasqWebUI/appsettings.json b/src/DnsmasqWebUI/appsettings.json index 1164e29..02b0c7d 100644 --- a/src/DnsmasqWebUI/appsettings.json +++ b/src/DnsmasqWebUI/appsettings.json @@ -46,6 +46,8 @@ "SystemHostsPath": "/etc/hosts", "RestartCommand": "systemctl restart dnsmasq", "ReloadCommand": "systemctl reload dnsmasq", + "ValidateCommand": "dnsmasq --test --conf-file=\"{{MainConfigPath}}\"", + "ValidateTimeoutSeconds": 10, "StatusCommand": "systemctl is-active dnsmasq", "StatusShowCommand": "systemctl status dnsmasq --no-pager", "LogsCommand": "journalctl -u dnsmasq -n 100 --no-pager"