Merge pull request #14 from Keyfactor/sslportfixes

Sslportfixes
Keyfactor · Apr 5, 2022 · 94d1c20 · 94d1c20
2 parents 2a1e69b + 52f3f9d
commit 94d1c20
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 7 deletions.
diff --git a/IISWithBindings/Jobs/Inventory.cs b/IISWithBindings/Jobs/Inventory.cs
@@ -28,7 +28,7 @@ private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInven
 
                 _logger.LogTrace($"Begin Inventory for Cert Store {$@"\\{config.CertificateStoreDetails.ClientMachine}\{config.CertificateStoreDetails.StorePath}"}");
 
-                WSManConnectionInfo connInfo = new WSManConnectionInfo(new Uri($"http://{config.CertificateStoreDetails.ClientMachine}:5985/wsman"));
+                WSManConnectionInfo connInfo = new WSManConnectionInfo(new Uri($"{storePath.WinRmProtocol}://{config.CertificateStoreDetails.ClientMachine}:{storePath.WinRmPort}/wsman"));
                 if (storePath != null)
                 {
                     SecureString pw = new NetworkCredential(config.ServerUsername, config.ServerPassword)

diff --git a/IISWithBindings/Jobs/Management.cs b/IISWithBindings/Jobs/Management.cs
@@ -69,7 +69,7 @@ private JobResult PerformRemoval(ManagementJobConfiguration config)
 
                 var connInfo =
                     new WSManConnectionInfo(
-                        new Uri($"http://{config.CertificateStoreDetails.ClientMachine}:5985/wsman"));
+                        new Uri($"{storePath.WinRmProtocol}://{config.CertificateStoreDetails.ClientMachine}:{storePath.WinRmPort}/wsman"));
                 if (storePath != null)
                 {
                     connInfo.IncludePortInSPN = storePath.SpnPortFlag;
@@ -166,7 +166,7 @@ private JobResult PerformAddition(ManagementJobConfiguration config,string thump
 
                 var connInfo =
                     new WSManConnectionInfo(
-                        new Uri($"http://{config.CertificateStoreDetails.ClientMachine}:5985/wsman"));
+                        new Uri($"{storePath.WinRmProtocol}://{config.CertificateStoreDetails.ClientMachine}:{storePath.WinRmPort}/wsman"));
                 if (storePath != null)
                 {
                     connInfo.IncludePortInSPN = storePath.SpnPortFlag; 

diff --git a/IISWithBindings/StorePath.cs b/IISWithBindings/StorePath.cs
@@ -14,6 +14,14 @@ public StorePath()
         [DefaultValue(false)]
         public bool SpnPortFlag { get; set; }
 
+        [JsonProperty("WinRm Protocol")]
+        [DefaultValue("http")]
+        public string WinRmProtocol { get; set; }
+
+        [JsonProperty("WinRm Port")]
+        [DefaultValue("5985")]
+        public string WinRmPort { get; set; }
+
         [JsonProperty("sniflag")]
         [DefaultValue(SniFlag.None)]
         public SniFlag SniFlag { get; set; }

diff --git a/README.md b/README.md
@@ -62,9 +62,11 @@ Job Types	|Inventory, Add, and Remove are the supported job types.
 
 - **SPN With Port** – Defaults to false but some customers need for remote PowerShell Access
 
-Parameter Name|Parameter Type|Default Value|Required
+Parameter Name|Display Name|Parameter Type|Default Value|Required|Description
 ---|---|---|---
-spnwithport|Boolean|false|No
+spnwithport|SPN With Port?|Boolean|false|No|An SPN is the name by which a client uniquely identifies an instance of a service
+WinRm Protocol|WinRm Protocol|Multiple Choice|http|Yes|Protocol that WinRM Runs on
+WinRm Port|WinRm Port|String|5985|Yes|Port that WinRM Runs on
 
 ![](images/screen1-b.gif)
 
@@ -103,13 +105,17 @@ See Keyfactor InstallingKeyfactorOrchestrators.pdf Documentation.  Get from your
 In Keyfactor Command create a new Certificate Store similar to the one below, selecting IIS With Binding as the Category and the parameters as described in &quot;Create the New Certificate Store Type for the New IIS-With-Bindings AnyAgent&quot;.
 
 ![](images/screen2.gif)
+![](images/screen2-a.gif)
 
 #### STORE CONFIGURATION 
 CONFIG ELEMENT	|DESCRIPTION
 ----------------|---------------
 Category	|The type of certificate store to be configured. Select category based on the display name configured above.
 Container	|This is a logical grouping of like stores. This configuration is optional and does not impact the functionality of the store.
 Client Machine	|The hostname of the server to be managed. The Change Credentials option must be clicked to provide a username and password. This account will be used to manage the remote server via PowerShell.
+Credentials |Local or domain admin account that has permissions to manage iis (Has to be admin)
 Store Path	|My or WebHosting
+WinRm Protocol|http or https
+WinRm Port |Port to run WinRm on Default for http is 5985
 Orchestrator	|This is the orchestrator server registered with the appropriate capabilities to manage this certificate store type. 
 Inventory Schedule	|The interval that the system will use to report on what certificates are currently in the store. 
diff --git a/images/screen1-b.gif b/images/screen1-b.gif
diff --git a/images/screen1-c.gif b/images/screen1-c.gif
diff --git a/images/screen2-a.gif b/images/screen2-a.gif
diff --git a/images/screen2.gif b/images/screen2.gif
diff --git a/readme_source.md b/readme_source.md
@@ -46,9 +46,11 @@ Job Types	|Inventory, Add, and Remove are the supported job types.
 
 - **SPN With Port** – Defaults to false but some customers need for remote PowerShell Access
 
-Parameter Name|Parameter Type|Default Value|Required
+Parameter Name|Display Name|Parameter Type|Default Value|Required|Description
 ---|---|---|---
-spnwithport|Boolean|false|No
+spnwithport|SPN With Port?|Boolean|false|No|An SPN is the name by which a client uniquely identifies an instance of a service
+WinRm Protocol|WinRm Protocol|Multiple Choice|http|Yes|Protocol that WinRM Runs on
+WinRm Port|WinRm Port|String|5985|Yes|Port that WinRM Runs on
 
 ![](images/screen1-b.gif)
 
@@ -87,13 +89,17 @@ See Keyfactor InstallingKeyfactorOrchestrators.pdf Documentation.  Get from your
 In Keyfactor Command create a new Certificate Store similar to the one below, selecting IIS With Binding as the Category and the parameters as described in &quot;Create the New Certificate Store Type for the New IIS-With-Bindings AnyAgent&quot;.
 
 ![](images/screen2.gif)
+![](images/screen2-a.gif)
 
 #### STORE CONFIGURATION 
 CONFIG ELEMENT	|DESCRIPTION
 ----------------|---------------
 Category	|The type of certificate store to be configured. Select category based on the display name configured above.
 Container	|This is a logical grouping of like stores. This configuration is optional and does not impact the functionality of the store.
 Client Machine	|The hostname of the server to be managed. The Change Credentials option must be clicked to provide a username and password. This account will be used to manage the remote server via PowerShell.
+Credentials |Local or domain admin account that has permissions to manage iis (Has to be admin)
 Store Path	|My or WebHosting
+WinRm Protocol|http or https
+WinRm Port |Port to run WinRm on Default for http is 5985
 Orchestrator	|This is the orchestrator server registered with the appropriate capabilities to manage this certificate store type. 
 Inventory Schedule	|The interval that the system will use to report on what certificates are currently in the store.