DYNR/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-05 00:15:26 -04:00
Code Issues 23.5k Packages Projects Releases 10 Wiki Activity

[PR #6233] [MERGED] [client] filter A/AAAA answers pointing at disconnected peers #27820

New Issue
Open
opened 2026-08-05 07:09:16 -04:00 by saavagebueno · 0 comments
saavagebueno commented 2026-08-05 07:09:16 -04:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbirdio/netbird/pull/6233
Author: @mlsmaycon
Created: 5/21/2026
Status: ✅ Merged
Merged: 5/25/2026
Merged by: @mlsmaycon

Base: feat/private-service-expose-public ← Head: feat/private-service-expose-client-dns

📝 Commits (1)

  • 0d45ad4 feat(dns/local): filter A/AAAA answers pointing at disconnected peers

📊 Changes

3 files changed (+253 additions, -0 deletions)

View changed files

📝 client/internal/dns/local/local.go (+100 -0)
📝 client/internal/dns/local/local_test.go (+126 -0)
📝 client/internal/dns/server.go (+27 -0)

📄 Description

Describe your changes

When the local resolver hands back records for a query, walk the A/AAAA answers and consult a connectivity checker keyed by IP. Records whose RDATA points at a known-but-disconnected peer are dropped from the answer. Records pointing at unknown IPs (anything outside the local peerstore) pass through untouched.

Motivation: synthesised private-service zones emit one A record per connected proxy peer in a cluster. The management side now refreshes the netmap whenever a proxy peer flips state, but the client may still hold a stale netmap for a short window. This is the client-side belt to that braces — even on the stale data, the resolver hides records pointing at peers that the local peerstore reports offline.

Escape hatch: if filtering would empty the answer entirely AND at least one record was dropped, the original list is restored. Better to hand the client a record that may not respond than NXDOMAIN it completely when every proxy in the cluster is offline (the upstream may still be reachable some other way, or the peerstore may be stale).

  • local.PeerConnectivity interface: IsConnectedByIP(ip) (known, connected).
  • Resolver.SetPeerConnectivity wires the source (nil = disabled, the legacy "return everything" default).
  • ServeDNS runs filterDisconnectedPeerAnswers between lookupRecords and the reply assembly; extractRecordIP pulls IP from A/AAAA only, other record types pass through.
  • server.go adapter localPeerConnectivity wraps *peer.Status and reports connected when ConnStatus == StatusConnected.
  • New tests cover the four cases: drop disconnected, pass unknown, fallback when all disconnected, and no-op when no checker is wired.

Issue ticket number and link

Stack

Checklist

  • Is it a bug fix
  • Is a typo/documentation fix
  • Is a feature enhancement
  • It is a refactor
  • Created tests that fail without the change (if possible)
  • This change does not modify the public API, gRPC protocols, functionality behavior, CLI / service flags, or introduce a new feature — OR I have discussed it with the NetBird team beforehand (link the issue / Slack thread in the description). See CONTRIBUTING.md.

By submitting this pull request, you confirm that you have read and agree to the terms of the Contributor License Agreement.

Documentation

Select exactly one:

  • I added/updated documentation for this change
  • Documentation is not needed for this change (explain why)

Docs PR URL (required if "docs added" is checked)

Paste the PR link from https://github.com/netbirdio/docs here:

https://github.com/netbirdio/docs/pull/__

Summary by CodeRabbit

  • New Features

    • DNS resolver now filters out local A/AAAA answers for peers that are not currently connected, preventing users from resolving IP addresses for unavailable peers.

  • Tests

    • Added comprehensive test coverage for DNS filtering behavior, including handling of mixed connectivity states and fallback scenarios.

Review Change Stack

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbirdio/netbird/pull/6233 **Author:** [@mlsmaycon](https://github.com/mlsmaycon) **Created:** 5/21/2026 **Status:** ✅ Merged **Merged:** 5/25/2026 **Merged by:** [@mlsmaycon](https://github.com/mlsmaycon) **Base:** `feat/private-service-expose-public` ← **Head:** `feat/private-service-expose-client-dns` --- ### 📝 Commits (1) - [`0d45ad4`](https://github.com/netbirdio/netbird/commit/0d45ad453a5bce1106d3e92aacaff31de28b378f) feat(dns/local): filter A/AAAA answers pointing at disconnected peers ### 📊 Changes **3 files changed** (+253 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `client/internal/dns/local/local.go` (+100 -0) 📝 `client/internal/dns/local/local_test.go` (+126 -0) 📝 `client/internal/dns/server.go` (+27 -0) </details> ### 📄 Description ## Describe your changes When the local resolver hands back records for a query, walk the A/AAAA answers and consult a connectivity checker keyed by IP. Records whose RDATA points at a known-but-disconnected peer are dropped from the answer. Records pointing at unknown IPs (anything outside the local peerstore) pass through untouched. Motivation: synthesised private-service zones emit one A record per connected proxy peer in a cluster. The management side now refreshes the netmap whenever a proxy peer flips state, but the client may still hold a stale netmap for a short window. This is the client-side belt to that braces — even on the stale data, the resolver hides records pointing at peers that the local peerstore reports offline. Escape hatch: if filtering would empty the answer entirely AND at least one record was dropped, the original list is restored. Better to hand the client a record that may not respond than NXDOMAIN it completely when every proxy in the cluster is offline (the upstream may still be reachable some other way, or the peerstore may be stale). - local.PeerConnectivity interface: IsConnectedByIP(ip) (known, connected). - Resolver.SetPeerConnectivity wires the source (nil = disabled, the legacy "return everything" default). - ServeDNS runs filterDisconnectedPeerAnswers between lookupRecords and the reply assembly; extractRecordIP pulls IP from A/AAAA only, other record types pass through. - server.go adapter localPeerConnectivity wraps *peer.Status and reports connected when ConnStatus == StatusConnected. - New tests cover the four cases: drop disconnected, pass unknown, fallback when all disconnected, and no-op when no checker is wired. ## Issue ticket number and link ## Stack <!-- branch-stack --> ### Checklist - [ ] Is it a bug fix - [ ] Is a typo/documentation fix - [x] Is a feature enhancement - [ ] It is a refactor - [ ] Created tests that fail without the change (if possible) - [ ] This change does **not** modify the public API, gRPC protocols, functionality behavior, CLI / service flags, or introduce a new feature — **OR** I have discussed it with the NetBird team beforehand (link the issue / Slack thread in the description). See [CONTRIBUTING.md](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTING.md#discuss-changes-with-the-netbird-team-first). > By submitting this pull request, you confirm that you have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md). ## Documentation Select exactly one: - [ ] I added/updated documentation for this change - [x] Documentation is **not needed** for this change (explain why) ### Docs PR URL (required if "docs added" is checked) Paste the PR link from https://github.com/netbirdio/docs here: https://github.com/netbirdio/docs/pull/__ <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * DNS resolver now filters out local A/AAAA answers for peers that are not currently connected, preventing users from resolving IP addresses for unavailable peers. * **Tests** * Added comprehensive test coverage for DNS filtering behavior, including handling of mixed connectivity states and fallback scenarios. <!-- review_stack_entry_start --> [![Review Change Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/netbirdio/netbird/pull/6233?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack) <!-- review_stack_entry_end --> <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
saavagebueno added the pull-request label 2026-08-05 07:09:16 -04:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
2021 Q4
2021 Q4
2021 Q4
2022 Q1
2022 Q1
2022 Q1
2022 Q1
2022 Q1
2022 Q1
accessibility
accessibility
accessibility
acl
acl
acl
agent
agent
agent
agent
agent
agent
Android
Android
Android
Android
Android
Android
api
api
api
authentik
authentik
authentik
automation
automation
automation
azure
azure
azure
battery-usage
battery-usage
battery-usage
bug
cache
cache
cache
client
client
client
client-ui
client-ui
client-ui
cloud
cloud
cloud
cloud-only
cloud-only
cloud-only
cloudflare
cloudflare
cloudflare
community
community
community
compatibility
compatibility
compatibility
config-idp
config-idp
config-idp
config-issue
config-issue
config-issue
connection
connection
connection
contribution
contribution
contribution
coturn
coturn
coturn
cross-vpn
cross-vpn
cross-vpn
dashboard
dashboard
dashboard
data-usage
data-usage
data-usage
distribution
distribution
distribution
dns
dns
dns
docker
docker
docker
documentation
documentation
documentation
duplicate
duplicate
duplicate
enhancement
enhancement
event-stream
event-stream
event-stream
feature-request
feature-request
feature-request
freebsd
freebsd
freebsd
getting-started
getting-started
getting-started
go
go
go
good first issue
good first issue
good first issue
gui
gui
gui
help wanted
help wanted
help wanted
home-assistant
home-assistant
home-assistant
idp
idp
idp
inconsistency
inconsistency
inconsistency
integration
integration
integration
integrations
integrations
integrations
ios
ios
ios
ipv6
ipv6
ipv6
jwt
jwt
jwt
k8s
k8s
k8s
keycloak
keycloak
keycloak
linux
linux
linux
login
login
login
macos
macos
macos
management-service
management-service
management-service
Medium
Medium
Medium
missing-docs
missing-docs
missing-docs
mobile
mobile
mobile
moved-internal
moved-internal
moved-internal
needs-review
needs-review
needs-review
netbird-ui
netbird-ui
netbird-ui
networking
networking
networking
new-platform
new-platform
new-platform
nginx
nginx
nginx
notification
notification
notification
okta
okta
okta
openwrt
openwrt
openwrt
P2
P2
P2
packaging
packaging
packaging
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
performance
performance
performance
postgres
postgres
postgres
posture-checks
posture-checks
posture-checks
psk
psk
psk
pull-request
Mirrored from GitHub Pull Request
 question
question
question
refactor
refactor
refactor
relay
relay
relay
release
release
release
rfc
rfc
rfc
routes
routes
routes
security
security
security
security-improvement
security-improvement
security-improvement
security-related
security-related
security-related
self-hosting
self-hosting
self-hosting
server
server
server
signal
signal
signal
sleep-issue
sleep-issue
sleep-issue
ssh
ssh
ssh
ssl
ssl
ssl
status
status
status
store
store
store
synology
synology
synology
system-compatibility-issue
system-compatibility-issue
system-compatibility-issue
test-suite
test-suite
test-suite
third-party-integration
third-party-integration
third-party-integration
triage
triage
triage
triage
triage
triage
triage-needed
triage-needed
triage-needed
troubleshooting
troubleshooting
troubleshooting
UX
UX
UX
waiting-feedback
waiting-feedback
waiting-feedback
windows
windows
windows
wontfix
wontfix
wontfix
zitadel
zitadel
zitadel
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
dynr-servers saavagebueno
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DYNR/netbird#27820
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?