mirror of
https://github.com/hashicorp/vault.git
synced 2026-02-03 20:40:45 -05:00
Allowing Unwrap w/ Newline files (#13044)
This commit is contained in:
parent
f8cb3dcc63
commit
f5d9697003
2 changed files with 7 additions and 2 deletions
|
|
@ -8,6 +8,7 @@ import (
|
|||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/vault/sdk/helper/jsonutil"
|
||||
|
|
@ -235,12 +236,13 @@ func (c *Logical) DeleteWithData(path string, data map[string][]string) (*Secret
|
|||
|
||||
func (c *Logical) Unwrap(wrappingToken string) (*Secret, error) {
|
||||
var data map[string]interface{}
|
||||
wt := strings.TrimSpace(wrappingToken)
|
||||
if wrappingToken != "" {
|
||||
if c.c.Token() == "" {
|
||||
c.c.SetToken(wrappingToken)
|
||||
c.c.SetToken(wt)
|
||||
} else if wrappingToken != c.c.Token() {
|
||||
data = map[string]interface{}{
|
||||
"token": wrappingToken,
|
||||
"token": wt,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
3
changelog/13044.txt
Normal file
3
changelog/13044.txt
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
```release-note:improvement
|
||||
api: Trim newline character from wrapping token in logical.Unwrap from the api package
|
||||
```
|
||||
Loading…
Reference in a new issue