Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow issuer/:issuer_ref/sign-verbatim/:role, add error on missing role #15543

Merged
merged 4 commits into from
May 23, 2022
Merged

Allow issuer/:issuer_ref/sign-verbatim/:role, add error on missing role #15543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81bcf6c
Allow role-based sign-verbatim with chosen issuer
cipherboy May 20, 2022
5c50a46
Add warning with missing requested verbatim role
cipherboy May 20, 2022
9603194
Add changelog
cipherboy May 20, 2022
c08d3fd
Update builtin/logical/pki/backend.go
cipherboy May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtin/logical/pki/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func (b *backend) metricsWrap(callType string, roleMode int, ofunc roleOperation
if err != nil {
return nil, err
}
if role == nil && roleMode == roleRequired {
if role == nil && (roleMode == roleRequired || len(roleName) > 0) {
return logical.ErrorResponse(fmt.Sprintf("unknown role: %s", roleName)), nil
}
labels = []metrics.Label{{"role", roleName}}
Expand Down
2 changes: 1 addition & 1 deletion builtin/logical/pki/path_issue_sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func buildPathSign(b *backend, pattern string) *framework.Path {
}

func pathIssuerSignVerbatim(b *backend) *framework.Path {
pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign-verbatim"
pattern := "issuer/" + framework.GenericNameRegex(issuerRefParam) + "/sign-verbatim" + framework.OptionalParamRegex("role")
return buildPathIssuerSignVerbatim(b, pattern)
}

Expand Down
3 changes: 3 additions & 0 deletions changelog/15543.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:change
secrets/pki: Err on unknown role during sign-verbatim.
```