github-mirrors/netris-cdc-file-transfer
1
0
Fork 0
mirror of https://github.com/nestriness/cdc-file-transfer.git synced 2026-01-30 10:35:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not quote ssh/scp commands (#35)

Browse Source 
This prevents adding args to the commands, e.g.
set CDC_SCP_COMMAND=C:\path\to\scp.exe -i id_rsa.
This commit is contained in:
Lutz Justen
2022-12-05 10:46:18 +01:00
committed by GitHub
parent 1b8ad0e097
commit 6c48f939fc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/remote_util.cc
View File

@@ -81,8 +81,8 @@ absl::Status RemoteUtil::Scp(std::vector<std::string> source_filepaths,
"%s %s -p -T " "%s %s -p -T "
"-P %i %s " "-P %i %s "
"%s:%s", "%s:%s",
QuoteForWindows(scp_command_), quiet_ || verbosity_ < 2 ? "-q" : "", scp_command_, quiet_ || verbosity_ < 2 ? "-q" : "", compress ? "-C" : "",
compress ? "-C" : "", ssh_port_, source_args, QuoteForWindows(user_host_), ssh_port_, source_args, QuoteForWindows(user_host_),
QuoteForWindows(dest)); QuoteForWindows(dest));
start_info.name = "scp"; start_info.name = "scp";
start_info.forward_output_to_log = forward_output_to_log_; start_info.forward_output_to_log = forward_output_to_log_;
@@ -145,8 +145,8 @@ ProcessStartInfo RemoteUtil::BuildProcessStartInfoForSshInternal(
"-oServerAliveCountMax=6 " // Number of lost msgs before ssh terminates "-oServerAliveCountMax=6 " // Number of lost msgs before ssh terminates
"-oServerAliveInterval=5 " // Time interval between alive msgs "-oServerAliveInterval=5 " // Time interval between alive msgs
"%s %s -p %i %s", "%s %s -p %i %s",
QuoteForWindows(ssh_command_), quiet_ || verbosity_ < 2 ? "-q" : "", ssh_command_, quiet_ || verbosity_ < 2 ? "-q" : "", forward_arg,
forward_arg, QuoteForWindows(user_host_), ssh_port_, remote_command_arg); QuoteForWindows(user_host_), ssh_port_, remote_command_arg);
start_info.forward_output_to_log = forward_output_to_log_; start_info.forward_output_to_log = forward_output_to_log_;
start_info.flags = ProcessFlags::kNoWindow; start_info.flags = ProcessFlags::kNoWindow;
return start_info; return start_info;