Bumped up various packages that were obsolete or contained vulnerabilities. Also re-factored code to eliminate warnings.

Bob Pokorny · Bob Pokorny · commit c1c3702b0144 · 2025-06-05T21:12:24.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 * Fixed error when attempting to connect to remote computer using UO service account
 * Fixed the creation of a certificate when the Cryptographic Service Provider was changed by the user
 * Updated logic when getting the CSP.  Now supports modern CHG and legacy CAPI APIs.  This will allow the CSP to show in the stores inventory.
+* Re-factored code to eliminate warnings
+* Bumped up he following packages to eliminate .net vulnerabilities and obsolete packages:
+	* Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="1.0.0"
+    * Microsoft.PowerShell.SDK" Version="7.4.10" Condition="'$(TargetFramework)' == 'net8.0'"
+    * runtime.linux-arm64.runtime.native.System.IO.Ports" Version="9.0.5"
+    * runtime.osx-arm64.runtime.native.System.IO.Ports" Version="9.0.5"
+    * System.Formats.Asn1" Version="8.0.2" Condition="'$(TargetFramework)' == 'net6.0'"
+	* System.Formats.Asn1" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'"
+    * System.IO.Packaging" Version="6.0.2" Condition="'$(TargetFramework)' == 'net6.0'"
+    * System.IO.Packaging" Version="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'"
+    * System.Text.Json" Version="8.0.5"
 
 2.6.1
 * Documentation updates for the 2.6 release
diff --git a/IISU/ClientPSCertStoreReEnrollment.cs b/IISU/ClientPSCertStoreReEnrollment.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Ignore Spelling: Keyfactor
+// Ignore Spelling: Keyfactor Reenrollment
 
 // 021225 rcp   Cleaned up and removed unnecessary code
 
@@ -40,7 +40,9 @@ internal class ClientPSCertStoreReEnrollment
         private readonly IPAMSecretResolver _resolver;
 
         private PSHelper _psHelper;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         private Collection<PSObject>? _results;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         public ClientPSCertStoreReEnrollment(ILogger logger, IPAMSecretResolver resolver)
         {
diff --git a/IISU/ImplementedStoreTypes/Win/Inventory.cs b/IISU/ImplementedStoreTypes/Win/Inventory.cs
@@ -14,6 +14,8 @@
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
+// Ignore Spelling: Keyfactor
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -31,9 +33,11 @@ public class Inventory : WinCertJobTypeBase, IInventoryJobExtension
     {
         private ILogger _logger;
         public string ExtensionName => "WinCertInventory";
-        
+
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         Collection<PSObject>? results = null;
-        
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+
         public Inventory()
         {
 
diff --git a/IISU/ImplementedStoreTypes/Win/Management.cs b/IISU/ImplementedStoreTypes/Win/Management.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.using Keyfactor.Logging;
 
-// Ignore Spelling: Keyfactor
+// Ignore Spelling: Keyfactor crypto
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
@@ -35,7 +35,9 @@ public class Management : WinCertJobTypeBase, IManagementJobExtension
         private ILogger _logger;
 
         private PSHelper _psHelper;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         private Collection<PSObject>? _results = null;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         // Function wide config values
         private string _clientMachineName = string.Empty;
@@ -95,7 +97,9 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
                         {
                             string certificateContents = config.JobCertificate.Contents;
                             string privateKeyPassword = config.JobCertificate.PrivateKeyPassword;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
                             string? cryptoProvider = config.JobProperties["ProviderName"]?.ToString();
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
                             complete = AddCertificate(certificateContents, privateKeyPassword, cryptoProvider);
                             _logger.LogTrace($"Completed adding the certificate to the store");
diff --git a/IISU/ImplementedStoreTypes/WinIIS/IISBindingInfo.cs b/IISU/ImplementedStoreTypes/WinIIS/IISBindingInfo.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Ignore Spelling: Keyfactor IISU
+// Ignore Spelling: Keyfactor IISU Sni Aliase
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
@@ -29,7 +29,9 @@ public class IISBindingInfo
         public string Protocol { get; set; }
         public string IPAddress { get; set; }
         public string Port { get; set; }
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         public string? HostName { get; set; }
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         public string SniFlag { get; set; }
         public string Thumbprint { get; private set; }
 
diff --git a/IISU/ImplementedStoreTypes/WinIIS/Inventory.cs b/IISU/ImplementedStoreTypes/WinIIS/Inventory.cs
@@ -14,6 +14,8 @@
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
+// Ignore Spelling: Keyfactor IISU
+
 using Keyfactor.Logging;
 using Keyfactor.Orchestrators.Common.Enums;
 using Keyfactor.Orchestrators.Extensions;
@@ -30,7 +32,9 @@ namespace Keyfactor.Extensions.Orchestrator.WindowsCertStore.IISU
     public class Inventory : WinCertJobTypeBase, IInventoryJobExtension
     {
         private ILogger _logger;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         Collection<PSObject>? results = null;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         public string ExtensionName => "WinIISUInventory";
 
diff --git a/IISU/ImplementedStoreTypes/WinIIS/Management.cs b/IISU/ImplementedStoreTypes/WinIIS/Management.cs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Ignore Spelling: Keyfactor IISU Crypto
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -34,7 +35,9 @@ public class Management : WinCertJobTypeBase, IManagementJobExtension
         private ILogger _logger;
 
         private PSHelper _psHelper;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         private Collection<PSObject>? _results = null;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         // Function wide config values
         private string _clientMachineName = string.Empty;
@@ -99,7 +102,9 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
                             {
                                 string certificateContents = config.JobCertificate.Contents;
                                 string privateKeyPassword = config.JobCertificate.PrivateKeyPassword;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
                                 string? cryptoProvider = config.JobProperties["ProviderName"]?.ToString();
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
                                 // Add Certificate to Cert Store
                                 try
diff --git a/IISU/ImplementedStoreTypes/WinIIS/WinIISBinding.cs b/IISU/ImplementedStoreTypes/WinIIS/WinIISBinding.cs
@@ -14,6 +14,8 @@
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
+// Ignore Spelling: Keyfactor IISU
+
 using Keyfactor.Logging;
 using Microsoft.Extensions.Logging;
 using System;
@@ -25,9 +27,9 @@ namespace Keyfactor.Extensions.Orchestrator.WindowsCertStore.IISU
 {
     public class WinIISBinding
     {
-        private static ILogger _logger;
-        private static Collection<PSObject>? _results = null;
-        private static PSHelper _helper;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
+        private static ILogger? _logger;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         public static Collection<PSObject> BindCertificate(PSHelper psHelper, IISBindingInfo bindingInfo, string thumbprint, string renewalThumbprint, string storePath)
         {
diff --git a/IISU/ImplementedStoreTypes/WinSQL/Inventory.cs b/IISU/ImplementedStoreTypes/WinSQL/Inventory.cs
@@ -35,7 +35,9 @@ public class Inventory : WinCertJobTypeBase, IInventoryJobExtension
         private ILogger _logger;
         public string ExtensionName => "WinSqlInventory";
 
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         Collection<PSObject>? results = null;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         public Inventory()
         {
diff --git a/IISU/ImplementedStoreTypes/WinSQL/Management.cs b/IISU/ImplementedStoreTypes/WinSQL/Management.cs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Ignore Spelling: thumbprint Keyfactor sql
+// Ignore Spelling: thumbprint Keyfactor sql crypto
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
@@ -35,7 +35,9 @@ public class Management : WinCertJobTypeBase, IManagementJobExtension
         private ILogger _logger;
 
         private PSHelper _psHelper;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         private Collection<PSObject>? _results = null;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         // Function wide config values
         private string _clientMachineName = string.Empty;
@@ -172,8 +174,6 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
                                         // Remove the certificate from the cert store
                                         complete = RemoveCertificate(config.JobCertificate.Alias);
                                         _logger.LogTrace($"Completed removing the certificate from the store");
-
-                                        break;
                                     }
                                     else
                                     {
@@ -184,7 +184,6 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
                                             FailureMessage = "Unable to unbind one or more certificates from the SQL Instances."
                                         };
                                     }
-
                                 }
                                 catch (Exception ex)
                                 {
@@ -195,10 +194,9 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
                                         FailureMessage = ex.Message
                                     };
                                 }
-
-                                _logger.LogTrace($"Completed unbinding and removing the certificate from the store");
-                                return complete;
                             }
+                            _logger.LogTrace($"Completed unbinding and removing the certificate from the store");
+                            return complete;
                     }
                 }
 
diff --git a/IISU/ImplementedStoreTypes/WinSQL/WinSqlBinding.cs b/IISU/ImplementedStoreTypes/WinSQL/WinSqlBinding.cs
@@ -28,7 +28,9 @@ namespace Keyfactor.Extensions.Orchestrator.WindowsCertStore.WinSql
     public class WinSqlBinding
     {
         private static ILogger _logger;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         private static Collection<PSObject>? _results = null;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         public WinSqlBinding()
         {
diff --git a/IISU/PSHelper.cs b/IISU/PSHelper.cs
@@ -14,6 +14,8 @@
 
 // 021225 rcp   2.6.0   Cleaned up and verified code
 
+// Ignore Spelling: Keyfactor
+
 using Keyfactor.Logging;
 using Microsoft.Extensions.Logging;
 using System;
@@ -47,7 +49,9 @@ public class PSHelper : IDisposable
         private string port;
         private bool useSPN;
         private string machineName;
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         private string? argument;
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
 
         private string serverUserName;
         private string serverPassword;
@@ -301,7 +305,9 @@ public void Terminate()
             PS.Dispose();
         }
 
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         public Collection<PSObject>? InvokeFunction(string functionName, Dictionary<string, Object>? parameters = null)
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         {
             PS.Commands.Clear();
 
@@ -339,7 +345,9 @@ public Collection<PSObject> ExecutePowerShellScript(string script)
         }
 
 
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         public Collection<PSObject>? ExecutePowerShell(string commandOrScript, Dictionary<string, object>? parameters = null, bool isScript = false)
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         {
             try
             {
@@ -482,7 +490,9 @@ private static string FindPSLocation(string directory, string fileName)
             return null;
         }
 
+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         public static void ProcessPowerShellScriptEvent(object? sender, DataAddedEventArgs e)
+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
         {
             if (sender != null)
             {
diff --git a/IISU/WindowsCertStore.csproj b/IISU/WindowsCertStore.csproj
@@ -34,11 +34,16 @@
 		<PackageReference Include="Cake.Powershell" Version="4.0.0" />
 		<PackageReference Include="Keyfactor.Logging" Version="1.1.1" />
 		<PackageReference Include="Keyfactor.Orchestrators.Common" Version="3.2.0" />
-		<PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
+		<PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="1.0.0" />
 		<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
-		<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.5" Condition="'$(TargetFramework)' == 'net8.0'" />
-		<PackageReference Include="System.IO.Packaging" Version="6.0.2"  Condition="'$(TargetFramework)' == 'net6.0'" />
-		<PackageReference Include="System.IO.Packaging" Version="8.0.1"  Condition="'$(TargetFramework)' == 'net8.0'" />
+		<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.10" Condition="'$(TargetFramework)' == 'net8.0'" />
+		<PackageReference Include="runtime.linux-arm64.runtime.native.System.IO.Ports" Version="9.0.5" />
+		<PackageReference Include="runtime.osx-arm64.runtime.native.System.IO.Ports" Version="9.0.5" />
+		<PackageReference Include="System.Formats.Asn1" Version="8.0.2" Condition="'$(TargetFramework)' == 'net6.0'" />
+		<PackageReference Include="System.Formats.Asn1" Version="9.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+		<PackageReference Include="System.IO.Packaging" Version="6.0.2" Condition="'$(TargetFramework)' == 'net6.0'" />
+		<PackageReference Include="System.IO.Packaging" Version="8.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
+		<PackageReference Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
 
   <ItemGroup>
diff --git a/WinCertTestConsole/WinCertTestConsole.csproj b/WinCertTestConsole/WinCertTestConsole.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Keyfactor.Orchestrators.Common" Version="3.2.0" />
-    <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
+    <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="1.0.0" />
 	<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
     <PackageReference Include="RestSharp" Version="112.0.0" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`
`15`	`15`	`// 021225 rcp 2.6.0 Cleaned up and verified code`
`16`	`16`
	`17`	`+// Ignore Spelling: Keyfactor IISU`
	`18`	`+`
`17`	`19`	`using Keyfactor.Logging;`
`18`	`20`	`using Microsoft.Extensions.Logging;`
`19`	`21`	`using System;`
`@@ -25,9 +27,9 @@ namespace Keyfactor.Extensions.Orchestrator.WindowsCertStore.IISU`
`25`	`27`	`{`
`26`	`28`	`public class WinIISBinding`
`27`	`29`	`{`
`28`		`- private static ILogger _logger;`
`29`		`- private static Collection<PSObject>? _results = null;`
`30`		`- private static PSHelper _helper;`
	`30`	`+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.`
	`31`	`+ private static ILogger? _logger;`
	`32`	`+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.`
`31`	`33`
`32`	`34`	`public static Collection<PSObject> BindCertificate(PSHelper psHelper, IISBindingInfo bindingInfo, string thumbprint, string renewalThumbprint, string storePath)`
`33`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ public class Inventory : WinCertJobTypeBase, IInventoryJobExtension`
`35`	`35`	`private ILogger _logger;`
`36`	`36`	`public string ExtensionName => "WinSqlInventory";`
`37`	`37`
	`38`	`+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.`
`38`	`39`	`Collection<PSObject>? results = null;`
	`40`	`+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.`
`39`	`41`
`40`	`42`	`public Inventory()`
`41`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`// See the License for the specific language governing permissions and`
`13`	`13`	`// limitations under the License.`
`14`	`14`
`15`		`-// Ignore Spelling: thumbprint Keyfactor sql`
	`15`	`+// Ignore Spelling: thumbprint Keyfactor sql crypto`
`16`	`16`
`17`	`17`	`// 021225 rcp 2.6.0 Cleaned up and verified code`
`18`	`18`
`@@ -35,7 +35,9 @@ public class Management : WinCertJobTypeBase, IManagementJobExtension`
`35`	`35`	`private ILogger _logger;`
`36`	`36`
`37`	`37`	`private PSHelper _psHelper;`
	`38`	`+#pragma warning disable CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.`
`38`	`39`	`private Collection<PSObject>? _results = null;`
	`40`	`+#pragma warning restore CS8632 // The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.`
`39`	`41`
`40`	`42`	`// Function wide config values`
`41`	`43`	`private string _clientMachineName = string.Empty;`
`@@ -172,8 +174,6 @@ public JobResult ProcessJob(ManagementJobConfiguration config)`
`172`	`174`	`// Remove the certificate from the cert store`
`173`	`175`	`complete = RemoveCertificate(config.JobCertificate.Alias);`
`174`	`176`	`_logger.LogTrace($"Completed removing the certificate from the store");`
`175`		`-`
`176`		`- break;`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
`@@ -184,7 +184,6 @@ public JobResult ProcessJob(ManagementJobConfiguration config)`
`184`	`184`	`FailureMessage = "Unable to unbind one or more certificates from the SQL Instances."`
`185`	`185`	`};`
`186`	`186`	`}`
`187`		`-`
`188`	`187`	`}`
`189`	`188`	`catch (Exception ex)`
`190`	`189`	`{`
`@@ -195,10 +194,9 @@ public JobResult ProcessJob(ManagementJobConfiguration config)`
`195`	`194`	`FailureMessage = ex.Message`
`196`	`195`	`};`
`197`	`196`	`}`
`198`		`-`
`199`		`- _logger.LogTrace($"Completed unbinding and removing the certificate from the store");`
`200`		`- return complete;`
`201`	`197`	`}`
	`198`	`+ _logger.LogTrace($"Completed unbinding and removing the certificate from the store");`
	`199`	`+ return complete;`
`202`	`200`	`}`
`203`	`201`	`}`
`204`	`202`