initial-integration-tests

Author: Lee Fine

RemoteFileIntegrationTests/BaseRFPEMTest.cs

@@ -4,6 +4,7 @@
 using Org.BouncyCastle.Crypto.Operators;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.OpenSsl;
+using Org.BouncyCastle.Pkcs;
 using Org.BouncyCastle.Security;
 using Org.BouncyCastle.X509;
 
@@ -16,18 +17,12 @@ public abstract class BaseRFPEMTest : BaseTest
         private static string pemCertificate = string.Empty;
         private static string pemKey = string.Empty;
 
-        public BaseRFPEMTest()
-        {
-            if (pemCertificate == null)
-                CreateCertificateAndKey();
-        }
-
         public void CreateStore(string fileName, bool withExtKeyFile, bool withCertificate, STORE_ENVIRONMENT_ENUM storeEnvironment)
         {
             string storeContents = withCertificate ? (withExtKeyFile ? pemCertificate : pemCertificate + System.Environment.NewLine + pemKey) : string.Empty;
             CreateFile($"{fileName}.pem", Encoding.ASCII.GetBytes(storeContents), storeEnvironment);
             if (withExtKeyFile)
-                CreateFile($"{fileName}.key", Encoding.ASCII.GetBytes(pemKey), storeEnvironment);
+                CreateFile($"{fileName}.key", Encoding.ASCII.GetBytes(withCertificate ? pemKey : string.Empty), storeEnvironment);
         }
 
         public void RemoveStore(string fileName, bool withExtKeyFile, STORE_ENVIRONMENT_ENUM storeEnvironment)
@@ -37,8 +32,11 @@ public void RemoveStore(string fileName, bool withExtKeyFile, STORE_ENVIRONMENT_
                 RemoveFile($"{fileName}.key", storeEnvironment);
         }
 
-        private void CreateCertificateAndKey()
+        public void CreateCertificateAndKey()
         {
+            if (!string.IsNullOrEmpty(pemCertificate))
+                return;
+
             var keyGen = new RsaKeyPairGenerator();
             keyGen.Init(new KeyGenerationParameters(new SecureRandom(), 2048));
             AsymmetricCipherKeyPair keyPair = keyGen.GenerateKeyPair();
@@ -76,7 +74,7 @@ private void CreateCertificateAndKey()
             using (var sw = new StringWriter())
             {
                 var pw = new PemWriter(sw);
-                pw.WriteObject(keyPair.Private);
+                pw.WriteObject((new Pkcs8Generator(keyPair.Private)).Generate());
                 pw.Writer.Flush();
                 pemKey = sw.ToString();
             }

RemoteFileIntegrationTests/RFPEMInventoryTests.cs

@@ -17,7 +17,7 @@ public void RFPEM_Inventory_InternalPrivateKey_EmptyStore_Linux_Test0001()
         {
             InventoryJobConfiguration config = BuildBaseInventoryConfig();
             config.CertificateStoreDetails.ClientMachine = EnvironmentVariables.LinuxServer;
-            config.CertificateStoreDetails.StorePath = EnvironmentVariables.LinuxStorePath;
+            config.CertificateStoreDetails.StorePath = EnvironmentVariables.LinuxStorePath + "Test0001.pem";
             config.CertificateStoreDetails.Properties = "{}";
             //config.CertificateStoreDetails.Properties = JsonConvert.SerializeObject(new Dictionary<string, string?>() { { "SeparatePrivateKeyFilePath", Environment.GetEnvironmentVariable("LinuxStorePath") + "Test0001.key" } });
             config.CertificateStoreDetails.ClientMachine = EnvironmentVariables.LinuxServer;
@@ -31,6 +31,30 @@ public void RFPEM_Inventory_InternalPrivateKey_EmptyStore_Linux_Test0001()
 
             Assert.Equal(OrchestratorJobStatusJobResult.Success, result.Result);
 
+            IInvocation invocation = submitInventoryUpdate.Invocations[0];
+            List<CurrentInventoryItem> inventoryItems = (List<CurrentInventoryItem>)invocation.Arguments[0];
+            Assert.Empty(inventoryItems);
+        }
+
+        [Fact]
+        public void RFPEM_Inventory_InternalPrivateKey_WithCert_Linux_Test0002()
+        {
+            InventoryJobConfiguration config = BuildBaseInventoryConfig();
+            config.CertificateStoreDetails.ClientMachine = EnvironmentVariables.LinuxServer;
+            config.CertificateStoreDetails.StorePath = EnvironmentVariables.LinuxStorePath + "Test0002.pem";
+            config.CertificateStoreDetails.Properties = "{}";
+            //config.CertificateStoreDetails.Properties = JsonConvert.SerializeObject(new Dictionary<string, string?>() { { "SeparatePrivateKeyFilePath", Environment.GetEnvironmentVariable("LinuxStorePath") + "Test0001.key" } });
+            config.CertificateStoreDetails.ClientMachine = EnvironmentVariables.LinuxServer;
+
+            Mock<IPAMSecretResolver> secretResolver = GetMockSecretResolver(config);
+
+            Mock<SubmitInventoryUpdate> submitInventoryUpdate = new Mock<SubmitInventoryUpdate>();
+
+            Inventory inventory = new Inventory(secretResolver.Object);
+            JobResult result = inventory.ProcessJob(config, submitInventoryUpdate.Object);
+
+            Assert.Equal(OrchestratorJobStatusJobResult.Success, result.Result);
+
             IInvocation invocation = submitInventoryUpdate.Invocations[0];
             List<CurrentInventoryItem> inventoryItems = (List<CurrentInventoryItem>)invocation.Arguments[0];
             Assert.Single(inventoryItems);
@@ -44,11 +68,12 @@ public void RFPEM_Inventory_InternalPrivateKey_EmptyStore_Linux_Test0001()
 
                 Assert.Equal(EnvironmentVariables.CertificateSubjectDN, certificate.SubjectDN.ToString());
             }
-
         }
 
         public override void SetUp()
         {
+            CreateCertificateAndKey();
+
             CreateStore("Test0001", false, false, STORE_ENVIRONMENT_ENUM.LINUX);
             CreateStore("Test0002", false, true, STORE_ENVIRONMENT_ENUM.LINUX);
             CreateStore("Test0003", true, false, STORE_ENVIRONMENT_ENUM.LINUX);