fix(RemoteCmdRunner): fix scp destination string #10585
Merged
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
There was a problem hiding this comment.
Pull Request Overview
This PR updates the scp command in RemoteCmdRunner to enforce usage of the legacy scp protocol by adding the '-O' flag, addressing differences between Ubuntu 24.04 and 22.04.
- Updated scp command to include '-O'.
- Ensures compatibility with both newer openssh versions (using SFTP by default) and older versions (ignoring the flag).
|
Turns out not all flavors of scp ignore unknown option, like the package for Ubuntu for instance |
soyacz
reviewed
Apr 4, 2025
Scp command behaviour has changed on systems that have newer openssh version (v9.0+, like in Ubuntu24) compared to older version (e.g. v8.*, Like in Ubuntu22). Newer openssh versions use SFTP protocol by default. This affected the behavior of RemoteCmdRunner send_files and receive_files API, where we quote path portion of desctination to be sure that we can run the command with multiple remote paths. This change removes single quotes around the destination parameter in scp command. This helps to avoid improper shell expansion of remote path portion of destination. Fixes: scylladb#10584
dimakr
force-pushed
the
fix_scp_command_remote_path
branch
from
9f7f0c7 to
c6926f5
Compare
dimakr
changed the title
soyacz
approved these changes
Apr 8, 2025
There was a problem hiding this comment.
Seems should be fine - we have 2 usages of this and anyway we pass double-quoted path for remote and using quote() for local destination, so looks like we added another single-quotes unnecessarily and it worked only because we never had special chars/space in local dest (which is usually /tmp).
LGTM
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.
Scp command behaviour has changed on systems that have newer openssh version (v9.0+,
like in Ubuntu24) compared to older version (e.g. v8.*, Like in Ubuntu22). Newer openssh
versions use SFTP protocol by default. This affected the behavior of RemoteCmdRunner
send_files and receive_files API, where we quote path portion of desctination to be sure
that we can run the command with multiple remote paths.
This change removes single quotes around the destination parameter in scp command.
This helps to avoid improper shell expansion of remote path portion of destination.
Fixes: #10584
Testing
PR pre-checks (self review)
backportlabelsReminders
sdcm/sct_config.py)unit-test/folder)