eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ensure final dot on node name (#2503)

Browse source 
* ensure final dot on node name

This ensures that nodes which have a base domain set, will have a dot appended to their FQDN.

Resolves: https://github.com/juanfont/headscale/issues/2501

* improve OIDC TTL expire test

Waiting a bit more than the TTL of the OIDC token seems to remove some flakiness of this test. This furthermore makes use of a go func safe buffer which should avoid race conditions.
This commit is contained in:
Nick 2025-04-11 12:39:08 +02:00 • committed by GitHub
parent 0d3134720b
commit 109989005d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 67 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
hscontrol/mapper/tail_test.go
View file

@ -169,6 +169,32 @@ func TestTailNode(t *testing.T) {
},
wantErr: false,
},
{
name: "check-dot-suffix-on-node-name",
node: &types.Node{
GivenName: "minimal",
Hostinfo: &tailcfg.Hostinfo{},
},
dnsConfig: &tailcfg.DNSConfig{},
baseDomain: "example.com",
want: &tailcfg.Node{
// a node name should have a dot appended
Name: "minimal.example.com.",
StableID: "0",
HomeDERP: 0,
LegacyDERPString: "127.3.3.40:0",
Hostinfo: hiview(tailcfg.Hostinfo{}),
Tags: []string{},
MachineAuthorized: true,
CapMap: tailcfg.NodeCapMap{
tailcfg.CapabilityFileSharing: []tailcfg.RawMessage{},
tailcfg.CapabilityAdmin: []tailcfg.RawMessage{},
tailcfg.CapabilitySSH: []tailcfg.RawMessage{},
},
},
wantErr: false,
},
// TODO: Add tests to check other aspects of the node conversion:
// - With tags and policy
// - dnsconfig and basedomain

2
hscontrol/types/node.go
View file

@ -364,7 +364,7 @@ func (node *Node) GetFQDN(baseDomain string) (string, error) {
if baseDomain != "" {
hostname = fmt.Sprintf(
"%s.%s",
"%s.%s.",
node.GivenName,
baseDomain,
)

8
hscontrol/types/node_test.go
View file

@ -142,7 +142,7 @@ func TestNodeFQDN(t *testing.T) {
},
},
domain: "example.com",
want: "test.example.com",
want: "test.example.com.",
},
{
name: "all-set",
@ -153,7 +153,7 @@ func TestNodeFQDN(t *testing.T) {
},
},
domain: "example.com",
want: "test.example.com",
want: "test.example.com.",
},
{
name: "no-given-name",
@ -171,7 +171,7 @@ func TestNodeFQDN(t *testing.T) {
GivenName: strings.Repeat("a", 256),
},
domain: "example.com",
wantErr: fmt.Sprintf("failed to create valid FQDN (%s.example.com): hostname too long, cannot except 255 ASCII chars", strings.Repeat("a", 256)),
wantErr: fmt.Sprintf("failed to create valid FQDN (%s.example.com.): hostname too long, cannot except 255 ASCII chars", strings.Repeat("a", 256)),
},
{
name: "no-dnsconfig",
@ -182,7 +182,7 @@ func TestNodeFQDN(t *testing.T) {
},
},
domain: "example.com",
want: "test.example.com",
want: "test.example.com.",
},
}