2015-03-16 02:34:47 +00:00
|
|
|
package http
|
|
|
|
|
|
|
|
import (
|
2018-02-01 22:30:17 +00:00
|
|
|
"encoding/base64"
|
|
|
|
"encoding/json"
|
2018-09-18 03:03:00 +00:00
|
|
|
"fmt"
|
2015-04-07 21:36:17 +00:00
|
|
|
"io"
|
2015-05-20 05:23:41 +00:00
|
|
|
"net"
|
2015-03-16 02:34:47 +00:00
|
|
|
"net/http"
|
2016-01-19 23:09:26 +00:00
|
|
|
"strconv"
|
2015-03-16 02:34:47 +00:00
|
|
|
"strings"
|
2016-09-23 16:32:07 +00:00
|
|
|
"time"
|
2015-03-16 02:34:47 +00:00
|
|
|
|
2016-05-02 02:39:45 +00:00
|
|
|
"github.com/hashicorp/errwrap"
|
2019-01-09 00:48:57 +00:00
|
|
|
uuid "github.com/hashicorp/go-uuid"
|
2018-09-18 03:03:00 +00:00
|
|
|
"github.com/hashicorp/vault/helper/namespace"
|
2015-03-16 02:34:47 +00:00
|
|
|
"github.com/hashicorp/vault/logical"
|
|
|
|
"github.com/hashicorp/vault/vault"
|
|
|
|
)
|
|
|
|
|
2019-04-05 18:36:34 +00:00
|
|
|
func buildLogicalRequest(core *vault.Core, w http.ResponseWriter, r *http.Request) (*logical.Request, io.ReadCloser, int, error) {
|
2018-09-18 03:03:00 +00:00
|
|
|
ns, err := namespace.FromContext(r.Context())
|
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, nil
|
2016-05-20 17:03:54 +00:00
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
path := ns.TrimmedPath(r.URL.Path[len("/v1/"):])
|
2015-03-16 02:34:47 +00:00
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
var data map[string]interface{}
|
2019-04-05 18:36:34 +00:00
|
|
|
var origBody io.ReadCloser
|
2018-08-14 02:00:26 +00:00
|
|
|
|
2016-05-20 17:03:54 +00:00
|
|
|
// Determine the operation
|
|
|
|
var op logical.Operation
|
|
|
|
switch r.Method {
|
|
|
|
case "DELETE":
|
|
|
|
op = logical.DeleteOperation
|
2018-08-14 02:00:26 +00:00
|
|
|
|
2016-05-20 17:03:54 +00:00
|
|
|
case "GET":
|
|
|
|
op = logical.ReadOperation
|
|
|
|
queryVals := r.URL.Query()
|
2018-08-14 02:00:26 +00:00
|
|
|
var list bool
|
|
|
|
var err error
|
2016-05-20 17:03:54 +00:00
|
|
|
listStr := queryVals.Get("list")
|
|
|
|
if listStr != "" {
|
2018-08-14 02:00:26 +00:00
|
|
|
list, err = strconv.ParseBool(listStr)
|
2015-04-07 21:36:17 +00:00
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, nil
|
2016-05-20 17:03:54 +00:00
|
|
|
}
|
|
|
|
if list {
|
|
|
|
op = logical.ListOperation
|
2018-08-14 02:00:26 +00:00
|
|
|
if !strings.HasSuffix(path, "/") {
|
|
|
|
path += "/"
|
|
|
|
}
|
2015-03-16 02:34:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
if !list {
|
|
|
|
getData := map[string]interface{}{}
|
2017-02-17 04:23:32 +00:00
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
for k, v := range r.URL.Query() {
|
|
|
|
// Skip the help key as this is a reserved parameter
|
|
|
|
if k == "help" {
|
|
|
|
continue
|
|
|
|
}
|
2016-05-20 17:03:54 +00:00
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
switch {
|
|
|
|
case len(v) == 0:
|
|
|
|
case len(v) == 1:
|
|
|
|
getData[k] = v[0]
|
|
|
|
default:
|
|
|
|
getData[k] = v
|
|
|
|
}
|
|
|
|
}
|
2018-02-21 22:36:53 +00:00
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
if len(getData) > 0 {
|
|
|
|
data = getData
|
2018-02-21 22:36:53 +00:00
|
|
|
}
|
2018-08-14 02:00:26 +00:00
|
|
|
}
|
2018-02-21 22:36:53 +00:00
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
case "POST", "PUT":
|
|
|
|
op = logical.UpdateOperation
|
|
|
|
// Parse the request if we can
|
|
|
|
if op == logical.UpdateOperation {
|
2019-04-05 18:36:34 +00:00
|
|
|
origBody, err = parseRequest(core, r, w, &data)
|
2018-08-14 02:00:26 +00:00
|
|
|
if err == io.EOF {
|
|
|
|
data = nil
|
|
|
|
err = nil
|
|
|
|
}
|
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, err
|
2018-02-21 22:36:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-14 02:00:26 +00:00
|
|
|
case "LIST":
|
|
|
|
op = logical.ListOperation
|
|
|
|
if !strings.HasSuffix(path, "/") {
|
|
|
|
path += "/"
|
2018-02-21 22:36:53 +00:00
|
|
|
}
|
2018-08-14 02:00:26 +00:00
|
|
|
|
|
|
|
case "OPTIONS":
|
|
|
|
default:
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusMethodNotAllowed, nil
|
2018-02-21 22:36:53 +00:00
|
|
|
}
|
|
|
|
|
2016-07-26 19:50:37 +00:00
|
|
|
request_id, err := uuid.GenerateUUID()
|
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, errwrap.Wrapf("failed to generate identifier for the request: {{err}}", err)
|
2016-07-26 19:50:37 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
req, err := requestAuth(core, r, &logical.Request{
|
2016-07-26 20:44:50 +00:00
|
|
|
ID: request_id,
|
2016-05-20 17:03:54 +00:00
|
|
|
Operation: op,
|
|
|
|
Path: path,
|
|
|
|
Data: data,
|
|
|
|
Connection: getConnection(r),
|
2017-02-02 19:49:20 +00:00
|
|
|
Headers: r.Header,
|
2016-05-20 17:03:54 +00:00
|
|
|
})
|
2018-09-18 03:03:00 +00:00
|
|
|
if err != nil {
|
|
|
|
if errwrap.Contains(err, logical.ErrPermissionDenied.Error()) {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusForbidden, nil
|
2018-09-18 03:03:00 +00:00
|
|
|
}
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, errwrap.Wrapf("error performing token check: {{err}}", err)
|
2018-09-18 03:03:00 +00:00
|
|
|
}
|
2016-10-29 21:01:49 +00:00
|
|
|
|
2017-01-04 21:44:03 +00:00
|
|
|
req, err = requestWrapInfo(r, req)
|
2016-05-20 17:03:54 +00:00
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, errwrap.Wrapf("error parsing X-Vault-Wrap-TTL header: {{err}}", err)
|
2016-05-20 17:03:54 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
err = parseMFAHeader(req)
|
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, errwrap.Wrapf("failed to parse X-Vault-MFA header: {{err}}", err)
|
2018-09-18 03:03:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
err = requestPolicyOverride(r, req)
|
|
|
|
if err != nil {
|
2019-04-05 18:36:34 +00:00
|
|
|
return nil, nil, http.StatusBadRequest, errwrap.Wrapf(fmt.Sprintf(`failed to parse %s header: {{err}}`, PolicyOverrideHeaderName), err)
|
2018-09-18 03:03:00 +00:00
|
|
|
}
|
|
|
|
|
2019-04-05 18:36:34 +00:00
|
|
|
return req, origBody, 0, nil
|
2016-05-20 17:03:54 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
func handleLogical(core *vault.Core) http.Handler {
|
|
|
|
return handleLogicalInternal(core, false)
|
2018-09-05 15:45:17 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
func handleLogicalWithInjector(core *vault.Core) http.Handler {
|
|
|
|
return handleLogicalInternal(core, true)
|
2018-09-05 15:45:17 +00:00
|
|
|
}
|
|
|
|
|
2018-09-18 03:03:00 +00:00
|
|
|
func handleLogicalInternal(core *vault.Core, injectDataIntoTopLevel bool) http.Handler {
|
2016-05-20 17:03:54 +00:00
|
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
2019-04-05 18:36:34 +00:00
|
|
|
req, origBody, statusCode, err := buildLogicalRequest(core, w, r)
|
2016-05-20 17:03:54 +00:00
|
|
|
if err != nil || statusCode != 0 {
|
|
|
|
respondError(w, statusCode, err)
|
2016-05-02 02:39:45 +00:00
|
|
|
return
|
|
|
|
}
|
2016-03-18 02:29:53 +00:00
|
|
|
|
2019-04-05 18:36:34 +00:00
|
|
|
// Always forward requests that are using a limited use count token.
|
|
|
|
// origBody will not be nil if it's a perf standby as it checks
|
|
|
|
// PerfStandby() but will be nil otherwise.
|
|
|
|
if origBody != nil && req.ClientTokenRemainingUses > 0 {
|
|
|
|
r.Body = origBody
|
2018-09-18 03:03:00 +00:00
|
|
|
forwardRequest(core, w, r)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// req.Path will be relative by this point. The prefix check is first
|
|
|
|
// to fail faster if we're not in this situation since it's a hot path
|
|
|
|
switch {
|
|
|
|
case strings.HasPrefix(req.Path, "sys/wrapping/"), strings.HasPrefix(req.Path, "auth/token/"):
|
|
|
|
// Get the token ns info; if we match the paths below we want to
|
|
|
|
// swap in the token context (but keep the relative path)
|
|
|
|
if err != nil {
|
|
|
|
core.Logger().Warn("error looking up just-set context", "error", err)
|
|
|
|
respondError(w, http.StatusInternalServerError, err)
|
2016-03-18 02:29:53 +00:00
|
|
|
return
|
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
te := req.TokenEntry()
|
|
|
|
newCtx := r.Context()
|
|
|
|
if te != nil {
|
|
|
|
ns, err := vault.NamespaceByID(newCtx, te.NamespaceID, core)
|
|
|
|
if err != nil {
|
|
|
|
core.Logger().Warn("error looking up namespace from the token's namespace ID", "error", err)
|
|
|
|
respondError(w, http.StatusInternalServerError, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if ns != nil {
|
|
|
|
newCtx = namespace.ContextWithNamespace(newCtx, ns)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
switch req.Path {
|
|
|
|
case "sys/wrapping/lookup", "sys/wrapping/rewrap", "sys/wrapping/unwrap":
|
|
|
|
r = r.WithContext(newCtx)
|
|
|
|
if err := wrappingVerificationFunc(r.Context(), core, req); err != nil {
|
|
|
|
if errwrap.Contains(err, logical.ErrPermissionDenied.Error()) {
|
|
|
|
respondError(w, http.StatusForbidden, err)
|
|
|
|
} else {
|
|
|
|
respondError(w, http.StatusBadRequest, err)
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// The -self paths have no meaning outside of the token NS, so
|
|
|
|
// requests for these paths always go to the token NS
|
|
|
|
case "auth/token/lookup-self", "auth/token/renew-self", "auth/token/revoke-self":
|
|
|
|
r = r.WithContext(newCtx)
|
2019-03-01 00:02:25 +00:00
|
|
|
|
|
|
|
// For the following operations, we can set the proper namespace context
|
|
|
|
// using the token's embedded nsID if a relative path was provided. Since
|
|
|
|
// this is done at the HTTP layer, the operation will still be gated by
|
|
|
|
// ACLs.
|
|
|
|
case "auth/token/lookup", "auth/token/renew", "auth/token/revoke", "auth/token/revoke-orphan":
|
|
|
|
token, ok := req.Data["token"]
|
|
|
|
// If the token is not present (e.g. a bad request), break out and let the backend
|
|
|
|
// handle the error
|
|
|
|
if !ok {
|
|
|
|
// If this is a token lookup request and if the token is not
|
|
|
|
// explicitly provided, it will use the client token so we simply set
|
|
|
|
// the context to the client token's context.
|
|
|
|
if req.Path == "auth/token/lookup" {
|
|
|
|
r = r.WithContext(newCtx)
|
|
|
|
}
|
|
|
|
break
|
|
|
|
}
|
|
|
|
_, nsID := namespace.SplitIDFromString(token.(string))
|
|
|
|
if nsID != "" {
|
|
|
|
ns, err := vault.NamespaceByID(newCtx, nsID, core)
|
|
|
|
if err != nil {
|
|
|
|
core.Logger().Warn("error looking up namespace from the token's namespace ID", "error", err)
|
|
|
|
respondError(w, http.StatusInternalServerError, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if ns != nil {
|
|
|
|
newCtx = namespace.ContextWithNamespace(newCtx, ns)
|
|
|
|
r = r.WithContext(newCtx)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// The following relative sys/leases/ paths handles re-routing requests
|
|
|
|
// to the proper namespace using the lease ID on applicable paths.
|
|
|
|
case strings.HasPrefix(req.Path, "sys/leases/"):
|
|
|
|
switch req.Path {
|
|
|
|
// For the following operations, we can set the proper namespace context
|
|
|
|
// using the lease's embedded nsID if a relative path was provided. Since
|
|
|
|
// this is done at the HTTP layer, the operation will still be gated by
|
|
|
|
// ACLs.
|
|
|
|
case "sys/leases/lookup", "sys/leases/renew", "sys/leases/revoke", "sys/leases/revoke-force":
|
|
|
|
leaseID, ok := req.Data["lease_id"]
|
|
|
|
// If lease ID is not present, break out and let the backend handle the error
|
|
|
|
if !ok {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
_, nsID := namespace.SplitIDFromString(leaseID.(string))
|
|
|
|
if nsID != "" {
|
|
|
|
newCtx := r.Context()
|
|
|
|
ns, err := vault.NamespaceByID(newCtx, nsID, core)
|
|
|
|
if err != nil {
|
|
|
|
core.Logger().Warn("error looking up namespace from the lease's namespace ID", "error", err)
|
|
|
|
respondError(w, http.StatusInternalServerError, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if ns != nil {
|
|
|
|
newCtx = namespace.ContextWithNamespace(newCtx, ns)
|
|
|
|
r = r.WithContext(newCtx)
|
|
|
|
}
|
|
|
|
}
|
2018-09-18 03:03:00 +00:00
|
|
|
}
|
2016-03-18 02:29:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Make the internal request. We attach the connection info
|
|
|
|
// as well in case this is an authentication request that requires
|
2017-02-16 20:15:02 +00:00
|
|
|
// it. Vault core handles stripping this if we need to. This also
|
|
|
|
// handles all error cases; if we hit respondLogical, the request is a
|
|
|
|
// success.
|
2019-01-25 19:08:42 +00:00
|
|
|
resp, ok, needsForward := request(core, w, r, req)
|
|
|
|
if needsForward {
|
2019-04-05 18:36:34 +00:00
|
|
|
r.Body = origBody
|
2019-01-25 19:08:42 +00:00
|
|
|
forwardRequest(core, w, r)
|
|
|
|
return
|
|
|
|
}
|
2015-04-08 18:19:03 +00:00
|
|
|
if !ok {
|
2015-03-16 02:42:24 +00:00
|
|
|
return
|
|
|
|
}
|
2015-03-16 02:34:47 +00:00
|
|
|
|
2015-04-14 00:21:31 +00:00
|
|
|
// Build the proper response
|
2018-09-05 15:45:17 +00:00
|
|
|
respondLogical(w, r, req, resp, injectDataIntoTopLevel)
|
2015-04-14 00:21:31 +00:00
|
|
|
})
|
|
|
|
}
|
2015-03-31 04:06:15 +00:00
|
|
|
|
2018-09-05 15:45:17 +00:00
|
|
|
func respondLogical(w http.ResponseWriter, r *http.Request, req *logical.Request, resp *logical.Response, injectDataIntoTopLevel bool) {
|
2016-08-08 15:55:24 +00:00
|
|
|
var httpResp *logical.HTTPResponse
|
|
|
|
var ret interface{}
|
|
|
|
|
2015-04-14 00:21:31 +00:00
|
|
|
if resp != nil {
|
|
|
|
if resp.Redirect != "" {
|
2015-08-20 20:20:35 +00:00
|
|
|
// If we have a redirect, redirect! We use a 307 code
|
2015-04-14 00:21:31 +00:00
|
|
|
// because we don't actually know if its permanent.
|
2015-08-20 20:20:35 +00:00
|
|
|
http.Redirect(w, r, resp.Redirect, 307)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2015-05-27 21:10:00 +00:00
|
|
|
// Check if this is a raw response
|
2016-09-29 04:01:28 +00:00
|
|
|
if _, ok := resp.Data[logical.HTTPStatusCode]; ok {
|
|
|
|
respondRaw(w, r, resp)
|
2015-05-27 21:10:00 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-05-07 23:17:51 +00:00
|
|
|
if resp.WrapInfo != nil && resp.WrapInfo.Token != "" {
|
2016-08-08 15:55:24 +00:00
|
|
|
httpResp = &logical.HTTPResponse{
|
2016-05-02 04:08:07 +00:00
|
|
|
WrapInfo: &logical.HTTPWrapInfo{
|
2016-06-13 23:58:17 +00:00
|
|
|
Token: resp.WrapInfo.Token,
|
2017-11-13 20:31:32 +00:00
|
|
|
Accessor: resp.WrapInfo.Accessor,
|
2016-06-13 23:58:17 +00:00
|
|
|
TTL: int(resp.WrapInfo.TTL.Seconds()),
|
2016-09-23 16:32:07 +00:00
|
|
|
CreationTime: resp.WrapInfo.CreationTime.Format(time.RFC3339Nano),
|
2017-08-02 22:28:58 +00:00
|
|
|
CreationPath: resp.WrapInfo.CreationPath,
|
2016-06-13 23:58:17 +00:00
|
|
|
WrappedAccessor: resp.WrapInfo.WrappedAccessor,
|
2016-05-02 04:08:07 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
} else {
|
2016-09-29 19:03:47 +00:00
|
|
|
httpResp = logical.LogicalResponseToHTTPResponse(resp)
|
2016-08-08 15:55:24 +00:00
|
|
|
httpResp.RequestID = req.ID
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = httpResp
|
2018-09-05 15:45:17 +00:00
|
|
|
|
|
|
|
if injectDataIntoTopLevel {
|
|
|
|
injector := logical.HTTPSysInjector{
|
|
|
|
Response: httpResp,
|
|
|
|
}
|
|
|
|
ret = injector
|
|
|
|
}
|
2015-04-14 00:21:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Respond
|
2016-08-08 15:55:24 +00:00
|
|
|
respondOk(w, ret)
|
2016-05-20 15:49:48 +00:00
|
|
|
return
|
2015-03-16 02:34:47 +00:00
|
|
|
}
|
|
|
|
|
2015-05-27 21:10:00 +00:00
|
|
|
// respondRaw is used when the response is using HTTPContentType and HTTPRawBody
|
|
|
|
// to change the default response handling. This is only used for specific things like
|
|
|
|
// returning the CRL information on the PKI backends.
|
2016-09-29 04:01:28 +00:00
|
|
|
func respondRaw(w http.ResponseWriter, r *http.Request, resp *logical.Response) {
|
|
|
|
retErr := func(w http.ResponseWriter, err string) {
|
|
|
|
w.Header().Set("X-Vault-Raw-Error", err)
|
|
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
|
|
w.Write(nil)
|
|
|
|
}
|
|
|
|
|
2015-05-27 21:10:00 +00:00
|
|
|
// Ensure this is never a secret or auth response
|
|
|
|
if resp.Secret != nil || resp.Auth != nil {
|
2016-09-29 04:01:28 +00:00
|
|
|
retErr(w, "raw responses cannot contain secrets or auth")
|
2015-05-27 21:10:00 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get the status code
|
|
|
|
statusRaw, ok := resp.Data[logical.HTTPStatusCode]
|
|
|
|
if !ok {
|
2016-09-29 04:01:28 +00:00
|
|
|
retErr(w, "no status code given")
|
2015-05-27 21:10:00 +00:00
|
|
|
return
|
|
|
|
}
|
2018-02-01 22:30:17 +00:00
|
|
|
|
|
|
|
var status int
|
|
|
|
switch statusRaw.(type) {
|
|
|
|
case int:
|
|
|
|
status = statusRaw.(int)
|
|
|
|
case float64:
|
|
|
|
status = int(statusRaw.(float64))
|
|
|
|
case json.Number:
|
|
|
|
s64, err := statusRaw.(json.Number).Float64()
|
|
|
|
if err != nil {
|
|
|
|
retErr(w, "cannot decode status code")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
status = int(s64)
|
|
|
|
default:
|
2016-09-29 04:01:28 +00:00
|
|
|
retErr(w, "cannot decode status code")
|
2015-05-27 21:10:00 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-09-29 04:01:28 +00:00
|
|
|
nonEmpty := status != http.StatusNoContent
|
|
|
|
|
|
|
|
var contentType string
|
|
|
|
var body []byte
|
|
|
|
|
|
|
|
// Get the content type header; don't require it if the body is empty
|
2015-05-27 21:10:00 +00:00
|
|
|
contentTypeRaw, ok := resp.Data[logical.HTTPContentType]
|
2017-10-26 07:08:10 +00:00
|
|
|
if !ok && nonEmpty {
|
2016-09-29 04:01:28 +00:00
|
|
|
retErr(w, "no content type given")
|
2015-05-27 21:10:00 +00:00
|
|
|
return
|
|
|
|
}
|
2016-09-29 04:01:28 +00:00
|
|
|
if ok {
|
|
|
|
contentType, ok = contentTypeRaw.(string)
|
|
|
|
if !ok {
|
|
|
|
retErr(w, "cannot decode content type")
|
|
|
|
return
|
|
|
|
}
|
2015-05-27 21:10:00 +00:00
|
|
|
}
|
|
|
|
|
2016-09-29 04:01:28 +00:00
|
|
|
if nonEmpty {
|
|
|
|
// Get the body
|
|
|
|
bodyRaw, ok := resp.Data[logical.HTTPRawBody]
|
|
|
|
if !ok {
|
2018-07-11 19:45:09 +00:00
|
|
|
goto WRITE_RESPONSE
|
2016-09-29 04:01:28 +00:00
|
|
|
}
|
2018-02-01 22:30:17 +00:00
|
|
|
|
|
|
|
switch bodyRaw.(type) {
|
|
|
|
case string:
|
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
|
|
|
// This is best effort. The value may already be base64-decoded so
|
|
|
|
// if it doesn't work we just use as-is
|
|
|
|
bodyDec, err := base64.StdEncoding.DecodeString(bodyRaw.(string))
|
|
|
|
if err == nil {
|
|
|
|
body = bodyDec
|
|
|
|
} else {
|
|
|
|
body = []byte(bodyRaw.(string))
|
2018-02-01 22:30:17 +00:00
|
|
|
}
|
|
|
|
case []byte:
|
|
|
|
body = bodyRaw.([]byte)
|
|
|
|
default:
|
2016-09-29 04:01:28 +00:00
|
|
|
retErr(w, "cannot decode body")
|
|
|
|
return
|
|
|
|
}
|
2015-05-27 21:10:00 +00:00
|
|
|
}
|
|
|
|
|
2018-07-11 19:45:09 +00:00
|
|
|
WRITE_RESPONSE:
|
2015-05-27 21:10:00 +00:00
|
|
|
// Write the response
|
2016-09-29 04:01:28 +00:00
|
|
|
if contentType != "" {
|
|
|
|
w.Header().Set("Content-Type", contentType)
|
|
|
|
}
|
2016-12-15 22:53:07 +00:00
|
|
|
|
2015-05-27 21:10:00 +00:00
|
|
|
w.WriteHeader(status)
|
|
|
|
w.Write(body)
|
|
|
|
}
|
|
|
|
|
2015-06-29 22:27:28 +00:00
|
|
|
// getConnection is used to format the connection information for
|
|
|
|
// attaching to a logical request
|
2015-06-19 00:17:18 +00:00
|
|
|
func getConnection(r *http.Request) (connection *logical.Connection) {
|
|
|
|
var remoteAddr string
|
|
|
|
|
|
|
|
remoteAddr, _, err := net.SplitHostPort(r.RemoteAddr)
|
|
|
|
if err != nil {
|
|
|
|
remoteAddr = ""
|
|
|
|
}
|
|
|
|
|
|
|
|
connection = &logical.Connection{
|
|
|
|
RemoteAddr: remoteAddr,
|
|
|
|
ConnState: r.TLS,
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|