Recompile (#11)

* Updated Template install instructions * fixed package references --------- Co-authored-by: Keyfactor <[email protected]>
Keyfactor · Nov 8, 2023 · b29a922 · b29a922
1 parent 8cdc4cb
commit b29a922
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 17 deletions.
diff --git a/HydrantIdProxy/src/HydrantIdProxy/HydrantIdProxy.csproj b/HydrantIdProxy/src/HydrantIdProxy/HydrantIdProxy.csproj
@@ -30,8 +30,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>..\..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="CAProxy.AnyGateway.Core, Version=21.3.2.0, Culture=neutral, PublicKeyToken=0ed89d330114ab09, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Keyfactor.AnyGateway.SDK.21.3.2\lib\net462\CAProxy.AnyGateway.Core.dll</HintPath>
@@ -60,9 +60,6 @@
     <Reference Include="HawkNet, Version=1.4.4.0, Culture=neutral, PublicKeyToken=840f8ba19d15c979, processorArchitecture=MSIL">
       <HintPath>..\..\packages\HawkNet.1.4.4.0\lib\net45\HawkNet.dll</HintPath>
     </Reference>
-    <Reference Include="JsonSubTypes, Version=1.8.0.0, Culture=neutral, PublicKeyToken=ee75fc290dbc1176, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\JsonSubTypes.1.8.0\lib\net46\JsonSubTypes.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>

diff --git a/HydrantIdProxy/src/HydrantIdProxy/packages.config b/HydrantIdProxy/src/HydrantIdProxy/packages.config
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net462" />
   <package id="Common.Logging" version="3.4.1" targetFramework="net462" />
   <package id="Common.Logging.Core" version="3.4.1" targetFramework="net462" />
   <package id="CSS.Common" version="1.7.0" targetFramework="net462" />
+  <package id="CSS.PKI" version="2.13.0" targetFramework="net462" />
+  <package id="HawkNet" version="1.4.4.0" targetFramework="net462" />
   <package id="Keyfactor.AnyGateway.SDK" version="21.3.2" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />

diff --git a/README.md b/README.md
@@ -168,12 +168,32 @@ the CA.  Without the imported configuration, the service will fail to start.
 
 ### Template Installation
 
-1) Command Server - Copy and Unzip the Template Setup Files located [Here](https://github.com/Keyfactor/hydrantid-cagateway/raw/main/TemplateSetup.zip)
-2) Command Server - Change the Security Settings in the CaTemplateUserSecurity.csv file to the appropriate settings for Test or Production
-3) Command Server - Run the CreateTemplate.ps1 file and choose option 1 to create the templates in active directory.
-   *Note if you get errors the URL to the API or Security is likely wrong.  Make sure the API calls are run with an administrator user in KF Command* 
-4) Command Server - Use the Keyfactor Portal to Import the Templates created in Active Directory in step #3 above
-   *Note there are default values for the API Url, UserId, and Password. You will have to override the default API Questions to the appropriate values.*
+The Template section will map the CA's products to an AD template.
+* ```ProductID```
+This is the ID of the HydrantId product to map to the specified template. If you don't know the available product IDs in your Hydrant account, put a placeholder value here and run the Set-KeyfactorGatewayConfig cmdlet according to the AnyGateway documentation. The list of available product IDs will be returned.
+* ```ValidityPeriod```
+REQUIRED: The period to use when requesting certs. It could be, Days, Months, Years depending on the Template.
+* ```ValidityUnits```
+REQUIRED: The numeric value corresponding to the ValidityPeriod. For years 1 would be 1 year, for days 7 would be 7 days.
+
+ ```json
+	"Templates": {
+		"AutoEnrollment - RSA": {
+			"ProductID": "AutoEnrollment - RSA",
+			"Parameters": {
+				"ValidityPeriod": "Years",
+				"ValidityUnits": 1
+			}
+		},
+		"AutoEnrollment - RSA - 7 Day": {
+			"ProductID": "AutoEnrollment - RSA - 7 Day",
+			"Parameters": {
+				"ValidityPeriod": "Days",
+				"ValidityUnits": 7
+			}
+		}
+	}
+ ```
 
 ### Certificate Authority Installation
 1) Gateway Server - Start the Keyfactor Gateway Service

diff --git a/readme_source.md b/readme_source.md
@@ -137,12 +137,32 @@ the CA.  Without the imported configuration, the service will fail to start.
 
 ### Template Installation
 
-1) Command Server - Copy and Unzip the Template Setup Files located [Here](https://github.com/Keyfactor/hydrantid-cagateway/raw/main/TemplateSetup.zip)
-2) Command Server - Change the Security Settings in the CaTemplateUserSecurity.csv file to the appropriate settings for Test or Production
-3) Command Server - Run the CreateTemplate.ps1 file and choose option 1 to create the templates in active directory.
-   *Note if you get errors the URL to the API or Security is likely wrong.  Make sure the API calls are run with an administrator user in KF Command* 
-4) Command Server - Use the Keyfactor Portal to Import the Templates created in Active Directory in step #3 above
-   *Note there are default values for the API Url, UserId, and Password. You will have to override the default API Questions to the appropriate values.*
+The Template section will map the CA's products to an AD template.
+* ```ProductID```
+This is the ID of the HydrantId product to map to the specified template. If you don't know the available product IDs in your Hydrant account, put a placeholder value here and run the Set-KeyfactorGatewayConfig cmdlet according to the AnyGateway documentation. The list of available product IDs will be returned.
+* ```ValidityPeriod```
+REQUIRED: The period to use when requesting certs. It could be, Days, Months, Years depending on the Template.
+* ```ValidityUnits```
+REQUIRED: The numeric value corresponding to the ValidityPeriod. For years 1 would be 1 year, for days 7 would be 7 days.
+
+ ```json
+	"Templates": {
+		"AutoEnrollment - RSA": {
+			"ProductID": "AutoEnrollment - RSA",
+			"Parameters": {
+				"ValidityPeriod": "Years",
+				"ValidityUnits": 1
+			}
+		},
+		"AutoEnrollment - RSA - 7 Day": {
+			"ProductID": "AutoEnrollment - RSA - 7 Day",
+			"Parameters": {
+				"ValidityPeriod": "Days",
+				"ValidityUnits": 7
+			}
+		}
+	}
+ ```
 
 ### Certificate Authority Installation
 1) Gateway Server - Start the Keyfactor Gateway Service