curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-3192: Use zone ID in tunnelstore request path; improve debug logging

This commit is contained in:
Igor Postelnik 2020-07-21 16:15:48 -05:00
parent d61e3fb130
commit cf1c9a3083
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tunnelstore/client.go
View File

@ -9,9 +9,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/cloudflare/cloudflared/logger"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/cloudflare/cloudflared/logger"
) )
const ( const (
@ -129,7 +130,7 @@ func NewRESTClient(baseURL string, accountTag, zoneTag string, authToken string,
return &RESTClient{ return &RESTClient{
baseEndpoints: &baseEndpoints{ baseEndpoints: &baseEndpoints{
accountLevel: fmt.Sprintf("%s/accounts/%s/tunnels", baseURL, accountTag), accountLevel: fmt.Sprintf("%s/accounts/%s/tunnels", baseURL, accountTag),
zoneLevel: fmt.Sprintf("%s/zones/%s/tunnels", baseURL, accountTag), zoneLevel: fmt.Sprintf("%s/zones/%s/tunnels", baseURL, zoneTag),
}, },
authToken: authToken, authToken: authToken,
client: http.Client{ client: http.Client{
@ -152,15 +153,12 @@ func (r *RESTClient) CreateTunnel(name string, tunnelSecret []byte) (*Tunnel, er
if name == "" { if name == "" {
return nil, errors.New("tunnel name required") return nil, errors.New("tunnel name required")
} }
body, err := json.Marshal(&newTunnel{ body := &newTunnel{
Name: name, Name: name,
TunnelSecret: tunnelSecret, TunnelSecret: tunnelSecret,
})
if err != nil {
return nil, errors.Wrap(err, "Failed to serialize new tunnel request")
} }
resp, err := r.sendRequest("POST", r.baseEndpoints.accountLevel, bytes.NewBuffer(body)) resp, err := r.sendRequest("POST", r.baseEndpoints.accountLevel, body)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "REST request failed") return nil, errors.Wrap(err, "REST request failed")
} }
@ -173,7 +171,7 @@ func (r *RESTClient) CreateTunnel(name string, tunnelSecret []byte) (*Tunnel, er
return nil, ErrTunnelNameConflict return nil, ErrTunnelNameConflict
} }
return nil, statusCodeToError("create tunnel", resp) return nil, r.statusCodeToError("create tunnel", resp)
} }
func (r *RESTClient) GetTunnel(tunnelID uuid.UUID) (*Tunnel, error) { func (r *RESTClient) GetTunnel(tunnelID uuid.UUID) (*Tunnel, error) {
@ -188,7 +186,7 @@ func (r *RESTClient) GetTunnel(tunnelID uuid.UUID) (*Tunnel, error) {
return unmarshalTunnel(resp.Body) return unmarshalTunnel(resp.Body)
} }
return nil, statusCodeToError("get tunnel", resp) return nil, r.statusCodeToError("get tunnel", resp)
} }
func (r *RESTClient) DeleteTunnel(tunnelID uuid.UUID) error { func (r *RESTClient) DeleteTunnel(tunnelID uuid.UUID) error {
@ -199,7 +197,7 @@ func (r *RESTClient) DeleteTunnel(tunnelID uuid.UUID) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
return statusCodeToError("delete tunnel", resp) return r.statusCodeToError("delete tunnel", resp)
} }
func (r *RESTClient) ListTunnels() ([]Tunnel, error) { func (r *RESTClient) ListTunnels() ([]Tunnel, error) {
@ -217,7 +215,7 @@ func (r *RESTClient) ListTunnels() ([]Tunnel, error) {
return tunnels, nil return tunnels, nil
} }
return nil, statusCodeToError("list tunnels", resp) return nil, r.statusCodeToError("list tunnels", resp)
} }
func (r *RESTClient) CleanupConnections(tunnelID uuid.UUID) error { func (r *RESTClient) CleanupConnections(tunnelID uuid.UUID) error {
@ -228,32 +226,37 @@ func (r *RESTClient) CleanupConnections(tunnelID uuid.UUID) error {
} }
defer resp.Body.Close() defer resp.Body.Close()
return statusCodeToError("cleanup connections", resp) return r.statusCodeToError("cleanup connections", resp)
} }
func (r *RESTClient) RouteTunnel(tunnelID uuid.UUID, route Route) error { func (r *RESTClient) RouteTunnel(tunnelID uuid.UUID, route Route) error {
body, err := json.Marshal(route)
if err != nil {
return errors.Wrap(err, "Failed to serialize Route")
}
endpoint := fmt.Sprintf("%s/%v/routes", r.baseEndpoints.zoneLevel, tunnelID) endpoint := fmt.Sprintf("%s/%v/routes", r.baseEndpoints.zoneLevel, tunnelID)
resp, err := r.sendRequest("PUT", endpoint, bytes.NewBuffer(body)) resp, err := r.sendRequest("PUT", endpoint, route)
if err != nil { if err != nil {
return errors.Wrap(err, "REST request failed") return errors.Wrap(err, "REST request failed")
} }
defer resp.Body.Close() defer resp.Body.Close()
return statusCodeToError("add route", resp) return r.statusCodeToError("add route", resp)
} }
func (r *RESTClient) sendRequest(method string, url string, body io.Reader) (*http.Response, error) { func (r *RESTClient) sendRequest(method string, url string, body interface{}) (*http.Response, error) {
r.logger.Debugf("%s %s", method, url) r.logger.Debugf("%s %s", method, url)
req, err := http.NewRequest(method, url, body)
var bodyReader io.Reader
if body != nil {
if bodyBytes, err := json.Marshal(body); err != nil {
return nil, errors.Wrap(err, "failed to serialize json body")
} else {
bodyReader = bytes.NewBuffer(bodyBytes)
}
}
req, err := http.NewRequest(method, url, bodyReader)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "can't create %s request", method) return nil, errors.Wrapf(err, "can't create %s request", method)
} }
if body != nil { if bodyReader != nil {
req.Header.Set("Content-Type", jsonContentType) req.Header.Set("Content-Type", jsonContentType)
} }
req.Header.Add("X-Auth-User-Service-Key", r.authToken) req.Header.Add("X-Auth-User-Service-Key", r.authToken)
@ -268,7 +271,7 @@ func unmarshalTunnel(reader io.Reader) (*Tunnel, error) {
return &tunnel, nil return &tunnel, nil
} }
func statusCodeToError(op string, resp *http.Response) error { func (r *RESTClient) statusCodeToError(op string, resp *http.Response) error {
switch resp.StatusCode { switch resp.StatusCode {
case http.StatusOK: case http.StatusOK:
return nil return nil