ssh: fix handle id generation #10003
Merged
+45
−30
Conversation
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
Contributor
u3s
commented
Jun 30, 2025
- generate unique file handles
CT Test Results 2 files 29 suites 18m 47s ⏱️ Results for commit 981a866. ♻️ This comment has been updated with latest results. To speed up review, make sure that you have read Contributing to Erlang/OTP and that all checks pass. See the TESTING and DEVELOPMENT HowTo guides for details about how to run test locally. Artifacts
// Erlang/OTP Github Action Bot |
u3s
commented
Jul 2, 2025
IngelaAndin
previously approved these changes
Jul 2, 2025
34b4aac to
ba19a35
Compare
ba19a35 to
6458011
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR enhances the SFTP server’s handle ID generation to ensure unique IDs and reuse freed gaps, and updates the test suite to verify this behavior.
- Introduce
new_handle_idandfind_gapto replace the old recursivenew_handle, finding the lowest unused handle ID and reusing gaps. - Update
ssh_sftpd_SUITE.erlto generate multiple file handles, assert uniqueness, and test gap reuse. - Add
binary_to_integer/1for parsing handles and includeassert.hrl.
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| lib/ssh/src/ssh_sftpd.erl | Replaced new_handle/2 with new_handle_id + find_gap, and updated handle parsing to binary_to_integer/1. |
| lib/ssh/test/ssh_sftpd_SUITE.erl | Added test logic to write multiple files, collect handles, assert uniqueness, reuse gaps, and included assert.hrl. |
| lib/ssh/test/ssh_sftpd_SUITE_data/* | Added ED25519 public/private key test fixtures. |
Comments suppressed due to low confidence (3)
lib/ssh/test/ssh_sftpd_SUITE.erl:734
- Consider adding a test case for the initial empty handle list (no existing handles) to verify that the first generated handle ID is
0.
%% repeat procedure to make sure uniq file handles are generated
lib/ssh/test/ssh_sftpd_SUITE.erl:63
- The
assert.hrlinclude appears unused since?assertEqualcomes fromct.hrl. Consider removing this include to reduce unnecessary dependencies.
-include_lib("stdlib/include/assert.hrl").
lib/ssh/src/ssh_sftpd.erl:451
binary_to_integer/1was introduced in OTP 25. If this library needs to support older OTP releases, consider adding a fallback (e.g.,list_to_integer(binary_to_list(BinHandle))).
case (catch binary_to_integer(BinHandle)) of
6458011 to
563241b
Compare
563241b to
981a866
Compare
IngelaAndin
approved these changes
Jul 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.