mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-13 09:46:16 +02:00
bbe97dff8b
Most functions now take a StorePath argument rather than a Path (which is just an alias for std::string). The StorePath constructor ensures that the path is syntactically correct (i.e. it looks like <store-dir>/<base32-hash>-<name>). Similarly, functions like buildPaths() now take a StorePathWithOutputs, rather than abusing Path by adding a '!<outputs>' suffix. Note that the StorePath type is implemented in Rust. This involves some hackery to allow Rust values to be used directly in C++, via a helper type whose destructor calls the Rust type's drop() function. The main issue is the dynamic nature of C++ move semantics: after we have moved a Rust value, we should not call the drop function on the original value. So when we move a value, we set the original value to bitwise zero, and the destructor only calls drop() if the value is not bitwise zero. This should be sufficient for most types. Also lots of minor cleanups to the C++ API to make it more modern (e.g. using std::optional and std::string_view in some places).
141 lines
3.8 KiB
C++
141 lines
3.8 KiB
C++
#include "command.hh"
|
|
#include "shared.hh"
|
|
#include "store-api.hh"
|
|
#include "thread-pool.hh"
|
|
|
|
#include <atomic>
|
|
|
|
using namespace nix;
|
|
|
|
struct CmdCopySigs : StorePathsCommand
|
|
{
|
|
Strings substituterUris;
|
|
|
|
CmdCopySigs()
|
|
{
|
|
mkFlag()
|
|
.longName("substituter")
|
|
.shortName('s')
|
|
.labels({"store-uri"})
|
|
.description("use signatures from specified store")
|
|
.arity(1)
|
|
.handler([&](std::vector<std::string> ss) { substituterUris.push_back(ss[0]); });
|
|
}
|
|
|
|
std::string description() override
|
|
{
|
|
return "copy path signatures from substituters (like binary caches)";
|
|
}
|
|
|
|
void run(ref<Store> store, StorePaths storePaths) override
|
|
{
|
|
if (substituterUris.empty())
|
|
throw UsageError("you must specify at least one substituter using '-s'");
|
|
|
|
// FIXME: factor out commonality with MixVerify.
|
|
std::vector<ref<Store>> substituters;
|
|
for (auto & s : substituterUris)
|
|
substituters.push_back(openStore(s));
|
|
|
|
ThreadPool pool;
|
|
|
|
std::string doneLabel = "done";
|
|
std::atomic<size_t> added{0};
|
|
|
|
//logger->setExpected(doneLabel, storePaths.size());
|
|
|
|
auto doPath = [&](const Path & storePathS) {
|
|
//Activity act(*logger, lvlInfo, format("getting signatures for '%s'") % storePath);
|
|
|
|
checkInterrupt();
|
|
|
|
auto storePath = store->parseStorePath(storePathS);
|
|
|
|
auto info = store->queryPathInfo(storePath);
|
|
|
|
StringSet newSigs;
|
|
|
|
for (auto & store2 : substituters) {
|
|
try {
|
|
auto info2 = store2->queryPathInfo(info->path);
|
|
|
|
/* Don't import signatures that don't match this
|
|
binary. */
|
|
if (info->narHash != info2->narHash ||
|
|
info->narSize != info2->narSize ||
|
|
info->references != info2->references)
|
|
continue;
|
|
|
|
for (auto & sig : info2->sigs)
|
|
if (!info->sigs.count(sig))
|
|
newSigs.insert(sig);
|
|
} catch (InvalidPath &) {
|
|
}
|
|
}
|
|
|
|
if (!newSigs.empty()) {
|
|
store->addSignatures(storePath, newSigs);
|
|
added += newSigs.size();
|
|
}
|
|
|
|
//logger->incProgress(doneLabel);
|
|
};
|
|
|
|
for (auto & storePath : storePaths)
|
|
pool.enqueue(std::bind(doPath, store->printStorePath(storePath)));
|
|
|
|
pool.process();
|
|
|
|
printInfo("imported %d signatures", added);
|
|
}
|
|
};
|
|
|
|
static auto r1 = registerCommand<CmdCopySigs>("copy-sigs");
|
|
|
|
struct CmdSignPaths : StorePathsCommand
|
|
{
|
|
Path secretKeyFile;
|
|
|
|
CmdSignPaths()
|
|
{
|
|
mkFlag()
|
|
.shortName('k')
|
|
.longName("key-file")
|
|
.label("file")
|
|
.description("file containing the secret signing key")
|
|
.dest(&secretKeyFile);
|
|
}
|
|
|
|
std::string description() override
|
|
{
|
|
return "sign the specified paths";
|
|
}
|
|
|
|
void run(ref<Store> store, StorePaths storePaths) override
|
|
{
|
|
if (secretKeyFile.empty())
|
|
throw UsageError("you must specify a secret key file using '-k'");
|
|
|
|
SecretKey secretKey(readFile(secretKeyFile));
|
|
|
|
size_t added{0};
|
|
|
|
for (auto & storePath : storePaths) {
|
|
auto info = store->queryPathInfo(storePath);
|
|
|
|
auto info2(*info);
|
|
info2.sigs.clear();
|
|
info2.sign(*store, secretKey);
|
|
assert(!info2.sigs.empty());
|
|
|
|
if (!info->sigs.count(*info2.sigs.begin())) {
|
|
store->addSignatures(storePath, info2.sigs);
|
|
added++;
|
|
}
|
|
}
|
|
|
|
printInfo("added %d signatures", added);
|
|
}
|
|
};
|
|
|
|
static auto r2 = registerCommand<CmdSignPaths>("sign-paths");
|