Skip to content

fix: avoid derp-related panic during wsproxy registration (backport release/2.29)#22342

Merged
f0ssel merged 1 commit intorelease/2.29from
release/2.29-backport-22322
Mar 3, 2026
Merged

fix: avoid derp-related panic during wsproxy registration (backport release/2.29)#22342
f0ssel merged 1 commit intorelease/2.29from
release/2.29-backport-22322

Conversation

@rowansmithau
Copy link
Contributor

@rowansmithau rowansmithau commented Feb 26, 2026

Backport of #22322.

If the primary had DERP disabled, workspace proxy registrations would
fail with a panic, as the registration endpoint would attempt to access
the mesh key from the nil DerpServer.

Changes the endpoint to query the database for the key.
@rowansmithau rowansmithau added the cherry-pick/v2.29 Needs to be cherry-picked to the 2.29 release branch label Feb 26, 2026
Copy link
Member

@deansheather deansheather left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Checks are ❌ because of E2E test rot, the code in question doesn't have any bearing on the dashboard.

@f0ssel f0ssel merged commit 50c4832 into release/2.29 Mar 3, 2026
128 of 144 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Mar 3, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cherry-pick/v2.29 Needs to be cherry-picked to the 2.29 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants