luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Allowing Unwrap w/ Newline files (#13044)

This commit is contained in:
AnPucel 2021-11-24 10:13:45 -08:00 committed by GitHub
parent f1b18bd990
commit eeb41dc76e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/logical.go
View File

@ -8,6 +8,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"strings"
"github.com/hashicorp/errwrap" "github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/sdk/helper/jsonutil" "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) { func (c *Logical) Unwrap(wrappingToken string) (*Secret, error) {
var data map[string]interface{} var data map[string]interface{}
wt := strings.TrimSpace(wrappingToken)
if wrappingToken != "" { if wrappingToken != "" {
if c.c.Token() == "" { if c.c.Token() == "" {
c.c.SetToken(wrappingToken) c.c.SetToken(wt)
} else if wrappingToken != c.c.Token() { } else if wrappingToken != c.c.Token() {
data = map[string]interface{}{ data = map[string]interface{}{
"token": wrappingToken, "token": wt,
} }
} }
} }

3
changelog/13044.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
api: Trim newline character from wrapping token in logical.Unwrap from the api package
```