scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 19:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport of commit 464b9de169 (#20344)

Browse Source 
Co-authored-by: Alexander Scheel <alex.scheel@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core
2023-04-25 12:59:09 -04:00
committed by GitHub
parent 2b244b4327
commit d63cc54647
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/logical/pki/backend_test.go
View File

@@ -4939,12 +4939,13 @@ func TestIssuanceTTLs(t *testing.T) {
}) })
require.Error(t, err, "expected issuance to fail due to longer default ttl than cert ttl") require.Error(t, err, "expected issuance to fail due to longer default ttl than cert ttl")
resp, err = CBWrite(b, s, "issuer/root", map[string]interface{}{ resp, err = CBPatch(b, s, "issuer/root", map[string]interface{}{
"issuer_name": "root",
"leaf_not_after_behavior": "permit", "leaf_not_after_behavior": "permit",
}) })
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, resp) require.NotNil(t, resp)
require.NotNil(t, resp.Data)
require.Equal(t, resp.Data["leaf_not_after_behavior"], "permit")
_, err = CBWrite(b, s, "issue/local-testing", map[string]interface{}{ _, err = CBWrite(b, s, "issue/local-testing", map[string]interface{}{
"common_name": "testing", "common_name": "testing",
@@ -4957,6 +4958,8 @@ func TestIssuanceTTLs(t *testing.T) {
}) })
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, resp) require.NotNil(t, resp)
require.NotNil(t, resp.Data)
require.Equal(t, resp.Data["leaf_not_after_behavior"], "truncate")
_, err = CBWrite(b, s, "issue/local-testing", map[string]interface{}{ _, err = CBWrite(b, s, "issue/local-testing", map[string]interface{}{
"common_name": "testing", "common_name": "testing",

2
builtin/logical/pki/path_fetch_issuers.go
View File

@@ -601,7 +601,7 @@ func (b *backend) pathPatchIssuer(ctx context.Context, req *logical.Request, dat
} }
// Leaf Not After Changes // Leaf Not After Changes
rawLeafBehaviorData, ok := data.GetOk("leaf_not_after_behaivor") rawLeafBehaviorData, ok := data.GetOk("leaf_not_after_behavior")
if ok { if ok {
rawLeafBehavior := rawLeafBehaviorData.(string) rawLeafBehavior := rawLeafBehaviorData.(string)
var newLeafBehavior certutil.NotAfterBehavior var newLeafBehavior certutil.NotAfterBehavior

3
changelog/20341.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
secrets/pki: Fix patching of leaf_not_after_behavior on issuers.
```