diff options
Diffstat (limited to 'src/main.lib/Plugins/ValidationPlugins/Http')
10 files changed, 49 insertions, 34 deletions
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs index 5f78adf..cf92ba0 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs @@ -2,6 +2,7 @@ using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Extensions; using PKISharp.WACS.Services; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -24,7 +25,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http public override bool PathIsValid(string path) => path.ValidPath(_log); public override bool AllowEmtpy(Target target) => target.IIS; - public override FileSystemOptions Default(Target target) + public override Task<FileSystemOptions> Default(Target target) { var args = _arguments.GetArguments<FileSystemArguments>(); var ret = new FileSystemOptions(BaseDefault(target)); @@ -39,10 +40,10 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http ret.SiteId = args.ValidationSiteId.Value; } } - return ret; + return Task.FromResult(ret); } - public override FileSystemOptions Aquire(Target target, IInputService inputService, RunLevel runLevel) + public override Task<FileSystemOptions> Aquire(Target target, IInputService inputService, RunLevel runLevel) { // Choose alternative site for validation var ret = new FileSystemOptions(BaseAquire(target, inputService, runLevel)); @@ -61,7 +62,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http } } } - return ret; + return Task.FromResult(ret); } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/Ftp.cs b/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/Ftp.cs index 373063f..7c3d2bf 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/Ftp.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/Ftp.cs @@ -1,5 +1,6 @@ using PKISharp.WACS.Clients; using System.Linq; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -19,10 +20,11 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http protected override void WriteFile(string path, string content) => _ftpClient.Upload(path, content); - public override void CleanUp() + public override Task CleanUp() { base.CleanUp(); _ftpClient = null; + return Task.CompletedTask; } } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/FtpOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/FtpOptionsFactory.cs index 0dcd11b..349861b 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/FtpOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/Ftp/FtpOptionsFactory.cs @@ -2,6 +2,7 @@ using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Services; using System; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -36,20 +37,20 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http }; } - public override FtpOptions Default(Target target) + public override Task<FtpOptions> Default(Target target) { - return new FtpOptions(BaseDefault(target)) + return Task.FromResult(new FtpOptions(BaseDefault(target)) { Credential = new NetworkCredentialOptions(_arguments) - }; + }); } - public override FtpOptions Aquire(Target target, IInputService inputService, RunLevel runLevel) + public override Task<FtpOptions> Aquire(Target target, IInputService inputService, RunLevel runLevel) { - return new FtpOptions(BaseAquire(target, inputService, runLevel)) + return Task.FromResult(new FtpOptions(BaseAquire(target, inputService, runLevel)) { Credential = new NetworkCredentialOptions(_arguments, inputService) - }; + }); } } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs b/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs index 5789757..ac2e77b 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Net; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins { @@ -84,7 +85,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins /// <summary> /// Handle http challenge /// </summary> - public override void PrepareChallenge() + public override Task PrepareChallenge() { Refresh(); WriteAuthorizationFile(); @@ -116,7 +117,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins { _log.Error(ex, "Preliminary validation failed"); } - + return Task.CompletedTask; } /// <summary> @@ -303,10 +304,11 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins /// <summary> /// Dispose /// </summary> - public override void CleanUp() + public override Task CleanUp() { DeleteWebConfig(); DeleteAuthorization(); + return Task.CompletedTask; } } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs b/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs index cedf280..28c2a1a 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs @@ -44,14 +44,15 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http } } - public override void CleanUp() + public override Task CleanUp() { _listener.Stop(); _listener.Close(); _listener = null; + return Task.CompletedTask; } - public override void PrepareChallenge() + public override Task PrepareChallenge() { _files.Add("/" + _challenge.HttpResourcePath, _challenge.HttpResourceValue); try @@ -67,6 +68,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http _log.Error("Unable to activate HttpListener, this may be due to non-Microsoft webserver using port 80"); throw; } + return Task.CompletedTask; } } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHostingOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHostingOptionsFactory.cs index c975e3e..33cbc7c 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHostingOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHostingOptionsFactory.cs @@ -1,6 +1,7 @@ using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Plugins.Base.Factories; using PKISharp.WACS.Services; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -10,15 +11,15 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http public SelfHostingOptionsFactory(IArgumentsService arguments) => _arguments = arguments; - public override SelfHostingOptions Aquire(Target target, IInputService inputService, RunLevel runLevel) => Default(target); + public override Task<SelfHostingOptions> Aquire(Target target, IInputService inputService, RunLevel runLevel) => Default(target); - public override SelfHostingOptions Default(Target target) + public override Task<SelfHostingOptions> Default(Target target) { var args = _arguments.GetArguments<SelfHostingArguments>(); - return new SelfHostingOptions() + return Task.FromResult(new SelfHostingOptions() { Port = args.ValidationPort - }; + }); } } }
\ No newline at end of file diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/Sftp.cs b/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/Sftp.cs index 96017b4..91981d5 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/Sftp.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/Sftp.cs @@ -1,5 +1,6 @@ using PKISharp.WACS.Clients; using System.Linq; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -19,11 +20,12 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http protected override void WriteFile(string path, string content) => _sshFtpClient.Upload(path, content); - public override void CleanUp() + public override Task CleanUp() { base.CleanUp(); // Switched setting this to null, since this class will be needed for deleting files and folder structure _sshFtpClient = null; + return Task.CompletedTask; } } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/SftpOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/SftpOptionsFactory.cs index 63e7b78..41172ab 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/SftpOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/Sftp/SftpOptionsFactory.cs @@ -1,6 +1,7 @@ using PKISharp.WACS.Configuration; using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Services; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -21,20 +22,20 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http }; } - public override SftpOptions Default(Target target) + public override Task<SftpOptions> Default(Target target) { - return new SftpOptions(BaseDefault(target)) + return Task.FromResult(new SftpOptions(BaseDefault(target)) { Credential = new NetworkCredentialOptions(_arguments) - }; + }); } - public override SftpOptions Aquire(Target target, IInputService inputService, RunLevel runLevel) + public override Task<SftpOptions> Aquire(Target target, IInputService inputService, RunLevel runLevel) { - return new SftpOptions(BaseAquire(target, inputService, runLevel)) + return Task.FromResult(new SftpOptions(BaseAquire(target, inputService, runLevel)) { Credential = new NetworkCredentialOptions(_arguments, inputService) - }; + }); } } }
\ No newline at end of file diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs index 5f05eac..dcead5c 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs @@ -1,5 +1,6 @@ using PKISharp.WACS.Client; using PKISharp.WACS.Services; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -21,10 +22,11 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http protected override char PathSeparator => '/'; protected override void WriteFile(string path, string content) => _webdavClient.Upload(path, content); - public override void CleanUp() + public override Task CleanUp() { base.CleanUp(); _webdavClient = null; + return Task.CompletedTask; } } } diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs index e90073f..18f7708 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs @@ -1,6 +1,7 @@ using PKISharp.WACS.Configuration; using PKISharp.WACS.DomainObjects; using PKISharp.WACS.Services; +using System.Threading.Tasks; namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { @@ -27,20 +28,20 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http }; } - public override WebDavOptions Default(Target target) + public override Task<WebDavOptions> Default(Target target) { - return new WebDavOptions(BaseDefault(target)) + return Task.FromResult(new WebDavOptions(BaseDefault(target)) { Credential = new NetworkCredentialOptions(_arguments) - }; + }); } - public override WebDavOptions Aquire(Target target, IInputService inputService, RunLevel runLevel) + public override Task<WebDavOptions> Aquire(Target target, IInputService inputService, RunLevel runLevel) { - return new WebDavOptions(BaseAquire(target, inputService, runLevel)) + return Task.FromResult(new WebDavOptions(BaseAquire(target, inputService, runLevel)) { Credential = new NetworkCredentialOptions(_arguments, inputService) - }; + }); } } } |