2018-03-21 22:02:41 +00:00
|
|
|
package command
|
|
|
|
|
|
|
|
import (
|
2019-05-03 16:10:41 +00:00
|
|
|
"errors"
|
2018-03-21 22:02:41 +00:00
|
|
|
"fmt"
|
2018-04-04 02:35:45 +00:00
|
|
|
"io"
|
2018-03-21 22:02:41 +00:00
|
|
|
"path"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/hashicorp/vault/api"
|
2019-04-12 21:54:35 +00:00
|
|
|
"github.com/hashicorp/vault/sdk/helper/strutil"
|
2018-03-21 22:02:41 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func kvReadRequest(client *api.Client, path string, params map[string]string) (*api.Secret, error) {
|
|
|
|
r := client.NewRequest("GET", "/v1/"+path)
|
|
|
|
for k, v := range params {
|
|
|
|
r.Params.Set(k, v)
|
|
|
|
}
|
|
|
|
resp, err := client.RawRequest(r)
|
|
|
|
if resp != nil {
|
|
|
|
defer resp.Body.Close()
|
|
|
|
}
|
|
|
|
if resp != nil && resp.StatusCode == 404 {
|
2018-04-04 16:26:06 +00:00
|
|
|
secret, parseErr := api.ParseSecret(resp.Body)
|
|
|
|
switch parseErr {
|
2018-04-04 02:35:45 +00:00
|
|
|
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
|
|
|
|
}
|
2018-03-21 22:02:41 +00:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return api.ParseSecret(resp.Body)
|
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
func kvPreflightVersionRequest(client *api.Client, path string) (string, int, error) {
|
Fix response wrapping from K/V version 2 (#4511)
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.
2018-05-10 19:40:03 +00:00
|
|
|
// We don't want to use a wrapping call here so save any custom value and
|
|
|
|
// restore after
|
|
|
|
currentWrappingLookupFunc := client.CurrentWrappingLookupFunc()
|
|
|
|
client.SetWrappingLookupFunc(nil)
|
|
|
|
defer client.SetWrappingLookupFunc(currentWrappingLookupFunc)
|
2019-02-01 22:13:51 +00:00
|
|
|
currentOutputCurlString := client.OutputCurlString()
|
|
|
|
client.SetOutputCurlString(false)
|
|
|
|
defer client.SetOutputCurlString(currentOutputCurlString)
|
Fix response wrapping from K/V version 2 (#4511)
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.
2018-05-10 19:40:03 +00:00
|
|
|
|
2018-04-23 22:16:10 +00:00
|
|
|
r := client.NewRequest("GET", "/v1/sys/internal/ui/mounts/"+path)
|
2018-03-21 22:02:41 +00:00
|
|
|
resp, err := client.RawRequest(r)
|
|
|
|
if resp != nil {
|
|
|
|
defer resp.Body.Close()
|
|
|
|
}
|
|
|
|
if err != nil {
|
2018-04-24 22:49:06 +00:00
|
|
|
// If we get a 404 we are using an older version of vault, default to
|
|
|
|
// version 1
|
|
|
|
if resp != nil && resp.StatusCode == 404 {
|
|
|
|
return "", 1, nil
|
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
return "", 0, err
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
secret, err := api.ParseSecret(resp.Body)
|
|
|
|
if err != nil {
|
|
|
|
return "", 0, err
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
2019-05-03 16:10:41 +00:00
|
|
|
if secret == nil {
|
|
|
|
return "", 0, errors.New("nil response from pre-flight request")
|
|
|
|
}
|
2018-04-23 22:00:02 +00:00
|
|
|
var mountPath string
|
|
|
|
if mountPathRaw, ok := secret.Data["path"]; ok {
|
|
|
|
mountPath = mountPathRaw.(string)
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
2018-04-23 22:00:02 +00:00
|
|
|
options := secret.Data["options"]
|
|
|
|
if options == nil {
|
|
|
|
return mountPath, 1, nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
2018-04-23 22:00:02 +00:00
|
|
|
versionRaw := options.(map[string]interface{})["version"]
|
|
|
|
if versionRaw == nil {
|
|
|
|
return mountPath, 1, nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
2018-04-23 22:00:02 +00:00
|
|
|
version := versionRaw.(string)
|
|
|
|
switch version {
|
|
|
|
case "", "1":
|
|
|
|
return mountPath, 1, nil
|
|
|
|
case "2":
|
|
|
|
return mountPath, 2, nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
return mountPath, 1, nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
func isKVv2(path string, client *api.Client) (string, bool, error) {
|
|
|
|
mountPath, version, err := kvPreflightVersionRequest(client, path)
|
2018-03-21 22:02:41 +00:00
|
|
|
if err != nil {
|
2018-04-23 22:00:02 +00:00
|
|
|
return "", false, err
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
return mountPath, version == 2, nil
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
2018-04-23 22:00:02 +00:00
|
|
|
func addPrefixToVKVPath(p, mountPath, apiPrefix string) string {
|
2018-06-08 17:45:47 +00:00
|
|
|
switch {
|
|
|
|
case p == mountPath, p == strings.TrimSuffix(mountPath, "/"):
|
|
|
|
return path.Join(mountPath, apiPrefix)
|
|
|
|
default:
|
|
|
|
p = strings.TrimPrefix(p, mountPath)
|
|
|
|
return path.Join(mountPath, apiPrefix, p)
|
|
|
|
}
|
2018-03-21 22:02:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func getHeaderForMap(header string, data map[string]interface{}) string {
|
|
|
|
maxKey := 0
|
|
|
|
for k := range data {
|
|
|
|
if len(k) > maxKey {
|
|
|
|
maxKey = len(k)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 4 for the column spaces and 5 for the len("value")
|
|
|
|
totalLen := maxKey + 4 + 5
|
|
|
|
|
|
|
|
equalSigns := totalLen - (len(header) + 2)
|
|
|
|
|
|
|
|
// If we have zero or fewer equal signs bump it back up to two on either
|
|
|
|
// side of the header.
|
|
|
|
if equalSigns <= 0 {
|
|
|
|
equalSigns = 4
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the number of equal signs is not divisible by two add a sign.
|
|
|
|
if equalSigns%2 != 0 {
|
|
|
|
equalSigns = equalSigns + 1
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt.Sprintf("%s %s %s", strings.Repeat("=", equalSigns/2), header, strings.Repeat("=", equalSigns/2))
|
|
|
|
}
|
2018-04-04 00:58:42 +00:00
|
|
|
|
|
|
|
func kvParseVersionsFlags(versions []string) []string {
|
|
|
|
versionsOut := make([]string, 0, len(versions))
|
|
|
|
for _, v := range versions {
|
|
|
|
versionsOut = append(versionsOut, strutil.ParseStringSlice(v, ",")...)
|
|
|
|
}
|
|
|
|
|
|
|
|
return versionsOut
|
|
|
|
}
|