Skip to content

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

Merged
rowansmithau merged 2 commits intorelease/2.31from
dean/wsproxy-derp-mesh-key-fix
Mar 3, 2026
Merged

fix: avoid derp-related panic during wsproxy registration (backport release/2.31)#22526
rowansmithau merged 2 commits intorelease/2.31from
dean/wsproxy-derp-mesh-key-fix

Conversation

@rowansmithau
Copy link
Contributor

@rowansmithau rowansmithau commented Mar 2, 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.31 Needs to be cherry-picked to the 2.31 release branch label Mar 2, 2026
@rowansmithau rowansmithau enabled auto-merge (squash) March 2, 2026 23:23
@matifali matifali requested review from f0ssel and matifali March 3, 2026 00:13
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

@rowansmithau rowansmithau merged commit 107fd97 into release/2.31 Mar 3, 2026
25 checks passed
@rowansmithau rowansmithau deleted the dean/wsproxy-derp-mesh-key-fix branch March 3, 2026 08:46
@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.31 Needs to be cherry-picked to the 2.31 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants