public/headscale
1
0 Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-11-04 04:34:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

mapper: add device_id to the NextDNS query

Browse Source 
SaaS sends the node's stable ID with the other device metadata.
This commit is contained in:
Kristoffer Dalby committed 2026-10-30 14:55:37 +00:00
1 parent d81f6169da
commit dc734e08e1
2 files changed
+4 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

hscontrol/mapper/mapper.go
+1
View File
@@ -226,6 +226,7 @@ func addNextDNSMetadata(resolvers []*dnstype.Resolver, node types.NodeView) {
}
q := u.Query()
q.Set("device_id", string(node.ID().StableID()))
q.Set("device_name", node.Hostname())
// Guard Hostinfo().Valid() before dereferencing OS(): a node loaded
hscontrol/mapper/mapper_test.go
+3 -9
View File
@@ -154,7 +154,7 @@ func TestNextDNSCapMapRendering(t *testing.T) {
nil,
)
want := "https://dns.nextdns.io/abc?device_ip=100.64.0.1&device_model=linux&device_name=node1"
want := "https://dns.nextdns.io/abc?device_id=1&device_ip=100.64.0.1&device_model=linux&device_name=node1"
if addr := resolverAddr(t, got); addr != want {
t.Errorf("addr = %q, want %q", addr, want)
}
@@ -173,7 +173,7 @@ func TestNextDNSCapMapRendering(t *testing.T) {
capMap,
)
want := "https://dns.nextdns.io/override?device_ip=100.64.0.1&device_model=linux&device_name=node1"
want := "https://dns.nextdns.io/override?device_id=1&device_ip=100.64.0.1&device_model=linux&device_name=node1"
if addr := resolverAddr(t, got); addr != want {
t.Errorf("addr = %q, want %q", addr, want)
}
@@ -221,13 +221,7 @@ func TestNextDNSCapMapRendering(t *testing.T) {
// nextDNSResolverSkipReasons lists checks where headscale's DoH address
// differs from SaaS, keyed <test_id>/<check>.
var nextDNSResolverSkipReasons = map[string]string{
"nodeattrs-nextdns-d10-resolver-default/device_id": nextDNSDeviceID,
"nodeattrs-nextdns-d11-resolver-profile/device_id": nextDNSDeviceID,
"nodeattrs-nextdns-d13-resolver-malformed/device_id": nextDNSDeviceID,
}
const nextDNSDeviceID = "NEXTDNS_DEVICE_ID: SaaS adds the node's stable ID to the DoH query as device_id; headscale does not"
var nextDNSResolverSkipReasons = map[string]string{}
// TestNextDNSResolverCompat compares the NextDNS DoH address every node gets
// with what SaaS sent: the global profile, a per-node profile, and a