diff options
Diffstat (limited to 'src/main.lib/Plugins/StorePlugins/PemFiles')
4 files changed, 17 insertions, 15 deletions
diff --git a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFiles.cs b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFiles.cs index be7e2fb..4966053 100644 --- a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFiles.cs +++ b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFiles.cs @@ -24,16 +24,17 @@ namespace PKISharp.WACS.Plugins.StorePlugins { _log = log; _pemService = pemService; - _path = !string.IsNullOrWhiteSpace(options.Path) ? + var path = !string.IsNullOrWhiteSpace(options.Path) ? options.Path : settings.Store.DefaultPemFilesPath; - if (_path.ValidPath(log)) + if (path != null && _path.ValidPath(log)) { - _log.Debug("Using .pem certificate path: {_path}", _path); + _log.Debug("Using .pem certificate path: {path}", path); + _path = path; } else { - throw new Exception($"Specified PemFiles path {_path} is not valid."); + throw new Exception($"Specified PemFiles path {path} is not valid."); } } @@ -106,7 +107,7 @@ namespace PKISharp.WACS.Plugins.StorePlugins public Task Delete(CertificateInfo input) => Task.CompletedTask; - public CertificateInfo FindByThumbprint() => null; + public CertificateInfo? FindByThumbprint() => null; bool IPlugin.Disabled => false; } diff --git a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesArguments.cs b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesArguments.cs index 0f6b2b9..034fcc8 100644 --- a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesArguments.cs +++ b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesArguments.cs @@ -2,6 +2,6 @@ { internal class PemFilesArguments { - public string PemFilesPath { get; set; } + public string? PemFilesPath { get; set; } } } diff --git a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptions.cs b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptions.cs index 14b60c6..4fb5892 100644 --- a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptions.cs +++ b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptions.cs @@ -7,15 +7,16 @@ namespace PKISharp.WACS.Plugins.StorePlugins [Plugin("e57c70e4-cd60-4ba6-80f6-a41703e21031")] internal class PemFilesOptions : StorePluginOptions<PemFiles> { - /// <summary> - /// Path to the .pem directory - /// </summary> - public string Path { get; set; } internal const string PluginName = "PemFiles"; public override string Name => PluginName; public override string Description => "PEM encoded files (Apache, nginx, etc.)"; /// <summary> + /// Path to the .pem directory + /// </summary> + public string? Path { get; set; } + + /// <summary> /// Show details to the user /// </summary> /// <param name="input"></param> diff --git a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptionsFactory.cs b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptionsFactory.cs index 6429c66..02a26cf 100644 --- a/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptionsFactory.cs +++ b/src/main.lib/Plugins/StorePlugins/PemFiles/PemFilesOptionsFactory.cs @@ -19,7 +19,7 @@ namespace PKISharp.WACS.Plugins.StorePlugins _settings = settings; } - public override async Task<PemFilesOptions> Aquire(IInputService input, RunLevel runLevel) + public override async Task<PemFilesOptions?> Aquire(IInputService input, RunLevel runLevel) { var args = _arguments.GetArguments<PemFilesArguments>(); var path = args.PemFilesPath; @@ -31,10 +31,10 @@ namespace PKISharp.WACS.Plugins.StorePlugins { path = await input.RequestString("Path to folder where .pem files are stored"); } - return await Create(path); + return Create(path); } - public override Task<PemFilesOptions> Default() + public override async Task<PemFilesOptions?> Default() { var args = _arguments.GetArguments<PemFilesArguments>(); var path = _settings.Store.DefaultPemFilesPath; @@ -52,14 +52,14 @@ namespace PKISharp.WACS.Plugins.StorePlugins } } - private Task<PemFilesOptions> Create(string path) + private PemFilesOptions Create(string path) { var ret = new PemFilesOptions(); if (!string.Equals(path, _settings.Store.DefaultPemFilesPath, StringComparison.CurrentCultureIgnoreCase)) { ret.Path = path; } - return Task.FromResult(ret); + return ret; } } |