Skip to content

Commit fb45b44

Browse files
doebrowskdoebrowsk
authored
merge release 1.1.1 to main
2 parents c0805b8 + 87465c1 commit fb45b44

10 files changed

Lines changed: 34 additions & 19 deletions

File tree

‎.github/workflows/keyfactor-extension-prerelease.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Archive Files
6969
run: |
7070
md ${{ github.workspace }}\zip\Keyfactor
71-
Compress-Archive -Path ${{ github.workspace }}\PEMStoreSSH\bin\Release\*.dll,${{ github.workspace }}\PEMStoreSSH\bin\Release\config.json -DestinationPath ${{ github.workspace }}\zip\Keyfactor\$Env:REPO_NAME.zip -Force
71+
Compress-Archive -Path ${{ github.workspace }}\AnyAgent\bin\Release\*.dll,${{ github.workspace }}\AnyAgent\bin\Release\*.config,${{ github.workspace }}\AnyAgent\bin\Release\Keyfactor.Extensions.Pam.Config.exe -DestinationPath ${{ github.workspace }}\zip\Keyfactor\$Env:REPO_NAME.zip -Force
7272
7373

7474
- name: Upload a Build Artifact

‎.github/workflows/keyfactor-extension-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
if: ${{ success() }}
101101
run: |
102102
md ${{ github.workspace }}\zip\Keyfactor
103-
Compress-Archive -Path ${{ github.workspace }}\PEMStoreSSH\bin\Release\*.dll,${{ github.workspace }}\PEMStoreSSH\bin\Release\config.json -DestinationPath ${{ github.workspace }}\zip\Keyfactor\$Env:REPO_NAME.zip -Force
103+
Compress-Archive -Path ${{ github.workspace }}\AnyAgent\bin\Release\*.dll,${{ github.workspace }}\AnyAgent\bin\Release\*.config,${{ github.workspace }}\AnyAgent\bin\Release\Keyfactor.Extensions.Pam.Config.exe -DestinationPath ${{ github.workspace }}\zip\Keyfactor\$Env:REPO_NAME.zip -Force
104104
105105
- name: Upload Release Asset (x64)
106106
if: ${{ success() }}

‎AnyAgent/CertManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
using Org.BouncyCastle.Crypto;
2929
using Org.BouncyCastle.OpenSsl;
3030
using Org.BouncyCastle.Pkcs;
31+
using CertificateRequest = DataPower.API.api.CertificateRequest;
3132

3233
namespace DataPower
3334
{

‎AnyAgent/DataPowerAnyAgent.csproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Datapower</RootNamespace>
1111
<AssemblyName>DatapowerAnyAgent</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SccProjectName>SAK</SccProjectName>
1515
<SccLocalPath>SAK</SccLocalPath>
1616
<SccAuxPath>SAK</SccAuxPath>
1717
<SccProvider>SAK</SccProvider>
18+
<TargetFrameworkProfile />
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -61,7 +62,7 @@
6162
</ItemGroup>
6263
<ItemGroup>
6364
<PackageReference Include="BouncyCastle">
64-
<Version>1.8.1</Version>
65+
<Version>1.8.5</Version>
6566
</PackageReference>
6667
<PackageReference Include="Common.Logging">
6768
<Version>3.4.1</Version>
@@ -75,11 +76,8 @@
7576
<PackageReference Include="CSS.Common">
7677
<Version>1.6.0</Version>
7778
</PackageReference>
78-
<PackageReference Include="CSS.Logging.NLog">
79-
<Version>1.0.1</Version>
80-
</PackageReference>
8179
<PackageReference Include="CSS.PKI">
82-
<Version>1.0.0</Version>
80+
<Version>2.9.3</Version>
8381
</PackageReference>
8482
<PackageReference Include="Keyfactor.Platform.Extensions.Agents">
8583
<Version>1.0.1</Version>
@@ -107,6 +105,10 @@
107105
</PackageReference>
108106
</ItemGroup>
109107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
108+
<PropertyGroup>
109+
<PostBuildEvent>xcopy /y $(SolutionDir)DataPower.API\$(OutDir)Keyfactor.Extensions.Pam.Config.exe.config $(TargetDir)
110+
xcopy /y $(SolutionDir)DataPower.API\$(OutDir)Keyfactor.Extensions.Pam.Utilities.dll.config $(TargetDir)</PostBuildEvent>
111+
</PropertyGroup>
110112
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111113
Other similar extension points exist, see Microsoft.Common.targets.
112114
<Target Name="BeforeBuild">

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
v1.1.1:
2+
- Fix local PAM usage to be correctly called for server passwords
3+
4+
v1.1.0:
5+
- Add support for local PAM usage

‎DataPower.API/API-Driver.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DataPower.API</RootNamespace>
1111
<AssemblyName>DataPowerAPI</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SccProjectName>SAK</SccProjectName>
1515
<SccLocalPath>SAK</SccLocalPath>
1616
<SccAuxPath>SAK</SccAuxPath>
1717
<SccProvider>SAK</SccProvider>
18+
<TargetFrameworkProfile />
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -94,6 +95,9 @@
9495
<PackageReference Include="CSS.Common">
9596
<Version>1.6.0</Version>
9697
</PackageReference>
98+
<PackageReference Include="Keyfactor.Extensions.Pam.Utilities">
99+
<Version>1.0.2</Version>
100+
</PackageReference>
97101
<PackageReference Include="Microsoft.AspNet.WebApi.Client">
98102
<Version>5.2.6</Version>
99103
</PackageReference>
@@ -104,7 +108,7 @@
104108
<Version>12.0.3</Version>
105109
</PackageReference>
106110
<PackageReference Include="NLog">
107-
<Version>4.1.2</Version>
111+
<Version>4.4.4</Version>
108112
</PackageReference>
109113
</ItemGroup>
110114
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎DataPower.API/app.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
Copyright 2021 Keyfactor
44
@@ -18,9 +18,9 @@ limitations under the License.
1818
<runtime>
1919
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2020
<dependentAssembly>
21-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
21+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
22+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
2323
</dependentAssembly>
2424
</assemblyBinding>
2525
</runtime>
26-
</configuration>
26+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

‎DataPower.API/client/ApiClient.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Net;
1818
using System.Text;
1919
using CSS.Common.Logging;
20+
using Keyfactor.Extensions.Pam.Utilities;
2021
using DataPower.API.api;
2122
using Newtonsoft.Json;
2223
using static System.Net.ServicePointManager;
@@ -40,7 +41,7 @@ public ApiClient(string user, string pass, string baseUrl, string domain)
4041
{
4142
BaseUrl = baseUrl;
4243
Username = user;
43-
Password = pass;
44+
Password = PamUtility.ResolvePassword(pass);
4445
Domain = domain.Trim();
4546
}
4647

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# IBM Datapower
2-
## Orchestrator
2+
## Windows-orchestrator
33

44
The IBM DataPower Orchestrator allows for the management of certificates in the IBM Datapower platform. Inventory and Management functions are supported.
55

@@ -9,6 +9,7 @@ The IBM DataPower Orchestrator allows for the management of certificates in the
99
**1) Create the new Certificate store Type for the New DataPower AnyAgent**
1010

1111
In Keyfactor Command create a new Certificate Store Type similar to the one below:
12+
- NOTE: This orchestrator _does not_ actually support the Create function per the image below
1213

1314
![image.png](/Images/CertStoreTypes.png)
1415

@@ -26,7 +27,7 @@ In Keyfactor Command create a new Certificate Store Type similar to the one belo
2627
- **Store PathType** – Freeform (user will enter the the location of the store).
2728
- **Private Keys** – Optional
2829
- **PFX Password Style** – Default
29-
- **Job Types** – Inventory, Add, Create and Remove are the 4 job types implemented by this AnyAgent
30+
- **Job Types** – Inventory, Add, and Remove are the 4 job types implemented by this AnyAgent
3031
- **Custom Parameters** :
3132

3233
These are completely optional but if you want to use them to create a prefix to the certificate Objects, Keys and Files you can use them so your key will be named [prefix]Name. If you choose to use them, they must exactly match what is shown below (all string values that are not required):

‎README.md.tpl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
**1) Create the new Certificate store Type for the New DataPower AnyAgent**
1010

1111
In Keyfactor Command create a new Certificate Store Type similar to the one below:
12+
- NOTE: This orchestrator _does not_ actually support the Create function per the image below
1213

1314
![image.png](/Images/CertStoreTypes.png)
1415

@@ -26,7 +27,7 @@ In Keyfactor Command create a new Certificate Store Type similar to the one belo
2627
- **Store PathType** – Freeform (user will enter the the location of the store).
2728
- **Private Keys** – Optional
2829
- **PFX Password Style** – Default
29-
- **Job Types** – Inventory, Add, Create and Remove are the 4 job types implemented by this AnyAgent
30+
- **Job Types** – Inventory, Add, and Remove are the 4 job types implemented by this AnyAgent
3031
- **Custom Parameters** :
3132

3233
These are completely optional but if you want to use them to create a prefix to the certificate Objects, Keys and Files you can use them so your key will be named [prefix]Name. If you choose to use them, they must exactly match what is shown below (all string values that are not required):
@@ -94,4 +95,4 @@ Navigate to Certificate Locations => Certificate Stores within Keyfactor Command
9495
***
9596

9697
### License
97-
[Apache](https://apache.org/licenses/LICENSE-2.0)
98+
[Apache](https://apache.org/licenses/LICENSE-2.0)

0 commit comments

Comments
 (0)