mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-19 20:09:07 +02:00
Nicolas Frati
357d8a2a7c
* [proxy] Add --external-ip-map flag for the embedded client The proxy behind a NAT with a forwarded fixed --wg-port could not advertise its public address as an ICE candidate, so peers fell back to relay. Expose the agent's external IP map through embed.Options and a proxy flag (NB_PROXY_EXTERNAL_IP_MAP). * [proxy] Validate --external-ip-map at startup The engine drops every external IP mapping when one fails to parse, so a typo or a space after a comma silently disabled the feature. Move the agent's validator to shared/externalipmap, run it from the proxy at startup, and trim entries first. * [client,proxy] Require an external IP first in --external-ip-map The engine reads the first component as the external IP, so a mapping like iface/10.0.0.5 passed validation and then dropped every mapping.
49 lines
1.6 KiB
Go
49 lines
1.6 KiB
Go
package externalipmap
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestValidate(t *testing.T) {
|
|
ifaces, err := net.Interfaces()
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, ifaces, "host must have at least one interface")
|
|
iface := ifaces[0].Name
|
|
|
|
tests := []struct {
|
|
name string
|
|
input []string
|
|
wantErr bool
|
|
}{
|
|
{name: "nil", input: nil},
|
|
{name: "single IP", input: []string{"203.0.113.5"}},
|
|
{name: "IP to IP", input: []string{"203.0.113.5/10.0.0.5"}},
|
|
{name: "IP to interface", input: []string{"203.0.113.5/" + iface}},
|
|
{name: "several", input: []string{"203.0.113.5", "203.0.113.6/10.0.0.6"}},
|
|
{name: "empty element", input: []string{""}, wantErr: true},
|
|
// The engine rejects padded values, so validation must too.
|
|
{name: "space padded", input: []string{"203.0.113.5", " 203.0.113.6"}, wantErr: true},
|
|
{name: "not an IP", input: []string{"not-an-ip"}, wantErr: true},
|
|
{name: "too many slashes", input: []string{"203.0.113.5/10.0.0.5/10.0.0.6"}, wantErr: true},
|
|
{name: "unknown interface", input: []string{"203.0.113.5/nb-no-such-iface0"}, wantErr: true},
|
|
{name: "external interface", input: []string{iface}, wantErr: true},
|
|
{name: "interface to IP", input: []string{iface + "/10.0.0.5"}, wantErr: true},
|
|
{name: "two interfaces", input: []string{iface + "/" + iface}, wantErr: true},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
err := Validate(tt.input)
|
|
if tt.wantErr {
|
|
assert.Error(t, err, "input %q should be rejected", tt.input)
|
|
return
|
|
}
|
|
assert.NoError(t, err, "input %q should be accepted", tt.input)
|
|
})
|
|
}
|
|
}
|