diff options
Diffstat (limited to 'src')
6 files changed, 7 insertions, 17 deletions
diff --git a/src/main/Plugins/ValidationPlugins/Http/HttpValidation.cs b/src/main/Plugins/ValidationPlugins/Http/HttpValidation.cs index 504f7b9..ae3abbd 100644 --- a/src/main/Plugins/ValidationPlugins/Http/HttpValidation.cs +++ b/src/main/Plugins/ValidationPlugins/Http/HttpValidation.cs @@ -121,15 +121,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins /// <param name="uri"></param> private string WarmupSite() { - return GetContent(new Uri(_challenge.HttpResourceUrl)); - } - - /// <summary> - /// Read content from Uri - /// </summary> - /// <param name="uri"></param> - /// <returns></returns> - protected string GetContent(Uri uri) { + var uri = new Uri(_challenge.HttpResourceUrl)); var request = WebRequest.Create(uri); request.Proxy = _proxy.GetWebProxy(); using (var response = request.GetResponse()) diff --git a/src/main/Plugins/ValidationPlugins/Http/HttpValidationArgumentsProvider.cs b/src/main/Plugins/ValidationPlugins/Http/HttpValidationArgumentsProvider.cs index f00ee53..092f0f7 100644 --- a/src/main/Plugins/ValidationPlugins/Http/HttpValidationArgumentsProvider.cs +++ b/src/main/Plugins/ValidationPlugins/Http/HttpValidationArgumentsProvider.cs @@ -17,7 +17,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http .WithDescription("Root path of the site that will serve the HTTP validation requests."); parser.Setup(o => o.Warmup) .As("warmup") - .WithDescription("Warm up website(s) before attempting HTTP validation."); + .WithDescription("Not used (warmup is the new default)."); parser.Setup(o => o.ManualTargetIsIIS) .As("manualtargetisiis") .WithDescription("Copy default web.config to the .well-known directory."); diff --git a/src/main/Plugins/ValidationPlugins/Http/HttpValidationOptionsFactory.cs b/src/main/Plugins/ValidationPlugins/Http/HttpValidationOptionsFactory.cs index 0101fd7..14c2c0c 100644 --- a/src/main/Plugins/ValidationPlugins/Http/HttpValidationOptionsFactory.cs +++ b/src/main/Plugins/ValidationPlugins/Http/HttpValidationOptionsFactory.cs @@ -1,5 +1,4 @@ -using PKISharp.WACS.Clients.IIS; -using PKISharp.WACS.DomainObjects; +using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Plugins.Base.Factories; using PKISharp.WACS.Plugins.Interfaces; using PKISharp.WACS.Services; @@ -20,9 +19,8 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins /// </summary> public HttpValidationOptions<TPlugin> BaseAquire(Target target, IArgumentsService options, IInputService input, RunLevel runLevel) { - string path = null; var allowEmtpy = AllowEmtpy(target); - path = options.TryGetArgument(null, input, WebrootHint(allowEmtpy)); + string path = options.TryGetArgument(null, input, WebrootHint(allowEmtpy)); while ( (!string.IsNullOrEmpty(path) && !PathIsValid(path)) || (string.IsNullOrEmpty(path) && !allowEmtpy)) diff --git a/src/plugin.validation.dns.azure/AzureOptions.cs b/src/plugin.validation.dns.azure/AzureOptions.cs index 8d34a23..2c246ac 100644 --- a/src/plugin.validation.dns.azure/AzureOptions.cs +++ b/src/plugin.validation.dns.azure/AzureOptions.cs @@ -10,7 +10,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Dns class AzureOptions : ValidationPluginOptions<Azure> { public override string Name => "Azure"; - public override string Description => "Change records in Azure DNS"; + public override string Description => "Create verification records in Azure DNS"; public override string ChallengeType { get => Constants.Dns01ChallengeType; } public string ClientId { get; set; } diff --git a/src/plugin.validation.dns.dreamhost/DreamhostOptions.cs b/src/plugin.validation.dns.dreamhost/DreamhostOptions.cs index bcc7f85..a304383 100644 --- a/src/plugin.validation.dns.dreamhost/DreamhostOptions.cs +++ b/src/plugin.validation.dns.dreamhost/DreamhostOptions.cs @@ -11,7 +11,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins { public override string Name => "Dreamhost"; - public override string Description => "Change records in Dreamhost DNS"; + public override string Description => "Create verification records in Dreamhost DNS"; public override string ChallengeType => Constants.Dns01ChallengeType; diff --git a/src/plugin.validation.dns.route53/Route53Options.cs b/src/plugin.validation.dns.route53/Route53Options.cs index 4db7c05..b3db446 100644 --- a/src/plugin.validation.dns.route53/Route53Options.cs +++ b/src/plugin.validation.dns.route53/Route53Options.cs @@ -10,7 +10,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Dns internal sealed class Route53Options : ValidationPluginOptions<Route53> { public override string Name { get; } = "Route53"; - public override string Description { get; } = "Verify through AWS Route 53 DNS"; + public override string Description { get; } = "Create verification records in AWS Route 53"; public override string ChallengeType { get; } = Constants.Dns01ChallengeType; public string IAMRole { get; set; } public string AccessKeyId { get; set; } |