status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

URL-encode/decode resource names for HTTP API part 5 (#12297)

This commit is contained in:
Dao Thanh Tung 2022-02-14 23:47:06 +08:00 committed by GitHub
parent 1a16f7ee70
commit add15e12f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
agent/health_endpoint.go
View File

@ -4,7 +4,6 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"strconv" "strconv"
"strings"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
@ -77,7 +76,11 @@ func (s *HTTPHandlers) HealthNodeChecks(resp http.ResponseWriter, req *http.Requ
} }
// Pull out the service name // Pull out the service name
args.Node = strings.TrimPrefix(req.URL.Path, "/v1/health/node/") var err error
args.Node, err = getPathSuffixUnescaped(req.URL.Path, "/v1/health/node/")
if err != nil {
return nil, err
}
if args.Node == "" { if args.Node == "" {
return nil, BadRequestError{Reason: "Missing node name"} return nil, BadRequestError{Reason: "Missing node name"}
} }
@ -123,7 +126,11 @@ func (s *HTTPHandlers) HealthServiceChecks(resp http.ResponseWriter, req *http.R
} }
// Pull out the service name // Pull out the service name
args.ServiceName = strings.TrimPrefix(req.URL.Path, "/v1/health/checks/") var err error
args.ServiceName, err = getPathSuffixUnescaped(req.URL.Path, "/v1/health/checks/")
if err != nil {
return nil, err
}
if args.ServiceName == "" { if args.ServiceName == "" {
return nil, BadRequestError{Reason: "Missing service name"} return nil, BadRequestError{Reason: "Missing service name"}
} }
@ -209,7 +216,11 @@ func (s *HTTPHandlers) healthServiceNodes(resp http.ResponseWriter, req *http.Re
} }
// Pull out the service name // Pull out the service name
args.ServiceName = strings.TrimPrefix(req.URL.Path, prefix) var err error
args.ServiceName, err = getPathSuffixUnescaped(req.URL.Path, prefix)
if err != nil {
return nil, err
}
if args.ServiceName == "" { if args.ServiceName == "" {
return nil, BadRequestError{Reason: "Missing service name"} return nil, BadRequestError{Reason: "Missing service name"}
} }