Skip to content

Commit

Permalink
fixing conflict (#14710)
Browse files Browse the repository at this point in the history
Co-authored-by: akshya96 <87045294+akshya96@users.noreply.github.com>
  • Loading branch information
hc-github-team-secure-vault-core and akshya96 committed Mar 29, 2022
1 parent ceef6d5 commit 8dd2da8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog/14704.txt
@@ -0,0 +1,3 @@
```release-note:bug
core: Fix panic for help request URL paths without /v1/ prefix
```
6 changes: 6 additions & 0 deletions http/help.go
@@ -1,7 +1,9 @@
package http

import (
"errors"
"net/http"
"strings"

"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/sdk/logical"
Expand Down Expand Up @@ -31,6 +33,10 @@ func handleHelp(core *vault.Core, w http.ResponseWriter, r *http.Request) {
respondError(w, http.StatusBadRequest, nil)
return
}
if !strings.HasPrefix(r.URL.Path, "/v1/") {
respondError(w, http.StatusNotFound, errors.New("Missing /v1/ prefix in path. Use vault path-help command to retrieve API help for paths"))
return
}
path := ns.TrimmedPath(r.URL.Path[len("/v1/"):])

req := &logical.Request{
Expand Down
6 changes: 5 additions & 1 deletion http/help_test.go
Expand Up @@ -13,7 +13,11 @@ func TestHelp(t *testing.T) {
defer ln.Close()
TestServerAuth(t, addr, token)

resp := testHttpGet(t, "", addr+"/v1/sys/mounts?help=1")
// request without /v1/ prefix
resp := testHttpGet(t, token, addr+"/?help=1")
testResponseStatus(t, resp, 404)

resp = testHttpGet(t, "", addr+"/v1/sys/mounts?help=1")
if resp.StatusCode != http.StatusBadRequest {
t.Fatal("expected bad request with no token")
}
Expand Down

0 comments on commit 8dd2da8

Please sign in to comment.