[PR #6726] [CLOSED] [client,management] sync 0.74.4 changes #28841

Closed
opened 2026-08-05 08:07:01 -04:00 by saavagebueno · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netbirdio/netbird/pull/6726
Author: @mlsmaycon
Created: 7/11/2026
Status: Closed

Base: mainHead: 0.74.4-branch


📝 Commits (5)

  • 816d806 [client] Update gopsutil to v4 (#6688)
  • 7cd5c17 [client] Fix hanging status command during relay dial (#6694)
  • 08e46aa [management] fix: prevent reverse proxy domain from being pushed as DNS search domain (#6498)
  • 4d4cc55 [client] Recover from rosenpass key desync (#6714)
  • 3d87547 [client] Bump golang.org/x/crypto to v0.54.0 and Go toolchain to 1.25.12 (#6709)

📊 Changes

20 files changed (+845 additions, -113 deletions)

View changed files

📝 client/internal/engine.go (+1 -1)
📝 client/internal/peer/conn.go (+41 -1)
📝 client/internal/peer/conn_test.go (+82 -0)
📝 client/internal/peer/wg_watcher.go (+10 -4)
📝 client/internal/peer/wg_watcher_test.go (+69 -3)
📝 client/internal/rosenpass/manager.go (+7 -4)
📝 client/internal/rosenpass/manager_test.go (+13 -13)
📝 client/internal/rosenpass/netbird_handler.go (+126 -36)
client/internal/rosenpass/netbird_handler_test.go (+250 -0)
📝 client/internal/rosenpass/seed.go (+17 -0)
📝 client/system/process.go (+1 -1)
📝 client/system/process_test.go (+1 -1)
📝 go.mod (+10 -10)
📝 go.sum (+16 -16)
📝 management/internals/server/server.go (+2 -1)
📝 management/server/types/account.go (+2 -1)
📝 shared/relay/client/manager.go (+44 -20)
shared/relay/client/manager_cleanup_test.go (+60 -0)
shared/relay/client/manager_relaystates_test.go (+91 -0)
📝 signal/cmd/run.go (+2 -1)

📄 Description

Describe your changes

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

  • Bug Fixes

    • Improved secure connection recovery after repeated WireGuard handshake timeouts.
    • Added more reliable key rotation and fallback behavior when handshakes expire.
    • Prevented relay status and cleanup operations from blocking during in-progress connections.
    • Private service DNS zones no longer disable search-domain behavior unexpectedly.
  • Improvements

    • Preserved peer recovery state across reconnections.
    • Updated process monitoring compatibility and refreshed platform support components.

🔄 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/6726 **Author:** [@mlsmaycon](https://github.com/mlsmaycon) **Created:** 7/11/2026 **Status:** ❌ Closed **Base:** `main` ← **Head:** `0.74.4-branch` --- ### 📝 Commits (5) - [`816d806`](https://github.com/netbirdio/netbird/commit/816d80602ffc024afb670dfe18766092701d2639) [client] Update gopsutil to v4 (#6688) - [`7cd5c17`](https://github.com/netbirdio/netbird/commit/7cd5c1732bb5374f21005073937c42f4d531e3c5) [client] Fix hanging status command during relay dial (#6694) - [`08e46aa`](https://github.com/netbirdio/netbird/commit/08e46aa62f3da6a4516dac68287084b736790214) [management] fix: prevent reverse proxy domain from being pushed as DNS search domain (#6498) - [`4d4cc55`](https://github.com/netbirdio/netbird/commit/4d4cc551fdd0b8824ae4caf44af6586d43c044df) [client] Recover from rosenpass key desync (#6714) - [`3d87547`](https://github.com/netbirdio/netbird/commit/3d87547d952f5ada9df987bbe4f0f6d54372d77c) [client] Bump golang.org/x/crypto to v0.54.0 and Go toolchain to 1.25.12 (#6709) ### 📊 Changes **20 files changed** (+845 additions, -113 deletions) <details> <summary>View changed files</summary> 📝 `client/internal/engine.go` (+1 -1) 📝 `client/internal/peer/conn.go` (+41 -1) 📝 `client/internal/peer/conn_test.go` (+82 -0) 📝 `client/internal/peer/wg_watcher.go` (+10 -4) 📝 `client/internal/peer/wg_watcher_test.go` (+69 -3) 📝 `client/internal/rosenpass/manager.go` (+7 -4) 📝 `client/internal/rosenpass/manager_test.go` (+13 -13) 📝 `client/internal/rosenpass/netbird_handler.go` (+126 -36) ➕ `client/internal/rosenpass/netbird_handler_test.go` (+250 -0) 📝 `client/internal/rosenpass/seed.go` (+17 -0) 📝 `client/system/process.go` (+1 -1) 📝 `client/system/process_test.go` (+1 -1) 📝 `go.mod` (+10 -10) 📝 `go.sum` (+16 -16) 📝 `management/internals/server/server.go` (+2 -1) 📝 `management/server/types/account.go` (+2 -1) 📝 `shared/relay/client/manager.go` (+44 -20) ➕ `shared/relay/client/manager_cleanup_test.go` (+60 -0) ➕ `shared/relay/client/manager_relaystates_test.go` (+91 -0) 📝 `signal/cmd/run.go` (+2 -1) </details> ### 📄 Description ## Describe your changes - \[management] fix: prevent reverse proxy domain from being pushed as DNS search domain by @blaugrau90 in <https://github.com/netbirdio/netbird/pull/6498> - \[client] Recover from rosenpass key desync by @lixmal in <https://github.com/netbirdio/netbird/pull/6714> - \[client] Bump golang.org/x/crypto to v0.54.0 by @lixmal in <https://github.com/netbirdio/netbird/pull/6709> - \[client] fix MDM managementURL conflict on default-port URL echo by @riccardomanfrin in <https://github.com/netbirdio/netbird/pull/6672> - \[client] Update gopsutil to v4 by @mlsmaycon in <https://github.com/netbirdio/netbird/pull/6688> - \[client] Fix hanging status command during relay dial by @theodorsm in <https://github.com/netbirdio/netbird/pull/6694> ## Issue ticket number and link ## Stack - \#6726 :point\_left: <!-- branch-stack --> - \#6805 ### Checklist - [x] 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 - **Bug Fixes** - Improved secure connection recovery after repeated WireGuard handshake timeouts. - Added more reliable key rotation and fallback behavior when handshakes expire. - Prevented relay status and cleanup operations from blocking during in-progress connections. - Private service DNS zones no longer disable search-domain behavior unexpectedly. - **Improvements** - Preserved peer recovery state across reconnections. - Updated process monitoring compatibility and refreshed platform support components. <!-- 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 08:07:01 -04:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DYNR/netbird#28841