Merge 511030c into 5bda999

Keyfactor · Oct 18, 2021 · 9fa5ddd · 9fa5ddd
2 parents 5bda999 + 511030c
commit 9fa5ddd
Show file tree

Hide file tree

Showing 23 changed files with 333 additions and 702 deletions.
diff --git a/.github/workflows/keyfactor-extension-prerelease.yml b/.github/workflows/keyfactor-extension-prerelease.yml
@@ -135,10 +135,7 @@ jobs:
         run: |
            md ${{ github.workspace }}\zip\Keyfactor
            Compress-Archive -Path `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\*.dll, `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\*.json, `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\*.config, `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\Keyfactor.Extensions.Pam.Config.exe `
+           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\netcoreapp3.1\* `
            -DestinationPath ${{ github.workspace }}\zip\Keyfactor\$Env:REPO_NAME.zip -Force
       
 

diff --git a/.github/workflows/keyfactor-extension-release.yml b/.github/workflows/keyfactor-extension-release.yml
@@ -91,28 +91,29 @@ jobs:
         run: |
             $VersionRegex = "\d+\.\d+\.\d+"
             $assemblyInfoFiles = (Get-ChildItem -Include AssemblyInfo.cs -File -Recurse).fullname
-            $newVer = "${{ steps.create_release.outputs.current_tag }}".TrimStart('v').Split('-')[0]
-            echo "Prepared to overwrite Assembly version to: ${newVer}"
-            foreach ($assemblyInfoFile in $assemblyInfoFiles)
+            if ($assemblyInfoFiles -ne $null)
             {
-              $filecontent = Get-Content($assemblyInfoFile)
-              attrib $assemblyInfoFile -r
-              $filecontent -replace $VersionRegex, $newVer | Out-File $assemblyInfoFile
+              $newVer = "${{ steps.create_release.outputs.current_tag }}".TrimStart('v').Split('-')[0]
+              echo "Prepared to overwrite Assembly version to: ${newVer}"
+              foreach ($assemblyInfoFile in $assemblyInfoFiles)
+              {
+                $filecontent = Get-Content($assemblyInfoFile)
+                attrib $assemblyInfoFile -r
+                $filecontent -replace $VersionRegex, $newVer | Out-File $assemblyInfoFile
+              }
             }
       
       - name: Execute MSBuild Commands
         run: |
-          MSBuild.exe $Env:SOLUTION_PATH -p:RestorePackagesConfig=false -p:Configuration=Release       
+          $newVer = "${{ steps.create_release.outputs.current_tag }}".TrimStart('v').Split('-')[0]
+          MSBuild.exe $Env:SOLUTION_PATH -p:RestorePackagesConfig=false -p:Configuration=Release -p:Version=$newVer
       
       - name: Archive Files
         if: ${{ success() }}
         run: |
            md ${{ github.workspace }}\zip\Keyfactor
            Compress-Archive -Path `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\*.dll, `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\*.json, `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\*.config, `
-           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\Keyfactor.Extensions.Pam.Config.exe `
+           ${{ env.SOLUTION_FOLDER }}\${{ env.PROJECT_FOLDER }}\bin\Release\netcoreapp3.1\* `
            -DestinationPath ${{ github.workspace }}\zip\Keyfactor\$Env:REPO_NAME.zip -Force      
       
       - name: Upload Release Asset (x64)

diff --git a/PEMStoreSSH.sln b/PEMStoreSSH.sln
@@ -1,34 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29020.237
+VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PEMStoreSSH", "PEMStoreSSH\PEMStoreSSH.csproj", "{F57D07DB-613D-4837-B709-6E943CD4BA10}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PEMStoreSSH", "PEMStoreSSH\PEMStoreSSH.csproj", "{CAF9DBE4-D7D5-400C-A4ED-7A1B29F78AED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F57D07DB-613D-4837-B709-6E943CD4BA10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F57D07DB-613D-4837-B709-6E943CD4BA10}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F57D07DB-613D-4837-B709-6E943CD4BA10}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F57D07DB-613D-4837-B709-6E943CD4BA10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAF9DBE4-D7D5-400C-A4ED-7A1B29F78AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAF9DBE4-D7D5-400C-A4ED-7A1B29F78AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAF9DBE4-D7D5-400C-A4ED-7A1B29F78AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAF9DBE4-D7D5-400C-A4ED-7A1B29F78AED}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {05D96C70-6482-4130-B82B-8B6C511A9C97}
-	EndGlobalSection
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 2
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = https://devops.corp.keyfactor.com/maincollection
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = PEMStoreSSH\\PEMStoreSSH.csproj
-		SccProjectName1 = PEMStoreSSH
-		SccLocalPath1 = PEMStoreSSH
+		SolutionGuid = {4547129F-24F9-423B-85AD-683F7176E21C}
 	EndGlobalSection
 EndGlobal
diff --git a/PEMStoreSSH/App.config b/PEMStoreSSH/App.config
diff --git a/PEMStoreSSH/ApplicationSettings.cs b/PEMStoreSSH/ApplicationSettings.cs
@@ -1,9 +1,15 @@
-using System.Configuration;
+// Copyright 2021 Keyfactor
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+
 using System.IO;
 
 using Newtonsoft.Json;
 
-namespace PEMStoreSSH
+namespace Keyfactor.Extensions.Orchestrator.PEMStoreSSH
 {
     class ApplicationSettings
     {

diff --git a/PEMStoreSSH/CertificateFormats/ICertificateFormatHandler.cs b/PEMStoreSSH/CertificateFormats/ICertificateFormatHandler.cs
@@ -8,9 +8,9 @@
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 
-using PEMStoreSSH.RemoteHandlers;
+using Keyfactor.Extensions.Orchestrator.PEMStoreSSH.RemoteHandlers;
 
-namespace PEMStoreSSH
+namespace Keyfactor.Extensions.Orchestrator.PEMStoreSSH
 {
     interface ICertificateFormatHandler
     {

diff --git a/PEMStoreSSH/CertificateFormats/PEMHandler.cs b/PEMStoreSSH/CertificateFormats/PEMHandler.cs
@@ -5,19 +5,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
+using Keyfactor.Extensions.Orchestrator.PEMStoreSSH.RemoteHandlers;
+using Keyfactor.PKI.PEM;
+using Keyfactor.PKI.PrivateKeys;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Security.Cryptography.X509Certificates;
 
-using CSS.PKI.PEM;
-using CSS.PKI.PrivateKeys;
-
-using PEMStoreSSH.RemoteHandlers;
-
-namespace PEMStoreSSH
+namespace Keyfactor.Extensions.Orchestrator.PEMStoreSSH
 {
     class PEMHandler : ICertificateFormatHandler
     {
@@ -82,7 +79,7 @@ public List<SSHFileInfo> CreateCertificatePacket(string certToAdd, string alias,
 
             if (!string.IsNullOrEmpty(pfxPassword))
             {
-                PrivateKeyConverter converter = CSS.PKI.PrivateKeys.PrivateKeyConverterFactory.FromPKCS12(certBytes, pfxPassword);
+                PrivateKeyConverter converter = PrivateKeyConverterFactory.FromPKCS12(certBytes, pfxPassword);
                 byte[] privateKeyBytes = string.IsNullOrEmpty(storePassword) ? converter.ToPkcs8BlobUnencrypted() : converter.ToPkcs8Blob(storePassword);
                 string privateKeyPem = PemUtilities.DERToPEM(privateKeyBytes, string.IsNullOrEmpty(storePassword) ? PemUtilities.PemObjectType.PrivateKey : PemUtilities.PemObjectType.EncryptedPrivateKey);
 
@@ -130,9 +127,13 @@ public void AddCertificateToStore(List<SSHFileInfo> files, string storePath, str
             X509Certificate2 x509Cert = new X509Certificate2(Encoding.ASCII.GetBytes(certInfo.FileContents));
 
             if (isSingleCertificateStore)
+            {
                 ReplaceStoreContents(storePath, ssh, certInfo.FileContents, overwrite);
+            }
             else
+            {
                 AddRemoveCertificate(serverType, storePath, ssh, certInfo.Alias, x509Cert.Thumbprint, certInfo.FileContents, privateKeyPath, hasPrivateKey, overwrite, true);
+            }
 
 
             if (!string.IsNullOrEmpty(privateKeyPath) && files.Exists(p => p.FileType == SSHFileInfo.FileTypeEnum.PrivateKey))
@@ -147,7 +148,9 @@ public void RemoveCertificate(PEMStore.ServerTypeEnum serverType, string storePa
             AddRemoveCertificate(serverType, storePath, ssh, alias, string.Empty, string.Empty, privateKeyPath, hasPrivateKey, false, false);
 
             if (!string.IsNullOrEmpty(privateKeyPath))
+            {
                 ssh.UploadCertificateFile(privateKeyPath, new byte[] { });
+            }
         }
 
         public bool IsValidStore(string path, PEMStore.ServerTypeEnum serverType, IRemoteHandler ssh)
@@ -157,8 +160,6 @@ public bool IsValidStore(string path, PEMStore.ServerTypeEnum serverType, IRemot
             return result.IndexOf(CertDelimBeg) > -1;
         }
 
-
-
         private void AddRemoveCertificate(PEMStore.ServerTypeEnum serverType, string storePath, IRemoteHandler ssh, string alias, string thumbprint, string replacementCert, string privateKeyPath, bool hasPrivateKey, bool overwrite, bool isAdd)
         {
             bool certFound = false;
@@ -167,7 +168,9 @@ private void AddRemoveCertificate(PEMStore.ServerTypeEnum serverType, string sto
             string storeContents = Encoding.ASCII.GetString(storebytes);
 
             if (hasPrivateKey && string.IsNullOrEmpty(privateKeyPath))
+            {
                 storeContents = RemoveAllPrivateKeys(storeContents);
+            }
 
             string storeContentsParsing = storeContents;
 
@@ -181,7 +184,9 @@ private void AddRemoveCertificate(PEMStore.ServerTypeEnum serverType, string sto
                 if (x509CurrCertFromStore.Thumbprint == alias || x509CurrCertFromStore.Thumbprint == thumbprint)
                 {
                     if (!overwrite && isAdd)
+                    {
                         throw new PEMException("Certificate with this alias/thumbprint already exists in store.  Please select 'Overwrite' if you wish to replace this certificate.");
+                    }
 
                     storeContents = storeContents.Replace(currCertFromStore, replacementCert);
                     certFound = true;
@@ -192,10 +197,14 @@ private void AddRemoveCertificate(PEMStore.ServerTypeEnum serverType, string sto
             }
 
             if (!certFound && !isAdd)
+            {
                 throw new PEMException("Certificate with this alias/thumbprint does not exist in store.");
+            }
 
             if (storeContents.IndexOf(replacementCert) == -1 && isAdd)
+            {
                 storeContents += ("\n" + replacementCert);
+            }
 
             ssh.UploadCertificateFile(storePath, Encoding.ASCII.GetBytes(storeContents));
         }
@@ -205,7 +214,9 @@ private void ReplaceStoreContents(string storePath, IRemoteHandler ssh, string f
             byte[] storebytes = ssh.DownloadCertificateFile(storePath, HasBinaryContent);
             string storeContents = Encoding.ASCII.GetString(storebytes);
             if (!overwrite && storeContents.IndexOf(CertDelimBeg, StringComparison.OrdinalIgnoreCase) > -1)
+            {
                 throw new PEMException("Certificate store currently contains one or more certificates.  Please select 'overwrite' to replace the contents of the store.");
+            }
 
             ssh.UploadCertificateFile(storePath, Encoding.ASCII.GetBytes(fileContents));
         }

diff --git a/PEMStoreSSH/CertificateFormats/PKCS12Handler.cs b/PEMStoreSSH/CertificateFormats/PKCS12Handler.cs
@@ -5,22 +5,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
 // and limitations under the License.
 
+using Keyfactor.PKI.X509;
+using Org.BouncyCastle.Pkcs;
+using Keyfactor.Extensions.Orchestrator.PEMStoreSSH.RemoteHandlers;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 
-using CSS.PKI.X509;
-
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Pkcs;
-using Org.BouncyCastle.X509;
-
-using PEMStoreSSH.RemoteHandlers;
-
-namespace PEMStoreSSH
+namespace Keyfactor.Extensions.Orchestrator.PEMStoreSSH
 {
     class PKCS12Handler : ICertificateFormatHandler
     {