wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Improve SSH handling

Browse source 
* Unify SSH code in SSHStore and LegacySSHStore.

* Fix a race starting the SSH master. We now wait synchronously for
  the SSH master to finish starting. This prevents the SSH clients
  from starting their own connections.

* Don't use a master if max-connections == 1.

* Add a "max-connections" store parameter.

* Add a "compress" store parameter.
This commit is contained in:
Eelco Dolstra 2017-03-03 19:05:50 +01:00
parent 7f62be1bcd
commit 577ebeaefb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
7 changed files with 185 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/libstore/ssh-store.cc
View file

@ -4,6 +4,7 @@
#include "archive.hh"
#include "worker-protocol.hh"
#include "pool.hh"
#include "ssh.hh"
namespace nix {
@ -13,9 +14,23 @@ class SSHStore : public RemoteStore
{
public:
SSHStore(string host, const Params & params, size_t maxConnections = std::numeric_limits<size_t>::max());
SSHStore(const std::string & host, const Params & params)
: Store(params)
, RemoteStore(params)
, host(host)
, master(
host,
get(params, "ssh-key", ""),
// Use SSH master only if using more than 1 connection.
connections->capacity() > 1,
get(params, "compress", "") == "true")
{
}
std::string getUri() override;
std::string getUri() override
{
return uriScheme + host;
}
void narFromPath(const Path & path, Sink & sink) override;
@ -25,43 +40,16 @@ private:
struct Connection : RemoteStore::Connection
{
Pid sshPid;
AutoCloseFD out;
AutoCloseFD in;
std::unique_ptr<SSHMaster::Connection> sshConn;
};
ref<RemoteStore::Connection> openConnection() override;
AutoDelete tmpDir;
std::string host;
Path socketPath;
Pid sshMaster;
string host;
Path key;
bool compress;
SSHMaster master;
};
SSHStore::SSHStore(string host, const Params & params, size_t maxConnections)
: Store(params)
, RemoteStore(params, maxConnections)
, tmpDir(createTempDir("", "nix", true, true, 0700))
, socketPath((Path) tmpDir + "/ssh.sock")
, host(std::move(host))
, key(get(params, "ssh-key", ""))
, compress(get(params, "compress", "") == "true")
{
/* open a connection and perform the handshake to verify all is well */
connections->get();
}
string SSHStore::getUri()
{
return uriScheme + host;
}
class ForwardSource : public Source
{
@ -94,35 +82,10 @@ ref<FSAccessor> SSHStore::getFSAccessor()
ref<RemoteStore::Connection> SSHStore::openConnection()
{
if ((pid_t) sshMaster == -1) {
sshMaster = startProcess([&]() {
restoreSignals();
if (key.empty())
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), host.c_str(), NULL);
else
execlp("ssh", "ssh", "-N", "-M", "-S", socketPath.c_str(), "-i", key.c_str(), host.c_str(), NULL);
throw SysError("starting ssh master");
});
}
auto conn = make_ref<Connection>();
Pipe in, out;
in.create();
out.create();
conn->sshPid = startProcess([&]() {
if (dup2(in.readSide.get(), STDIN_FILENO) == -1)
throw SysError("duping over STDIN");
if (dup2(out.writeSide.get(), STDOUT_FILENO) == -1)
throw SysError("duping over STDOUT");
execlp("ssh", "ssh", "-S", socketPath.c_str(), host.c_str(), "nix-daemon", "--stdio", NULL);
throw SysError("executing nix-daemon --stdio over ssh");
});
in.readSide = -1;
out.writeSide = -1;
conn->out = std::move(out.readSide);
conn->in = std::move(in.writeSide);
conn->to = FdSink(conn->in.get());
conn->from = FdSource(conn->out.get());
conn->sshConn = master.startCommand("nix-daemon --stdio");
conn->to = FdSink(conn->sshConn->in.get());
conn->from = FdSource(conn->sshConn->out.get());
initConnection(*conn);
return conn;
}