Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tunnel_routes: stricter validation for parameters #917

Merged
merged 1 commit into from May 31, 2022
Merged

tunnel_routes: stricter validation for parameters #917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 28 additions & 2 deletions tunnel_routes.go
View file
Open in desktop
Expand Up @@ -6,11 +6,17 @@ import (
"fmt"
"net/http"
"net/url"
"strings"
"time"

"github.com/pkg/errors"
)

var (
ErrMissingNetwork = errors.New("missing required network parameter")
ErrInvalidNetworkValue = errors.New("invalid IP parameter. Cannot use CIDR ranges for this endpoint.")
)

// TunnelRoute is the full record for a route.
type TunnelRoute struct {
Network string `json:"network"`
Expand All @@ -22,7 +28,7 @@ type TunnelRoute struct {
}

type TunnelRoutesListParams struct {
AccountID string
AccountID string `url:"-"`
TunnelID string `url:"tunnel_id,omitempty"`
Comment string `url:"comment,omitempty"`
IsDeleted *bool `url:"is_deleted,omitempty"`
Expand Down Expand Up @@ -76,7 +82,7 @@ func (api *API) ListTunnelRoutes(ctx context.Context, params TunnelRoutesListPar
}

uri := buildURI(fmt.Sprintf("/%s/%s/teamnet/routes", AccountRouteRoot, params.AccountID), params)
res, err := api.makeRequestContext(ctx, http.MethodGet, uri, params)
res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
if err != nil {
return []TunnelRoute{}, err
}
Expand All @@ -94,6 +100,18 @@ func (api *API) ListTunnelRoutes(ctx context.Context, params TunnelRoutesListPar
//
// See: https://api.cloudflare.com/#tunnel-route-get-tunnel-route-by-ip
func (api *API) GetTunnelRouteForIP(ctx context.Context, params TunnelRoutesForIPParams) (TunnelRoute, error) {
if params.AccountID == "" {
return TunnelRoute{}, ErrMissingAccountID
}

if params.Network == "" {
return TunnelRoute{}, ErrMissingNetwork
}

if strings.Contains(params.Network, "/") {
return TunnelRoute{}, ErrInvalidNetworkValue
}

uri := fmt.Sprintf("/%s/%s/teamnet/routes/ip/%s", AccountRouteRoot, params.AccountID, params.Network)

responseBody, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
Expand All @@ -119,6 +137,10 @@ func (api *API) CreateTunnelRoute(ctx context.Context, params TunnelRoutesCreate
return TunnelRoute{}, ErrMissingAccountID
}

if params.Network == "" {
return TunnelRoute{}, ErrMissingNetwork
}

uri := fmt.Sprintf("/%s/%s/teamnet/routes/network/%s", AccountRouteRoot, params.AccountID, url.PathEscape(params.Network))

responseBody, err := api.makeRequestContext(ctx, http.MethodPost, uri, params)
Expand All @@ -143,6 +165,10 @@ func (api *API) DeleteTunnelRoute(ctx context.Context, params TunnelRoutesDelete
return ErrMissingAccountID
}

if params.Network == "" {
return ErrMissingNetwork
}

uri := fmt.Sprintf("/%s/%s/teamnet/routes/network/%s", AccountRouteRoot, params.AccountID, url.PathEscape(params.Network))

responseBody, err := api.makeRequestContext(ctx, http.MethodDelete, uri, nil)
Expand Down