diff options
Diffstat (limited to 'src/main.lib/Plugins/Resolvers')
| -rw-r--r-- | src/main.lib/Plugins/Resolvers/InteractiveResolver.cs | 18 | ||||
| -rw-r--r-- | src/main.lib/Plugins/Resolvers/UnattendedResolver.cs | 31 |
2 files changed, 25 insertions, 24 deletions
diff --git a/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs b/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs index 2796485..387c0b3 100644 --- a/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs +++ b/src/main.lib/Plugins/Resolvers/InteractiveResolver.cs @@ -71,8 +71,7 @@ namespace PKISharp.WACS.Plugins.Resolvers x, description: x.Description, @default: x.GetType() == defaultType, - disabled: x.Disabled.Item1, - disabledReason: x.Disabled.Item2), + disabled: x.Disabled), "Abort"); return ret ?? new NullTargetFactory(); @@ -90,7 +89,7 @@ namespace PKISharp.WACS.Plugins.Resolvers _input.Show(null, "The ACME server will need to verify that you are the owner of the domain names that you are requesting" + " the certificate for. This happens both during initial setup *and* for every future renewal. There are two main methods of doing so: " + "answering specific http requests (http-01) or create specific dns records (dns-01). For wildcard domains the latter is the only option. " + - "Various additional plugins are available from https://github.com/PKISharp/win-acme/.", + "Various additional plugins are available from https://github.com/win-acme/win-acme/.", true); var options = _plugins.ValidationPluginFactories(scope). @@ -120,8 +119,7 @@ namespace PKISharp.WACS.Plugins.Resolvers x, description: $"[{x.ChallengeType}] {x.Description}", @default: x.GetType() == defaultType, - disabled: x.Disabled.Item1, - disabledReason: x.Disabled.Item2), + disabled: x.Disabled), "Abort"); return ret ?? new NullValidationFactory(); } @@ -165,8 +163,7 @@ namespace PKISharp.WACS.Plugins.Resolvers x, description: x.Description, @default: x is RsaOptionsFactory, - disabled: x.Disabled.Item1, - disabledReason: x.Disabled.Item2)); + disabled: x.Disabled)); return ret; } else @@ -218,8 +215,7 @@ namespace PKISharp.WACS.Plugins.Resolvers x, description: x.Description, @default: x.GetType() == defaultType, - disabled: x.Disabled.Item1, - disabledReason: x.Disabled.Item2), + disabled: x.Disabled), "Abort"); return store; @@ -285,8 +281,8 @@ namespace PKISharp.WACS.Plugins.Resolvers x => Choice.Create( x, description: x.plugin.Description, - disabled: !x.usable, - disabledReason: x.plugin.Disabled.Item1 ? x.plugin.Disabled.Item2 : "Incompatible with selected store.", + disabled: (!x.usable, x.plugin.Disabled.Item1 ? + x.plugin.Disabled.Item2 : "Incompatible with selected store."), @default: x.plugin.GetType() == @default)) ; return install.plugin; diff --git a/src/main.lib/Plugins/Resolvers/UnattendedResolver.cs b/src/main.lib/Plugins/Resolvers/UnattendedResolver.cs index 3105ef5..b0be55a 100644 --- a/src/main.lib/Plugins/Resolvers/UnattendedResolver.cs +++ b/src/main.lib/Plugins/Resolvers/UnattendedResolver.cs @@ -45,9 +45,10 @@ namespace PKISharp.WACS.Plugins.Resolvers _log.Error("Unable to find target plugin {PluginName}", _options.MainArguments.Target); return new NullTargetFactory(); } - if (targetPluginFactory.Disabled.Item1) + var (disabled, disabledReason) = targetPluginFactory.Disabled; + if (disabled) { - _log.Error($"Target plugin {{PluginName}} is not available. {targetPluginFactory.Disabled.Item2}", _options.MainArguments.Target); + _log.Error($"Target plugin {{PluginName}} is not available. {disabledReason}", _options.MainArguments.Target); return new NullTargetFactory(); } return targetPluginFactory; @@ -72,9 +73,10 @@ namespace PKISharp.WACS.Plugins.Resolvers _log.Error("Unable to find validation plugin {PluginName}", _options.MainArguments.Validation); return new NullValidationFactory(); } - if (validationPluginFactory.Disabled.Item1) + var (disabled, disabledReason) = validationPluginFactory.Disabled; + if (disabled) { - _log.Error($"Validation plugin {{PluginName}} is not available. {validationPluginFactory.Disabled.Item2}", validationPluginFactory.Name); + _log.Error($"Validation plugin {{PluginName}} is not available. {disabledReason}", validationPluginFactory.Name); return new NullValidationFactory(); } if (!validationPluginFactory.CanValidate(target)) @@ -112,9 +114,10 @@ namespace PKISharp.WACS.Plugins.Resolvers _log.Error("Unable to find installation plugin {PluginName}", name); return null; } - if (factory.Disabled.Item1) + var (disabled, disabledReason) = factory.Disabled; + if (disabled) { - _log.Error($"Installation plugin {{PluginName}} is not available. {factory.Disabled.Item2}", name); + _log.Error($"Installation plugin {{PluginName}} is not available. {disabledReason}", name); return null; } if (!factory.CanInstall(storeTypes)) @@ -164,9 +167,10 @@ namespace PKISharp.WACS.Plugins.Resolvers _log.Error("Unable to find store plugin {PluginName}", name); return null; } - if (factory.Disabled.Item1) + var (disabled, disabledReason) = factory.Disabled; + if (disabled) { - _log.Error($"Store plugin {{PluginName}} is not available. {factory.Disabled.Item2}", name); + _log.Error($"Store plugin {{PluginName}} is not available. {disabledReason}", name); return null; } return factory; @@ -184,18 +188,19 @@ namespace PKISharp.WACS.Plugins.Resolvers { return scope.Resolve<RsaOptionsFactory>(); } - var ret = _plugins.CsrPluginFactory(scope, pluginName); - if (ret == null) + var factory = _plugins.CsrPluginFactory(scope, pluginName); + if (factory == null) { _log.Error("Unable to find csr plugin {PluginName}", pluginName); return new NullCsrFactory(); } - if (ret.Disabled.Item1) + var (disabled, disabledReason) = factory.Disabled; + if (disabled) { - _log.Error($"CSR plugin {{PluginName}} is not available. {ret.Disabled.Item2}", pluginName); + _log.Error($"CSR plugin {{PluginName}} is not available. {disabledReason}", pluginName); return new NullCsrFactory(); } - return ret; + return factory; } } } |