From e83401731429975b1f32066b9047f919c1a8ff66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Thu, 21 Nov 2024 17:00:26 +0200 Subject: [PATCH] server_url and base_domain: re-word error message, fix a one-off bug and add a test case for the bug. --- hscontrol/types/config.go | 6 +++--- hscontrol/types/config_test.go | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go index 114ee015..21bade73 100644 --- a/hscontrol/types/config.go +++ b/hscontrol/types/config.go @@ -30,7 +30,7 @@ const ( var ( errOidcMutuallyExclusive = errors.New("oidc_client_secret and oidc_client_secret_path are mutually exclusive") - errServerURLSuffix = errors.New("server_url cannot be a suffix of the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.") + errServerURLSuffix = errors.New("server_url cannot be part of base_domain in a way that could make the DERP and headscale server unreachable.") ) type IPAllocationStrategy string @@ -946,8 +946,8 @@ func isSafeServerURL(serverURL, baseDomain string) error { s := len(serverDomainParts) b := len(baseDomainParts) - for i := 1; i < len(baseDomainParts)-1; i++ { - if serverDomainParts[s-i] != baseDomainParts[b-i] { + for i := 0; i < len(baseDomainParts); i++ { + if serverDomainParts[s-i-1] != baseDomainParts[b-i-1] { return nil } } diff --git a/hscontrol/types/config_test.go b/hscontrol/types/config_test.go index f4ed3501..54de13d1 100644 --- a/hscontrol/types/config_test.go +++ b/hscontrol/types/config_test.go @@ -140,7 +140,7 @@ func TestReadConfig(t *testing.T) { return LoadServerConfig() }, want: nil, - wantErr: "server_url cannot be a suffix of the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.", + wantErr: errServerURLSuffix.Error(), }, { name: "base-domain-not-in-server-url", @@ -362,6 +362,10 @@ func TestSafeServerURL(t *testing.T) { serverURL: "https://headscale.com", baseDomain: "clients.subdomain.headscale.com", }, + { + serverURL: "https://headscale.kristoffer.com", + baseDomain: "mybase", + }, { serverURL: "https://server.headscale.com", baseDomain: "headscale.com",