mirror of
https://github.com/NixOS/nix.git
synced 2025-11-22 10:19:36 +01:00
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
(cherry picked from commit cc24766fa6)
221 lines
6.4 KiB
C++
221 lines
6.4 KiB
C++
#include "nix/store/ssh-store.hh"
|
|
#include "nix/store/local-fs-store.hh"
|
|
#include "nix/store/remote-store-connection.hh"
|
|
#include "nix/util/source-accessor.hh"
|
|
#include "nix/util/archive.hh"
|
|
#include "nix/store/worker-protocol.hh"
|
|
#include "nix/store/worker-protocol-impl.hh"
|
|
#include "nix/util/pool.hh"
|
|
#include "nix/store/ssh.hh"
|
|
|
|
namespace nix {
|
|
|
|
SSHStoreConfig::SSHStoreConfig(
|
|
std::string_view scheme,
|
|
std::string_view authority,
|
|
const Params & params)
|
|
: StoreConfig(params)
|
|
, RemoteStoreConfig(params)
|
|
, CommonSSHStoreConfig(scheme, authority, params)
|
|
{
|
|
}
|
|
|
|
std::string SSHStoreConfig::doc()
|
|
{
|
|
return
|
|
#include "ssh-store.md"
|
|
;
|
|
}
|
|
|
|
class SSHStore : public virtual SSHStoreConfig, public virtual RemoteStore
|
|
{
|
|
public:
|
|
|
|
SSHStore(
|
|
std::string_view scheme,
|
|
std::string_view host,
|
|
const Params & params)
|
|
: StoreConfig(params)
|
|
, RemoteStoreConfig(params)
|
|
, CommonSSHStoreConfig(scheme, host, params)
|
|
, SSHStoreConfig(scheme, host, params)
|
|
, Store(params)
|
|
, RemoteStore(params)
|
|
, master(createSSHMaster(
|
|
// Use SSH master only if using more than 1 connection.
|
|
connections->capacity() > 1))
|
|
{
|
|
}
|
|
|
|
std::string getUri() override
|
|
{
|
|
return *uriSchemes().begin() + "://" + host;
|
|
}
|
|
|
|
// FIXME extend daemon protocol, move implementation to RemoteStore
|
|
std::optional<std::string> getBuildLogExact(const StorePath & path) override
|
|
{ unsupported("getBuildLogExact"); }
|
|
|
|
protected:
|
|
|
|
struct Connection : RemoteStore::Connection
|
|
{
|
|
std::unique_ptr<SSHMaster::Connection> sshConn;
|
|
|
|
void closeWrite() override
|
|
{
|
|
sshConn->in.close();
|
|
}
|
|
};
|
|
|
|
ref<RemoteStore::Connection> openConnection() override;
|
|
|
|
std::string host;
|
|
|
|
std::vector<std::string> extraRemoteProgramArgs;
|
|
|
|
SSHMaster master;
|
|
|
|
void setOptions(RemoteStore::Connection & conn) override
|
|
{
|
|
/* TODO Add a way to explicitly ask for some options to be
|
|
forwarded. One option: A way to query the daemon for its
|
|
settings, and then a series of params to SSHStore like
|
|
forward-cores or forward-overridden-cores that only
|
|
override the requested settings.
|
|
*/
|
|
};
|
|
};
|
|
|
|
|
|
MountedSSHStoreConfig::MountedSSHStoreConfig(StringMap params)
|
|
: StoreConfig(params)
|
|
, RemoteStoreConfig(params)
|
|
, CommonSSHStoreConfig(params)
|
|
, SSHStoreConfig(params)
|
|
, LocalFSStoreConfig(params)
|
|
{
|
|
}
|
|
|
|
MountedSSHStoreConfig::MountedSSHStoreConfig(std::string_view scheme, std::string_view host, StringMap params)
|
|
: StoreConfig(params)
|
|
, RemoteStoreConfig(params)
|
|
, CommonSSHStoreConfig(scheme, host, params)
|
|
, SSHStoreConfig(params)
|
|
, LocalFSStoreConfig(params)
|
|
{
|
|
}
|
|
|
|
std::string MountedSSHStoreConfig::doc()
|
|
{
|
|
return
|
|
#include "mounted-ssh-store.md"
|
|
;
|
|
}
|
|
|
|
|
|
/**
|
|
* The mounted ssh store assumes that filesystems on the remote host are
|
|
* shared with the local host. This means that the remote nix store is
|
|
* available locally and is therefore treated as a local filesystem
|
|
* store.
|
|
*
|
|
* MountedSSHStore is very similar to UDSRemoteStore --- ignoring the
|
|
* superficial differnce of SSH vs Unix domain sockets, they both are
|
|
* accessing remote stores, and they both assume the store will be
|
|
* mounted in the local filesystem.
|
|
*
|
|
* The difference lies in how they manage GC roots. See addPermRoot
|
|
* below for details.
|
|
*/
|
|
class MountedSSHStore : public virtual MountedSSHStoreConfig, public virtual SSHStore, public virtual LocalFSStore
|
|
{
|
|
public:
|
|
|
|
MountedSSHStore(
|
|
std::string_view scheme,
|
|
std::string_view host,
|
|
const Params & params)
|
|
: StoreConfig(params)
|
|
, RemoteStoreConfig(params)
|
|
, CommonSSHStoreConfig(scheme, host, params)
|
|
, SSHStoreConfig(params)
|
|
, LocalFSStoreConfig(params)
|
|
, MountedSSHStoreConfig(params)
|
|
, Store(params)
|
|
, RemoteStore(params)
|
|
, SSHStore(scheme, host, params)
|
|
, LocalFSStore(params)
|
|
{
|
|
extraRemoteProgramArgs = {
|
|
"--process-ops",
|
|
};
|
|
}
|
|
|
|
std::string getUri() override
|
|
{
|
|
return *uriSchemes().begin() + "://" + host;
|
|
}
|
|
|
|
void narFromPath(const StorePath & path, Sink & sink) override
|
|
{
|
|
return LocalFSStore::narFromPath(path, sink);
|
|
}
|
|
|
|
ref<SourceAccessor> getFSAccessor(bool requireValidPath) override
|
|
{
|
|
return LocalFSStore::getFSAccessor(requireValidPath);
|
|
}
|
|
|
|
std::optional<std::string> getBuildLogExact(const StorePath & path) override
|
|
{
|
|
return LocalFSStore::getBuildLogExact(path);
|
|
}
|
|
|
|
/**
|
|
* This is the key difference from UDSRemoteStore: UDSRemote store
|
|
* has the client create the direct root, and the remote side create
|
|
* the indirect root.
|
|
*
|
|
* We could also do that, but the race conditions (will the remote
|
|
* side see the direct root the client made?) seems bigger.
|
|
*
|
|
* In addition, the remote-side will have a process associated with
|
|
* the authenticating user handling the connection (even if there
|
|
* is a system-wide daemon or similar). This process can safely make
|
|
* the direct and indirect roots without there being such a risk of
|
|
* privilege escalation / symlinks in directories owned by the
|
|
* originating requester that they cannot delete.
|
|
*/
|
|
Path addPermRoot(const StorePath & path, const Path & gcRoot) override
|
|
{
|
|
auto conn(getConnection());
|
|
conn->to << WorkerProto::Op::AddPermRoot;
|
|
WorkerProto::write(*this, *conn, path);
|
|
WorkerProto::write(*this, *conn, gcRoot);
|
|
conn.processStderr();
|
|
return readString(conn->from);
|
|
}
|
|
};
|
|
|
|
ref<RemoteStore::Connection> SSHStore::openConnection()
|
|
{
|
|
auto conn = make_ref<Connection>();
|
|
Strings command = remoteProgram.get();
|
|
command.push_back("--stdio");
|
|
if (remoteStore.get() != "") {
|
|
command.push_back("--store");
|
|
command.push_back(remoteStore.get());
|
|
}
|
|
command.insert(command.end(),
|
|
extraRemoteProgramArgs.begin(), extraRemoteProgramArgs.end());
|
|
conn->sshConn = master.startCommand(std::move(command));
|
|
conn->to = FdSink(conn->sshConn->in.get());
|
|
conn->from = FdSource(conn->sshConn->out.get());
|
|
return conn;
|
|
}
|
|
|
|
static RegisterStoreImplementation<SSHStore, SSHStoreConfig> regSSHStore;
|
|
static RegisterStoreImplementation<MountedSSHStore, MountedSSHStoreConfig> regMountedSSHStore;
|
|
|
|
}
|