Skip to content

Commit 3438786

Browse files
fiddlermikeyfiddlermikey
authored
Merge Release 1.3 to master (#34)
Fix for issue where plugin was not enforcing plugin-side role limitations for AllowedDomains and AllowSubDomains, and was relying exclusively on the certificate template for these values. ab#55667 ab#16822
1 parent 0754030 commit 3438786

30 files changed

+1027
-233
lines changed

‎.github/workflows/keyfactor-starter-workflow.yml

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,19 @@
1-
name: Starter Workflow
2-
on: workflow_dispatch
1+
name: Keyfactor Bootstrap Workflow
32

4-
jobs:
5-
catalog-update-check:
6-
runs-on: windows-latest
7-
outputs:
8-
upd_cat: ${{ steps.read-json.outputs.prop }}
9-
steps:
10-
- uses: actions/checkout@v3
11-
- name: Read json
12-
id: read-json
13-
shell: pwsh
14-
run: |
15-
$json = Get-Content integration-manifest.json | ConvertFrom-Json
16-
echo "::set-output name=prop::$(echo $json.update_catalog)"
17-
18-
#call-create-github-release-workflow:
19-
# uses: Keyfactor/actions/.github/workflows/github-release.yml@main
20-
21-
#call-dotnet-build-and-release-workflow:
22-
# needs: [call-create-github-release-workflow]
23-
# uses: Keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@main
24-
# with:
25-
# release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
26-
# release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
27-
# release_dir: SslStoreCaProxy/bin/Release
28-
# secrets:
29-
# token: ${{ secrets.PRIVATE_PACKAGE_ACCESS }}
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, closed, synchronize, edited, reopened]
7+
push:
8+
create:
9+
branches:
10+
- 'release-*.*'
3011

31-
call-generate-readme-workflow:
32-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
33-
uses: Keyfactor/actions/.github/workflows/generate-readme.yml@main
12+
jobs:
13+
call-starter-workflow:
14+
uses: keyfactor/actions/.github/workflows/starter.yml@v2
3415
secrets:
35-
token: ${{ secrets.APPROVE_README_PUSH }}
36-
37-
call-update-catalog-workflow:
38-
needs: catalog-update-check
39-
if: needs.catalog-update-check.outputs.upd_cat == 'True' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
40-
uses: Keyfactor/actions/.github/workflows/update-catalog.yml@main
41-
secrets:
42-
token: ${{ secrets.SDK_SYNC_PAT }}
43-
16+
token: ${{ secrets.V2BUILDTOKEN}}
17+
APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
18+
gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
19+
gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}

‎.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
.vs/*
2-
vaultSecretsEngine-update.zip
2+
*.zip
33
vault/plugins/*
4+
*.sh
45
*.exe
6+
keyfactor
7+
Keyfactor Vault Secrets Engine Guide.docx
8+
Makefile
9+
sample_config.json
10+
README.md

‎.goreleaser.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ builds:
99
# goreleaser does not work with CGO, it could also complicate
1010
# usage by users in CI/CD systems like Terraform Cloud where
1111
# they are unable to install libraries.
12-
- CGO_ENABLED=0
12+
- CGO_ENABLED=0
1313
mod_timestamp: '{{ .CommitTimestamp }}'
1414
flags:
1515
- -trimpath
@@ -28,15 +28,21 @@ builds:
2828
ignore:
2929
- goos: darwin
3030
goarch: '386'
31-
binary: 'kfutil'
31+
- goos: freebsd
32+
goarch: 'arm64'
33+
binary: 'keyfactor'
34+
id: "keyfactor"
35+
main: './cmd/keyfactor'
36+
hooks:
37+
post:
38+
# - cmd: sh -c "echo $(echo -n '{{split .Target "_"}}'; echo -ne "\t"; sha256sum {{.Path}} | cut -d ' ' -f 1,2) >> binary_checksums.txt"
39+
- cmd: sh -c "echo $(echo -n '{{.Os}} '; echo -n '{{.Arch}} '; sha256sum {{.Path}} | cut -d ' ' -f 1,2) >> binary_checksums.txt"
40+
dir: './dist'
3241
archives:
3342
- format: zip
3443
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
3544
checksum:
36-
extra_files:
37-
- glob: 'integration-manifest.json'
38-
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
39-
name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
45+
name_template: '{{ .ProjectName }}.{{ .Version }}.sha256'
4046
algorithm: sha256
4147
signs:
4248
- artifacts: checksum
@@ -53,8 +59,9 @@ signs:
5359
release:
5460
prerelease: auto
5561
extra_files:
56-
- glob: 'integration-manifest.json'
57-
name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json'
62+
- glob: 'installation.txt'
63+
- glob: 'LICENSE.txt'
64+
- glob: './dist/binary_checksums.txt'
5865
# If you want to manually examine the release before its live, uncomment this line:
5966
draft: true
6067
changelog:

‎.vscode/settings.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"files.associations": {
3+
"*.yaml": "home-assistant"
4+
}
5+
}

‎CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
- 1.3.1
2+
- Fix for issue where plugin was not enforcing plugin-side role limitations for AllowedDomains and AllowSubDomains, and was relying exclusively on the certificate template for these values.
3+
4+
- 1.3.0
5+
- Fix for double encoding certificates when viewed in the terminal.
6+
7+
- 1.2.0
8+
- Updated the plugin to use it's own internal configuration settings storage per instance.
9+
10+
- 1.1.0
11+
- added subject parameters to certificate enrollment
12+
- now defaulting to role values for subject parameters if not provided.
13+
14+
- 1.0.1
15+
- This release fixes a bug where the CA logical name was not being URL encoded before sending the request to Keyfactor.
16+
17+
- 1.00
18+
- initial release

‎Keyfactor Vault Secrets Engine Guide.docx

-29.7 KB
Binary file not shown.

‎LICENSE.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Copyright 2024 Keyfactor
2+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
3+
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
4+
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
5+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
6+
and limitations under the License.

‎Makefile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
BINARY = "keyfactor"
2+
VERSION = "v1.3.1"
3+
14
GOARCH = amd64
25

36
UNAME = $(shell uname -s)
@@ -31,4 +34,20 @@ clean:
3134
fmt:
3235
go fmt $$(go list ./...)
3336

37+
38+
release:
39+
GOOS=darwin GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_darwin_amd64
40+
GOOS=freebsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_freebsd_386
41+
GOOS=freebsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_freebsd_amd64
42+
GOOS=freebsd GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_freebsd_arm
43+
GOOS=linux GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_linux_386
44+
GOOS=linux GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_linux_amd64
45+
GOOS=linux GOARCH=arm go build -o ./bin/${BINARY}_${VERSION}_linux_arm
46+
GOOS=openbsd GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_openbsd_386
47+
GOOS=openbsd GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_openbsd_amd64
48+
GOOS=solaris GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_solaris_amd64
49+
GOOS=windows GOARCH=386 go build -o ./bin/${BINARY}_${VERSION}_windows_386
50+
GOOS=windows GOARCH=amd64 go build -o ./bin/${BINARY}_${VERSION}_windows_amd64
51+
52+
3453
.PHONY: build clean fmt start enable

0 commit comments

Comments
 (0)