b71673109c
This avoids split-on-whitespace errors: - No more `bash -c` needed - No more `shellEscape` needed - `remote-program` ssh store setting also cleanly supports args (e.g. `nix daemon`) - `ssh` uses `--` to separate args for SSH from args for the command to run. and will help with Hydra dedup. Some code taken from #6628. Co-Authored-By: Alexander Bantyev <balsoft@balsoft.ru>
59 lines
1.2 KiB
C++
59 lines
1.2 KiB
C++
#pragma once
|
|
///@file
|
|
|
|
#include "sync.hh"
|
|
#include "processes.hh"
|
|
#include "file-system.hh"
|
|
|
|
namespace nix {
|
|
|
|
class SSHMaster
|
|
{
|
|
private:
|
|
|
|
const std::string host;
|
|
bool fakeSSH;
|
|
const std::string keyFile;
|
|
const std::string sshPublicHostKey;
|
|
const bool useMaster;
|
|
const bool compress;
|
|
const int logFD;
|
|
|
|
struct State
|
|
{
|
|
Pid sshMaster;
|
|
std::unique_ptr<AutoDelete> tmpDir;
|
|
Path socketPath;
|
|
};
|
|
|
|
Sync<State> state_;
|
|
|
|
void addCommonSSHOpts(Strings & args);
|
|
bool isMasterRunning();
|
|
|
|
public:
|
|
|
|
SSHMaster(const std::string & host, const std::string & keyFile, const std::string & sshPublicHostKey, bool useMaster, bool compress, int logFD = -1);
|
|
|
|
struct Connection
|
|
{
|
|
Pid sshPid;
|
|
AutoCloseFD out, in;
|
|
};
|
|
|
|
/**
|
|
* @param command The command (arg vector) to execute.
|
|
*
|
|
* @param extraSShArgs Extra args to pass to SSH (not the command to
|
|
* execute). Will not be used when "fake SSHing" to the local
|
|
* machine.
|
|
*/
|
|
std::unique_ptr<Connection> startCommand(
|
|
Strings && command,
|
|
Strings && extraSshArgs = {});
|
|
|
|
Path startMaster();
|
|
};
|
|
|
|
}
|