fix(server): eliminate nested mutex acquisition in SSH tunnel handler#650
Closed
persimmon16 wants to merge 1 commit intoNVIDIA:mainfrom
Closed
fix(server): eliminate nested mutex acquisition in SSH tunnel handler#650persimmon16 wants to merge 1 commit intoNVIDIA:mainfrom
persimmon16 wants to merge 1 commit intoNVIDIA:mainfrom
Conversation
Restructure the per-sandbox connection limit check to release ssh_connections_by_sandbox before acquiring ssh_connections_by_token for the rollback. The previous code held both mutexes simultaneously, creating a potential deadlock if any other code path acquired them in the opposite order.
|
Thank you for your submission! We ask that you sign our Developer Certificate of Origin before we can accept your contribution. You can sign the DCO by adding a comment below using this text: I have read the DCO document and I hereby sign the DCO. You can retrigger this bot by commenting recheck in this Pull Request. Posted by the DCO Assistant Lite bot. |
|
Thank you for your interest in contributing to OpenShell, @persimmon16. This project uses a vouch system for first-time contributors. Before submitting a pull request, you need to be vouched by a maintainer. To get vouched:
See CONTRIBUTING.md for details. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ssh_connections_by_sandboxbefore acquiringssh_connections_by_tokenfor rollbackRelated Issue
Production readiness audit finding (P3): SSH connection dual-Mutex lock ordering could cause deadlocks.
Changes
crates/openshell-server/src/ssh_tunnel.rs: Split the per-sandbox limit check into two phases — check-and-release, then rollback separatelyTesting
cargo check -p openshell-serverpassescargo clippyclean (only pre-existing warnings)decrement_connection_counthelper — already acquires each mutex independentlyChecklist