From 6de1f22c15cd691ef44cf85d4702786ebd738ec3 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Mon, 6 Feb 2017 09:14:42 +0100
Subject: [PATCH] Add missing support for -CertValidityDays (#21009)

* Add missing support for -CertValidityDays

For some reason the -CertValidityDays option was not being used in the certificates we created.

This fixes #10439

* Possible fix

* We cannot use New-SelfSignedCertificate on 2012R2 and earlier

As suggested by @jhawkesworth
---
 .../scripts/ConfigureRemotingForAnsible.ps1   | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/examples/scripts/ConfigureRemotingForAnsible.ps1 b/examples/scripts/ConfigureRemotingForAnsible.ps1
index e8998d1d2e4..2cdb99773c6 100644
--- a/examples/scripts/ConfigureRemotingForAnsible.ps1
+++ b/examples/scripts/ConfigureRemotingForAnsible.ps1
@@ -197,27 +197,20 @@ Else
 $listeners = Get-ChildItem WSMan:\localhost\Listener
 If (!($listeners | Where {$_.Keys -like "TRANSPORT=HTTPS"}))
 {
-    # HTTPS-based endpoint does not exist.
-    If (Get-Command "New-SelfSignedCertificate" -ErrorAction SilentlyContinue)
-    {
-        $cert = New-SelfSignedCertificate -DnsName $SubjectName -CertStoreLocation "Cert:\LocalMachine\My"
-        $thumbprint = $cert.Thumbprint
-        Write-HostLog "Self-signed SSL certificate generated; thumbprint: $thumbprint"
-    }
-    Else
-    {
-        $thumbprint = New-LegacySelfSignedCert -SubjectName $SubjectName
-        Write-HostLog "(Legacy) Self-signed SSL certificate generated; thumbprint: $thumbprint"
-    }
+    # We cannot use New-SelfSignedCertificate on 2012R2 and earlier
+    $thumbprint = New-LegacySelfSignedCert -SubjectName $SubjectName -ValidDays $CertValidityDays
+    Write-HostLog "Self-signed SSL certificate generated; thumbprint: $thumbprint"
 
     # Create the hashtables of settings to be used.
-    $valueset = @{}
-    $valueset.Add('Hostname', $SubjectName)
-    $valueset.Add('CertificateThumbprint', $thumbprint)
+    $valueset = @{
+        Hostname = $SubjectName
+        CertificateThumbprint = $thumbprint
+    }
 
-    $selectorset = @{}
-    $selectorset.Add('Transport', 'HTTPS')
-    $selectorset.Add('Address', '*')
+    $selectorset = @{
+        Transport = "HTTPS"
+        Address = "*"
+    }
 
     Write-Verbose "Enabling SSL listener."
     New-WSManInstance -ResourceURI 'winrm/config/Listener' -SelectorSet $selectorset -ValueSet $valueset
@@ -231,27 +224,20 @@ Else
     If ($ForceNewSSLCert)
     {
 
-        # Create the new cert.
-        If (Get-Command "New-SelfSignedCertificate" -ErrorAction SilentlyContinue)
-        {
-            $cert = New-SelfSignedCertificate -DnsName $SubjectName -CertStoreLocation "Cert:\LocalMachine\My"
-            $thumbprint = $cert.Thumbprint
-            Write-HostLog "Self-signed SSL certificate generated; thumbprint: $thumbprint"
-        }
-        Else
-        {
-            $thumbprint = New-LegacySelfSignedCert -SubjectName $SubjectName
-            Write-HostLog "(Legacy) Self-signed SSL certificate generated; thumbprint: $thumbprint"
-        }
+        # We cannot use New-SelfSignedCertificate on 2012R2 and earlier
+        $thumbprint = New-LegacySelfSignedCert -SubjectName $SubjectName -ValidDays $CertValidityDays
+        Write-HostLog "Self-signed SSL certificate generated; thumbprint: $thumbprint"
 
-        $valueset = @{}
-        $valueset.Add('Hostname', $SubjectName)
-        $valueset.Add('CertificateThumbprint', $thumbprint)
+        $valueset = @{
+            CertificateThumbprint = $thumbprint
+            Hostname = $SubjectName
+        }
 
         # Delete the listener for SSL
-        $selectorset = @{}
-        $selectorset.Add('Transport', 'HTTPS')
-        $selectorset.Add('Address', '*')
+        $selectorset = @{
+            Address = "*"
+            Transport = "HTTPS"
+        }
         Remove-WSManInstance -ResourceURI 'winrm/config/Listener' -SelectorSet $selectorset
 
         # Add new Listener with new SSL cert