diff options
| author | Wouter Tinus <win.acme.simple@gmail.com> | 2020-10-02 06:04:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 06:04:59 +0200 |
| commit | 160ed1ad546b1a71d0d2a1557073b40983964bfe (patch) | |
| tree | 1e8a1afd3ee2e75c6ee5e10306fc6df1696b1470 /src/main.lib/Plugins/ValidationPlugins/Http | |
| parent | c662521de225e4dd4078fc6f0c2d1adfe323e368 (diff) | |
| parent | f0390cc9d8d8ffe82c4641f1e09e06d1ca9e12ae (diff) | |
| download | letsencrypt-win-simple-160ed1ad546b1a71d0d2a1557073b40983964bfe.zip letsencrypt-win-simple-160ed1ad546b1a71d0d2a1557073b40983964bfe.tar.gz letsencrypt-win-simple-160ed1ad546b1a71d0d2a1557073b40983964bfe.tar.bz2 | |
Merge pull request #1672 from win-acme/2.1.11v2.1.11
2.1.11
Diffstat (limited to 'src/main.lib/Plugins/ValidationPlugins/Http')
4 files changed, 12 insertions, 11 deletions
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs index c7e4c97..e4581b9 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystem.cs @@ -46,7 +46,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http protected override Task<bool> IsEmpty(string path)
{
var x = new DirectoryInfo(path);
- return Task.FromResult(x.Exists && x.EnumerateFileSystemInfos().Any());
+ return Task.FromResult(x.Exists && !x.EnumerateFileSystemInfos().Any());
}
protected override async Task WriteFile(string path, string content)
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs index 9a4e748..b32127c 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/FileSystem/FileSystemOptionsFactory.cs @@ -29,15 +29,16 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { var args = _arguments.GetArguments<FileSystemArguments>(); var ret = new FileSystemOptions(BaseDefault(target)); - if (target.IIS && _iisClient.HasWebSites) + if (string.IsNullOrEmpty(ret.Path)) { - - if (args?.ValidationSiteId != null) + if (target.IIS && _iisClient.HasWebSites) { - // Throws exception when not found - var site = _iisClient.GetWebSite(args.ValidationSiteId.Value); - ret.Path = site.Path; - ret.SiteId = args.ValidationSiteId.Value; + if (args?.ValidationSiteId != null) + { + // Throws exception when not found + _iisClient.GetWebSite(args.ValidationSiteId.Value); + ret.SiteId = args.ValidationSiteId.Value; + } } } return ret; diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs b/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs index a45e9e2..11a5c45 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/HttpValidation.cs @@ -160,7 +160,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins {
if (_path == null)
{
- throw new InvalidOperationException();
+ throw new InvalidOperationException("No path specified for HttpValidation");
}
var path = CombinePath(_path, challenge.HttpResourcePath);
WriteFile(path, challenge.HttpResourceValue);
@@ -180,7 +180,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins {
if (_path == null)
{
- throw new InvalidOperationException();
+ throw new InvalidOperationException("No path specified for HttpValidation");
}
if (_options.CopyWebConfig == true)
{
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs b/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs index 3681c8d..bb3d84a 100644 --- a/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs +++ b/src/main.lib/Plugins/ValidationPlugins/Http/SelfHosting/SelfHosting.cs @@ -34,7 +34,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http { if (_listener == null) { - throw new InvalidOperationException(); + throw new InvalidOperationException("Listener not present"); } return _listener; } |