diff options
Diffstat (limited to 'src/main.lib/Plugins/ValidationPlugins/Dns')
3 files changed, 16 insertions, 28 deletions
diff --git a/src/main.lib/Plugins/ValidationPlugins/Dns/Acme/AcmeOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Dns/Acme/AcmeOptionsFactory.cs index b437b5f..04cf9c8 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Dns/Acme/AcmeOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Dns/Acme/AcmeOptionsFactory.cs @@ -53,11 +53,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Dns var identifiers = target.Parts.SelectMany(x => x.Identifiers).Distinct(); foreach (var identifier in identifiers) { - if (!await acmeDnsClient.EnsureRegistration(identifier.Replace("*.", ""), true)) - { - // Something failed or was aborted - return null; - } + await acmeDnsClient.EnsureRegistration(identifier.Replace("*.", ""), true); } return ret; } @@ -92,13 +88,13 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Dns { if (!await acmeDnsClient.EnsureRegistration(identifier.Replace("*.", ""), false)) { + _log.Warning("No (valid) acme-dns registration could be found for {identifier}.", identifier); valid = false; } } if (!valid) { - _log.Error($"Setting up this certificate is not possible in unattended mode because no (valid) acme-dns registration could be found for one or more of the specified domains."); - return null; + _log.Warning($"Creating his renewal might fail because the acme-dns configuration for one or more identifiers looks unhealthy."); } return ret; } diff --git a/src/main.lib/Plugins/ValidationPlugins/Dns/DnsValidation.cs b/src/main.lib/Plugins/ValidationPlugins/Dns/DnsValidation.cs index 72d0f01..845bb0e 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Dns/DnsValidation.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Dns/DnsValidation.cs @@ -66,32 +66,24 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins try { var dnsClients = await _dnsClientProvider.GetClients(Challenge.DnsRecordName, attempt); - - _log.Debug("Preliminary validation will now check name servers: {address}", - string.Join(", ", dnsClients.Select(x => x.IpAddress))); - - // Parallel queries - var answers = await Task.WhenAll(dnsClients.Select(client => client.GetTextRecordValues(Challenge.DnsRecordName, attempt))); - - // Loop through results - for (var i = 0; i < dnsClients.Count(); i++) + foreach (var client in dnsClients) { - var currentClient = dnsClients[i]; - var currentResult = answers[i]; - if (!currentResult.Any()) + _log.Debug("Preliminary validation will now check name server {ip}", client.IpAddress); + var answers = await client.GetTextRecordValues(Challenge.DnsRecordName, attempt); + if (!answers.Any()) { - _log.Warning("Preliminary validation at {address} failed: no TXT records found", currentClient.IpAddress); + _log.Warning("Preliminary validation at {address} failed: no TXT records found", client.IpAddress); return false; } - if (!currentResult.Contains(Challenge.DnsRecordValue)) + if (!answers.Contains(Challenge.DnsRecordValue)) { - _log.Warning("Preliminary validation at {address} failed: {ExpectedTxtRecord} not found in {TxtRecords}", - currentClient.IpAddress, - Challenge.DnsRecordValue, - string.Join(", ", currentResult)); + _log.Warning("Preliminary validation at {address} failed: {ExpectedTxtRecord} not found in {TxtRecords}", + client.IpAddress, + Challenge.DnsRecordValue, + string.Join(", ", answers)); return false; } - _log.Debug("Preliminary validation at {address} looks good!", currentClient.IpAddress); + _log.Debug("Preliminary validation at {address} looks good!", client.IpAddress); } } catch (Exception ex) diff --git a/src/main.lib/Plugins/ValidationPlugins/Dns/Manual/Manual.cs b/src/main.lib/Plugins/ValidationPlugins/Dns/Manual/Manual.cs index d9fc670..317afe9 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Dns/Manual/Manual.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Dns/Manual/Manual.cs @@ -32,7 +32,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Dns _input.Show("Type", "TXT"); _input.Show("Content", $"\"{token}\""); _input.Show("Note", "Some DNS managers add quotes automatically. A single set is needed."); - await _input.Wait("Please press enter after you've created and verified the record"); + await _input.Wait("Please press <Enter> after you've created and verified the record"); // Pre-pre-validate, allowing the manual user to correct mistakes while (true) @@ -62,7 +62,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Dns _input.Show("Record", recordName); _input.Show("Type", "TXT"); _input.Show("Content", $"\"{token}\""); - _input.Wait("Please press enter after you've deleted the record"); + _input.Wait("Please press <Enter> after you've deleted the record"); return Task.CompletedTask; } } |