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

[cdc_rsync] [cdc_stream] Switch from scp to sftp (#66)

Browse Source 
Use sftp for deploying remote components instead of scp. sftp has the
advantage that it can also create directries, chmod files etc., so
that we can do everything in one call of sftp instead of mixing scp
and ssh calls.

The downside of sftp is that it can't switch to ~ resp. %userprofile%
for the remote side, and we have to assume that sftp starts in the
user's home dir. This is the default and works on my machines!

cdc_rsync and cdc_stream check the CDC_SFTP_COMMAND env var now and
accept --sftp-command flags. If they are not set, the corresponding
scp flag and env var is still used, with scp replaced by sftp. This is
most likely correct as sftp and scp usually reside in the same
directory and share largely identical parameters.
This commit is contained in:
Lutz Justen
2023-01-18 17:49:52 +01:00
committed by GitHub
parent a8b948b323
commit efca9855e7
19 changed files with 253 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cdc_rsync/server_arch.h
View File

@@ -29,8 +29,6 @@ class ServerArch {
kWindows = 1,
};
enum class UseCase { kSsh = 0, kScp = 1 };
// Detects the architecture type based on the destination path, e.g. path
// starting with C: indicate Windows.
static Type Detect(const std::string& destination);
@@ -42,16 +40,10 @@ class ServerArch {
std::string CdcServerFilename() const;
// Returns the arch-specific directory where cdc_rsync_server is deployed.
// On Windows, |use_case| determines what type of env variables to use:
// - kSsh uses $env:appdata and works for ssh commands.
// - kScp uses AppData\\Roaming and works for scp commands.
// On Linux, this flag is ignored.
std::string RemoteToolsBinDir(UseCase use_case) const;
std::string RemoteToolsBinDir() const;
// Returns an arch-specific SSH shell command that gets invoked in order to
// start cdc_rsync_server. The command
// - creates RemoteToolsBinDir() if it does not exist (so that the server can
// be deployed there subsequently; scp can't create directories),
// - returns |exit_code_not_found| if cdc_rsync_server does not exist (to
// prevent the confusing bash output message
// "bash: .../cdc_rsync_server: No such file or directory"), and
@@ -59,13 +51,15 @@ class ServerArch {
std::string GetStartServerCommand(int exit_code_not_found,
const std::string& args) const;
// Returns an arch-specific SSH shell command that gets invoked after
// cdc_rsync_server has been copied to a temp location. The command
// - makes the old cdc_rsync_server writable (if it exists),
// - makes the new cdc_rsync_server executable (Linux only) and
// - replaces the old cdc_rsync_server by the new one.
std::string GetDeployReplaceCommand(const std::string& old_server_path,
const std::string& new_server_path) const;
// Returns an arch-specific SFTP command sequence that deploys the server
// component on the target gets invoked after
// cdc_rsync_server has been copied to a temp location. The commands
// - create the cdc-file-transfer/bin folder if it doesn't exist yet,
// - make the old cdc_rsync_server writable if it exists,
// - copy cdc_rsync_server to a temp location,
// - make the new cdc_rsync_server executable (Linux only) and
// - replaces the existing cdc_rsync_server by the temp one.
std::string GetDeploySftpCommands() const;
private:
Type type_;