mirror of
https://github.com/netbirdio/netbird.git
synced 2026-07-20 23:41:28 +02:00
665f254a55
Add the wrappers needed to drive the bring-your-own-proxy + private-
service flows from external tooling (CI, IaC, dashboards built against
the REST client). The existing Service / ProxyCluster types already
carry Private / AccessGroups / direct_upstream via the openapi-generated
shapes, so the new code is the API surface itself — not field-level
plumbing.
- ReverseProxyClustersAPI.Delete(clusterAddress): DELETE
/api/reverse-proxies/clusters/{clusterAddress}. Removes every
self-hosted (BYOP) proxy registration the calling account owns under
that address. Shared clusters operated by NetBird are 404 here.
- ReverseProxyTokensAPI (new file): List / Create / Delete against
/api/reverse-proxies/proxy-tokens. Tokens are account-scoped and
used by `netbird proxy` to register against management. Create
returns api.ProxyTokenCreated, whose PlainToken is the one-shot
secret; List and Delete operate on metadata only.
Tests cover the success + error paths for each new operation and pin
the cluster List response to round-trip the `private` capability flag.
Existing reverse_proxy_services_test.go was failing to build on the
parent commit because the regenerated api types switched Service.Auth
to *ServiceAuthConfig and Service.Targets to *[]ServiceTarget; fixed
the literals (`&api.ServiceAuthConfig{}`, `&[]api.ServiceTarget{...}`,
`(*req.Targets)[0]`) so the integration tag builds again — necessary
to even run the new tests.
91 lines
3.1 KiB
Go
91 lines
3.1 KiB
Go
//go:build integration
|
|
|
|
package rest_test
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/netbirdio/netbird/shared/management/client/rest"
|
|
"github.com/netbirdio/netbird/shared/management/http/api"
|
|
"github.com/netbirdio/netbird/shared/management/http/util"
|
|
)
|
|
|
|
func boolPtr(b bool) *bool { return &b }
|
|
|
|
var testCluster = api.ProxyCluster{
|
|
Id: "cluster-1",
|
|
Address: "proxy.netbird.local",
|
|
Type: "shared",
|
|
Online: true,
|
|
ConnectedProxies: 2,
|
|
SupportsCustomPorts: boolPtr(true),
|
|
RequireSubdomain: boolPtr(false),
|
|
SupportsCrowdsec: boolPtr(false),
|
|
Private: boolPtr(true),
|
|
}
|
|
|
|
func TestReverseProxyClusters_List_200(t *testing.T) {
|
|
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
|
|
mux.HandleFunc("/api/reverse-proxies/clusters", func(w http.ResponseWriter, r *http.Request) {
|
|
assert.Equal(t, "GET", r.Method, "List must use GET")
|
|
retBytes, _ := json.Marshal([]api.ProxyCluster{testCluster})
|
|
_, err := w.Write(retBytes)
|
|
require.NoError(t, err)
|
|
})
|
|
ret, err := c.ReverseProxyClusters.List(context.Background())
|
|
require.NoError(t, err)
|
|
require.Len(t, ret, 1)
|
|
assert.Equal(t, testCluster.Id, ret[0].Id)
|
|
assert.Equal(t, testCluster.Address, ret[0].Address)
|
|
require.NotNil(t, ret[0].Private, "private capability must round-trip through the client")
|
|
assert.True(t, *ret[0].Private, "private capability must reflect the server value")
|
|
})
|
|
}
|
|
|
|
func TestReverseProxyClusters_List_Err(t *testing.T) {
|
|
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
|
|
mux.HandleFunc("/api/reverse-proxies/clusters", func(w http.ResponseWriter, r *http.Request) {
|
|
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "No", Code: 500})
|
|
w.WriteHeader(500)
|
|
_, err := w.Write(retBytes)
|
|
require.NoError(t, err)
|
|
})
|
|
ret, err := c.ReverseProxyClusters.List(context.Background())
|
|
assert.Error(t, err)
|
|
assert.Empty(t, ret)
|
|
})
|
|
}
|
|
|
|
func TestReverseProxyClusters_Delete_200(t *testing.T) {
|
|
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
|
|
// PathEscape on "proxy.netbird.local" leaves it intact; the route mux
|
|
// matches the unescaped form. Sanity-check both the method and that
|
|
// path-escaping doesn't double-encode the dotted address.
|
|
mux.HandleFunc("/api/reverse-proxies/clusters/proxy.netbird.local", func(w http.ResponseWriter, r *http.Request) {
|
|
assert.Equal(t, "DELETE", r.Method, "Delete must use DELETE")
|
|
w.WriteHeader(200)
|
|
})
|
|
err := c.ReverseProxyClusters.Delete(context.Background(), "proxy.netbird.local")
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestReverseProxyClusters_Delete_Err(t *testing.T) {
|
|
withMockClient(func(c *rest.Client, mux *http.ServeMux) {
|
|
mux.HandleFunc("/api/reverse-proxies/clusters/proxy.netbird.local", func(w http.ResponseWriter, r *http.Request) {
|
|
retBytes, _ := json.Marshal(util.ErrorResponse{Message: "Not found", Code: 404})
|
|
w.WriteHeader(404)
|
|
_, err := w.Write(retBytes)
|
|
require.NoError(t, err)
|
|
})
|
|
err := c.ReverseProxyClusters.Delete(context.Background(), "proxy.netbird.local")
|
|
assert.Error(t, err)
|
|
})
|
|
}
|