af802275bd
This takes place in two parts, since working on this exposed an issue with response wrapping when there is a raw body set. The changes are (in diff order): * A CurrentWrappingLookupFunc has been added to return the current value. This is necessary for the lookahead call since we don't want the lookahead call to be wrapped. * Support for unwrapping < 0.6.2 tokens via the API/CLI has been removed, because we now have backends returning 404s with data and can't rely on the 404 trick. These can still be read manually via cubbyhole/response. * KV preflight version request now ensures that its calls is not wrapped, and restores any given function after. * When responding with a raw body, instead of always base64-decoding a string value and erroring on failure, on failure we assume that it simply wasn't a base64-encoded value and use it as is. * A test that fails on master and works now that ensures that raw body responses that are wrapped and then unwrapped return the expected values. * A flag for response data that indicates to the wrapping handling that the data contained therein is already JSON decoded (more later). * RespondWithStatusCode now defaults to a string so that the value is HMAC'd during audit. The function always JSON encodes the body, so before now it was always returning []byte which would skip HMACing. We don't know what's in the data, so this is a "better safe than sorry" issue. If different behavior is needed, backends can always manually populate the data instead of relying on the helper function. * We now check unwrapped data after unwrapping to see if there were raw flags. If so, we try to detect whether the value can be unbase64'd. The reason is that if it can it was probably originally a []byte and shouldn't be audit HMAC'd; if not, it was probably originally a string and should be. In either case, we then set the value as the raw body and hit the flag indicating that it's already been JSON decoded so not to try again before auditing. Doing it this way ensures the right typing. * There is now a check to see if the data coming from unwrapping is already JSON decoded and if so the decoding is skipped before setting the audit response.
205 lines
4.2 KiB
Go
205 lines
4.2 KiB
Go
package api
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
)
|
|
|
|
const (
|
|
wrappedResponseLocation = "cubbyhole/response"
|
|
)
|
|
|
|
var (
|
|
// The default TTL that will be used with `sys/wrapping/wrap`, can be
|
|
// changed
|
|
DefaultWrappingTTL = "5m"
|
|
|
|
// The default function used if no other function is set, which honors the
|
|
// env var and wraps `sys/wrapping/wrap`
|
|
DefaultWrappingLookupFunc = func(operation, path string) string {
|
|
if os.Getenv(EnvVaultWrapTTL) != "" {
|
|
return os.Getenv(EnvVaultWrapTTL)
|
|
}
|
|
|
|
if (operation == "PUT" || operation == "POST") && path == "sys/wrapping/wrap" {
|
|
return DefaultWrappingTTL
|
|
}
|
|
|
|
return ""
|
|
}
|
|
)
|
|
|
|
// Logical is used to perform logical backend operations on Vault.
|
|
type Logical struct {
|
|
c *Client
|
|
}
|
|
|
|
// Logical is used to return the client for logical-backend API calls.
|
|
func (c *Client) Logical() *Logical {
|
|
return &Logical{c: c}
|
|
}
|
|
|
|
func (c *Logical) Read(path string) (*Secret, error) {
|
|
r := c.c.NewRequest("GET", "/v1/"+path)
|
|
resp, err := c.c.RawRequest(r)
|
|
if resp != nil {
|
|
defer resp.Body.Close()
|
|
}
|
|
if resp != nil && resp.StatusCode == 404 {
|
|
secret, parseErr := ParseSecret(resp.Body)
|
|
switch parseErr {
|
|
case nil:
|
|
case io.EOF:
|
|
return nil, nil
|
|
default:
|
|
return nil, err
|
|
}
|
|
if secret != nil && (len(secret.Warnings) > 0 || len(secret.Data) > 0) {
|
|
return secret, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return ParseSecret(resp.Body)
|
|
}
|
|
|
|
func (c *Logical) List(path string) (*Secret, error) {
|
|
r := c.c.NewRequest("LIST", "/v1/"+path)
|
|
// Set this for broader compatibility, but we use LIST above to be able to
|
|
// handle the wrapping lookup function
|
|
r.Method = "GET"
|
|
r.Params.Set("list", "true")
|
|
resp, err := c.c.RawRequest(r)
|
|
if resp != nil {
|
|
defer resp.Body.Close()
|
|
}
|
|
if resp != nil && resp.StatusCode == 404 {
|
|
secret, parseErr := ParseSecret(resp.Body)
|
|
switch parseErr {
|
|
case nil:
|
|
case io.EOF:
|
|
return nil, nil
|
|
default:
|
|
return nil, err
|
|
}
|
|
if secret != nil && (len(secret.Warnings) > 0 || len(secret.Data) > 0) {
|
|
return secret, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return ParseSecret(resp.Body)
|
|
}
|
|
|
|
func (c *Logical) Write(path string, data map[string]interface{}) (*Secret, error) {
|
|
r := c.c.NewRequest("PUT", "/v1/"+path)
|
|
if err := r.SetJSONBody(data); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
resp, err := c.c.RawRequest(r)
|
|
if resp != nil {
|
|
defer resp.Body.Close()
|
|
}
|
|
if resp != nil && resp.StatusCode == 404 {
|
|
secret, parseErr := ParseSecret(resp.Body)
|
|
switch parseErr {
|
|
case nil:
|
|
case io.EOF:
|
|
return nil, nil
|
|
default:
|
|
return nil, err
|
|
}
|
|
if secret != nil && (len(secret.Warnings) > 0 || len(secret.Data) > 0) {
|
|
return secret, err
|
|
}
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if resp.StatusCode == 200 {
|
|
return ParseSecret(resp.Body)
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
func (c *Logical) Delete(path string) (*Secret, error) {
|
|
r := c.c.NewRequest("DELETE", "/v1/"+path)
|
|
resp, err := c.c.RawRequest(r)
|
|
if resp != nil {
|
|
defer resp.Body.Close()
|
|
}
|
|
if resp != nil && resp.StatusCode == 404 {
|
|
secret, parseErr := ParseSecret(resp.Body)
|
|
switch parseErr {
|
|
case nil:
|
|
case io.EOF:
|
|
return nil, nil
|
|
default:
|
|
return nil, err
|
|
}
|
|
if secret != nil && (len(secret.Warnings) > 0 || len(secret.Data) > 0) {
|
|
return secret, err
|
|
}
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if resp.StatusCode == 200 {
|
|
return ParseSecret(resp.Body)
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
func (c *Logical) Unwrap(wrappingToken string) (*Secret, error) {
|
|
var data map[string]interface{}
|
|
if wrappingToken != "" {
|
|
if c.c.Token() == "" {
|
|
c.c.SetToken(wrappingToken)
|
|
} else if wrappingToken != c.c.Token() {
|
|
data = map[string]interface{}{
|
|
"token": wrappingToken,
|
|
}
|
|
}
|
|
}
|
|
|
|
r := c.c.NewRequest("PUT", "/v1/sys/wrapping/unwrap")
|
|
if err := r.SetJSONBody(data); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
resp, err := c.c.RawRequest(r)
|
|
if resp != nil {
|
|
defer resp.Body.Close()
|
|
}
|
|
if resp != nil && resp.StatusCode == 404 {
|
|
secret, parseErr := ParseSecret(resp.Body)
|
|
switch parseErr {
|
|
case nil:
|
|
case io.EOF:
|
|
return nil, nil
|
|
default:
|
|
return nil, err
|
|
}
|
|
if secret != nil && (len(secret.Warnings) > 0 || len(secret.Data) > 0) {
|
|
return secret, nil
|
|
}
|
|
return nil, nil
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return ParseSecret(resp.Body)
|
|
}
|