diff options
author | WouterTinus <wouter.tinus@gmail.com> | 2019-09-07 22:44:59 +0200 |
---|---|---|
committer | WouterTinus <wouter.tinus@gmail.com> | 2019-09-07 22:44:59 +0200 |
commit | 1d1ddc8721498f2d650aff907d12f905a15fd11f (patch) | |
tree | f5b0ddb86b57c3614c62b815549ed001a5c673e9 /src/main.lib/Plugins/ValidationPlugins/Http/FileSystem | |
parent | 67bf3cf8b36affd420a96df90bb3b7afaad91f73 (diff) | |
download | letsencrypt-win-simple-1d1ddc8721498f2d650aff907d12f905a15fd11f.zip letsencrypt-win-simple-1d1ddc8721498f2d650aff907d12f905a15fd11f.tar.gz letsencrypt-win-simple-1d1ddc8721498f2d650aff907d12f905a15fd11f.tar.bz2 |
code format
Diffstat (limited to 'src/main.lib/Plugins/ValidationPlugins/Http/FileSystem')
5 files changed, 13 insertions, 24 deletions
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs index 1301f5b..2ce7ab7 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs @@ -1,5 +1,4 @@ using PKISharp.WACS.Clients.IIS; -using PKISharp.WACS.Extensions; using System; using System.IO; using System.Linq; @@ -10,10 +9,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { protected IIISClient _iisClient; - public FileSystem(FileSystemOptions options, IIISClient iisClient, RunLevel runLevel, HttpValidationParameters pars) : base(options, runLevel, pars) - { - _iisClient = iisClient; - } + public FileSystem(FileSystemOptions options, IIISClient iisClient, RunLevel runLevel, HttpValidationParameters pars) : base(options, runLevel, pars) => _iisClient = iisClient; protected override void DeleteFile(string path) { @@ -43,10 +39,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http } } - protected override bool IsEmpty(string path) - { - return !(new DirectoryInfo(path)).GetFileSystemInfos().Any(); - } + protected override bool IsEmpty(string path) => !(new DirectoryInfo(path)).GetFileSystemInfos().Any(); protected override void WriteFile(string path, string content) { diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArguments.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArguments.cs index b99f400..dc5d33e 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArguments.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArguments.cs @@ -1,6 +1,6 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { - class FileSystemArguments : HttpValidationArguments + internal class FileSystemArguments : HttpValidationArguments { public long? ValidationSiteId { get; set; } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArgumentsProvider.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArgumentsProvider.cs index 4d696e1..d25fb6a 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArgumentsProvider.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemArgumentsProvider.cs @@ -3,7 +3,7 @@ using PKISharp.WACS.Configuration; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { - class FileSystemArgumentsProvider : BaseArgumentsProvider<FileSystemArguments> + internal class FileSystemArgumentsProvider : BaseArgumentsProvider<FileSystemArguments> { public override string Name => "FileSystem plugin"; public override string Condition => "--validation filesystem"; @@ -16,9 +16,6 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http .WithDescription("Specify IIS site to use for handling validation requests. This will be used to choose the web root path."); } - public override bool Active(FileSystemArguments current) - { - return current.ValidationSiteId != null; - } + public override bool Active(FileSystemArguments current) => current.ValidationSiteId != null; } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptions.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptions.cs index 4b70e2d..33684e0 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptions.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptions.cs @@ -6,8 +6,8 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http [Plugin("1c77b3a4-5310-4c46-92c6-00d866e84d6b")] internal class FileSystemOptions : HttpValidationOptions<FileSystem> { - public override string Name { get => "FileSystem"; } - public override string Description { get => "Save verification files on (network) path"; } + public override string Name => "FileSystem"; + public override string Description => "Save verification files on (network) path"; public FileSystemOptions() : base() { } public FileSystemOptions(HttpValidationOptions<FileSystem> source) : base(source) { } @@ -30,6 +30,6 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http input.Show("Site", SiteId.ToString()); } } - + } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs index ea639d5..5f78adf 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs @@ -1,5 +1,4 @@ -using Microsoft.Web.Administration; -using PKISharp.WACS.Clients.IIS; +using PKISharp.WACS.Clients.IIS; using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Extensions; using PKISharp.WACS.Services; @@ -15,7 +14,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http private readonly ILogService _log; public FileSystemOptionsFactory( - IIISClient iisClient, ILogService log, + IIISClient iisClient, ILogService log, IArgumentsService arguments) : base(arguments) { _log = log; @@ -31,11 +30,11 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http var ret = new FileSystemOptions(BaseDefault(target)); if (target.IIS && _iisClient.HasWebSites) { - + if (args.ValidationSiteId != null) { // Throws exception when not found - var site = _iisClient.GetWebSite(args.ValidationSiteId.Value); + var site = _iisClient.GetWebSite(args.ValidationSiteId.Value); ret.Path = site.Path; ret.SiteId = args.ValidationSiteId.Value; } @@ -53,7 +52,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { var site = inputService.ChooseFromList("Validation site, must receive requests for all hosts on port 80", _iisClient.WebSites, - x => Choice.Create(x, x.Name, x.Id.ToString()), + x => Choice.Create(x, x.Name, x.Id.ToString()), "Automatic (target site)"); if (site != null) { |