Merge pull request #97 from PKISharp/96-fix-autogen

96 fix autogen
PKISharp · Jul 30, 2020 · 32dc6f5 · 32dc6f5
2 parents e0080cd + b55bd0e
commit 32dc6f5
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 14 deletions.
diff --git a/ACME-PS/functions/Order/Complete-Order.ps1 b/ACME-PS/functions/Order/Complete-Order.ps1
@@ -70,11 +70,13 @@ function Complete-Order {
         $ErrorActionPreference = 'Stop';
 
         if($GenerateCertificateKey) {
-            $CertificateKey = $State.GetOrderCertificateKey($Order);
+            $OrderCertificateKey = $State.GetOrderCertificateKey($Order);
 
-            if($null -eq $CertificateKey) {
+            if($null -eq $OrderCertificateKey) {
                 $SaveCertificateKey = $true;
                 $CertificateKey = New-CertificateKey -SkipKeyExport -WarningAction 'SilentlyContinue';
+            } else {
+                $CertificateKey = $OrderCertificateKey;
             }
         }
 

diff --git a/ACME-PS/internal/classes/AcmeState.InMemory.ps1 b/ACME-PS/internal/classes/AcmeState.InMemory.ps1
@@ -5,6 +5,7 @@ class AcmeInMemoryState : AcmeState {
     [ValidateNotNull()] hidden [AcmeAccount] $Account;
 
     hidden [hashtable] $Orders = @{};
+    hidden [hashtable] $CertKeys = @{}
 
     AcmeInMemoryState() {
     }
@@ -33,4 +34,18 @@ class AcmeInMemoryState : AcmeState {
         $orderHash = $order.GetHashString();
         $this.Orders.Remove($orderHash);
     }
+
+    [ICertificateKey] GetOrderCertificateKey([AcmeOrder] $order) {
+        $orderHash = $order.GetHashString();
+        if ($this.CertKeys.ContainsKey($orderHash)) {
+            return $this.CertKeys[$orderHash];
+        }
+
+        return $null;
+    }
+
+    [void] SetOrderCertificateKey([AcmeOrder] $order, [ICertificateKey] $certificateKey) {
+        $orderHash = $order.GetHashString();
+        $this.CertKeys[$orderHash] = $certificateKey;
+    }
 }
diff --git a/ACME-PS/tests/Complete-Order.Tests.ps1 b/ACME-PS/tests/Complete-Order.Tests.ps1
@@ -5,7 +5,7 @@ InModuleScope ACME-PS {
             AuthorizationUrl = "https://service.acme/Order1/AuthZ";
             FinalizeUrl = "https://service.acme/Order1/Finalize";
         };
-        
+
         Mock Invoke-AcmeWebRequest {
             $mockResult = [AcmeHttpResponse]::new();
             $mockResult.NextNonce = "NextNonce";
@@ -23,7 +23,7 @@ InModuleScope ACME-PS {
         $state.Set($simpleState.GetAccountKey());
         $state.Set($simpleState.GetAccount());
 
-        $order = [AcmeOrder]::new([PSCustomObject]@{
+        $orderData = [PSCustomObject]@{
             Status = "ready";
             Expires  = [DateTime]::Now.AddDays(1);
 
@@ -39,16 +39,26 @@ InModuleScope ACME-PS {
             CSROptions = [AcmeCsrOptions]::new([PSCustomObject]@{
                 DistinguishedName = "CN=CommonName";
             });
-        });
-
-        $certificateKey = New-CertificateKey -RSA -SkipKeyExport -WarningAction 'SilentlyContinue';
+        };
+
 
         Context 'CustomKey parameter set' {
+            $order = [AcmeOrder]::new($orderData);
+            $certificateKey = New-CertificateKey -RSA -SkipKeyExport -WarningAction 'SilentlyContinue';
             Complete-Order -State $state -Order $order -CertificateKey $certificateKey;
 
             It 'called ACME service to finalize the order' {
                 Assert-VerifiableMock
             }
         }
+
+        Context 'GenerateKey paraeter set' {
+            $order = [AcmeOrder]::new($orderData);
+            Complete-Order -State $state -Order $order -GenerateCertificateKey;
+
+            It 'called ACME service to finalize the order' {
+                Assert-VerifiableMock
+            }
+        }
     }
 }
diff --git a/build.ps1 b/build.ps1
@@ -103,13 +103,12 @@ process {
 
     Write-Information "Finished building - running tests";
 
-    if ($null -ne (Get-Module PSScriptAnalyzer -ListAvailable)) {
-        & Invoke-ScriptAnalyzer -Path $ModuleOutFile;
-    }
-
     <# Run tests #>
     & Invoke-Command -ScriptBlock {
         Import-Module "$ModuleOutPath\ACME-PS.psd1" -ErrorAction 'Stop'
-        Invoke-Pester -Path "$ModuleSourcePath\tests"
+        if ($null -ne (Get-Module PSScriptAnalyzer -ListAvailable)) {
+            & Invoke-ScriptAnalyzer -Path $ModuleOutFile;
+        }
+        & Invoke-Pester -Path "$ModuleSourcePath\tests"
     }
 }
diff --git a/dist/ACME-PS/ACME-PS.psm1 b/dist/ACME-PS/ACME-PS.psm1
@@ -920,6 +920,7 @@ class AcmeInMemoryState : AcmeState {
     [ValidateNotNull()] hidden [AcmeAccount] $Account;
 
     hidden [hashtable] $Orders = @{};
+    hidden [hashtable] $CertKeys = @{}
 
     AcmeInMemoryState() {
     }
@@ -948,6 +949,20 @@ class AcmeInMemoryState : AcmeState {
         $orderHash = $order.GetHashString();
         $this.Orders.Remove($orderHash);
     }
+
+    [ICertificateKey] GetOrderCertificateKey([AcmeOrder] $order) {
+        $orderHash = $order.GetHashString();
+        if ($this.CertKeys.ContainsKey($orderHash)) {
+            return $this.CertKeys[$orderHash];
+        }
+
+        return $null;
+    }
+
+    [void] SetOrderCertificateKey([AcmeOrder] $order, [ICertificateKey] $certificateKey) {
+        $orderHash = $order.GetHashString();
+        $this.CertKeys[$orderHash] = $certificateKey;
+    }
 }
 
 class AcmeStatePaths {
@@ -2760,11 +2775,13 @@ function Complete-Order {
         $ErrorActionPreference = 'Stop';
 
         if($GenerateCertificateKey) {
-            $CertificateKey = $State.GetOrderCertificateKey($Order);
+            $OrderCertificateKey = $State.GetOrderCertificateKey($Order);
 
-            if($null -eq $CertificateKey) {
+            if($null -eq $OrderCertificateKey) {
                 $SaveCertificateKey = $true;
                 $CertificateKey = New-CertificateKey -SkipKeyExport -WarningAction 'SilentlyContinue';
+            } else {
+                $CertificateKey = $OrderCertificateKey;
             }
         }