forked from lix-project/lix
Fix tests on systems with a non-master git defaultBranch #1
|
@ -1215,7 +1215,7 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source,
|
||||||
bool narRead = false;
|
bool narRead = false;
|
||||||
Finally cleanup = [&]() {
|
Finally cleanup = [&]() {
|
||||||
if (!narRead) {
|
if (!narRead) {
|
||||||
ParseSink sink;
|
NARParseVisitor sink;
|
||||||
try {
|
try {
|
||||||
parseDump(sink, source);
|
parseDump(sink, source);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
#include "archive.hh"
|
#include "archive.hh"
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
#include <stack>
|
#include <stack>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
@ -33,7 +34,7 @@ struct NarAccessor : public FSAccessor
|
||||||
|
|
||||||
NarMember root;
|
NarMember root;
|
||||||
|
|
||||||
struct NarIndexer : ParseSink, Source
|
struct NarIndexer : NARParseVisitor, Source
|
||||||
{
|
{
|
||||||
NarAccessor & acc;
|
NarAccessor & acc;
|
||||||
Source & source;
|
Source & source;
|
||||||
|
|
|
@ -379,6 +379,37 @@ void Store::addMultipleToStore(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
/**
|
||||||
|
* If the NAR archive contains a single file at top-level, then save
|
||||||
|
* the contents of the file to `s`. Otherwise assert.
|
||||||
|
*/
|
||||||
|
struct RetrieveRegularNARVisitor : NARParseVisitor
|
||||||
|
{
|
||||||
|
Sink & sink;
|
||||||
|
|
||||||
|
RetrieveRegularNARVisitor(Sink & sink) : sink(sink) { }
|
||||||
|
|
||||||
|
void createRegularFile(const Path & path) override
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void receiveContents(std::string_view data) override
|
||||||
|
{
|
||||||
|
sink(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
void createDirectory(const Path & path) override
|
||||||
|
{
|
||||||
|
assert(false && "RetrieveRegularNARVisitor::createDirectory must not be called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void createSymlink(const Path & path, const std::string & target) override
|
||||||
|
{
|
||||||
|
assert(false && "RetrieveRegularNARVisitor::createSymlink must not be called");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
The aim of this function is to compute in one pass the correct ValidPathInfo for
|
The aim of this function is to compute in one pass the correct ValidPathInfo for
|
||||||
|
@ -413,7 +444,7 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
|
||||||
/* Note that fileSink and unusualHashTee must be mutually exclusive, since
|
/* Note that fileSink and unusualHashTee must be mutually exclusive, since
|
||||||
they both write to caHashSink. Note that that requisite is currently true
|
they both write to caHashSink. Note that that requisite is currently true
|
||||||
because the former is only used in the flat case. */
|
because the former is only used in the flat case. */
|
||||||
RetrieveRegularNARSink fileSink { caHashSink };
|
RetrieveRegularNARVisitor fileSink { caHashSink };
|
||||||
TeeSink unusualHashTee { narHashSink, caHashSink };
|
TeeSink unusualHashTee { narHashSink, caHashSink };
|
||||||
|
|
||||||
auto & narSink = method == FileIngestionMethod::Recursive && hashAlgo != HashType::SHA256
|
auto & narSink = method == FileIngestionMethod::Recursive && hashAlgo != HashType::SHA256
|
||||||
|
@ -429,7 +460,7 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
|
||||||
information to narSink. */
|
information to narSink. */
|
||||||
TeeSource tapped { fileSource, narSink };
|
TeeSource tapped { fileSource, narSink };
|
||||||
|
|
||||||
ParseSink blank;
|
NARParseVisitor blank;
|
||||||
auto & parseSink = method == FileIngestionMethod::Flat
|
auto & parseSink = method == FileIngestionMethod::Flat
|
||||||
? fileSink
|
? fileSink
|
||||||
: blank;
|
: blank;
|
||||||
|
|
|
@ -334,7 +334,7 @@ Generator<Entry> parse(Source & source)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static WireFormatGenerator restore(ParseSink & sink, Generator<nar::Entry> nar)
|
static WireFormatGenerator restore(NARParseVisitor & sink, Generator<nar::Entry> nar)
|
||||||
{
|
{
|
||||||
while (auto entry = nar.next()) {
|
while (auto entry = nar.next()) {
|
||||||
co_yield std::visit(
|
co_yield std::visit(
|
||||||
|
@ -377,12 +377,12 @@ static WireFormatGenerator restore(ParseSink & sink, Generator<nar::Entry> nar)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
WireFormatGenerator parseAndCopyDump(ParseSink & sink, Source & source)
|
WireFormatGenerator parseAndCopyDump(NARParseVisitor & sink, Source & source)
|
||||||
{
|
{
|
||||||
return restore(sink, nar::parse(source));
|
return restore(sink, nar::parse(source));
|
||||||
}
|
}
|
||||||
|
|
||||||
void parseDump(ParseSink & sink, Source & source)
|
void parseDump(NARParseVisitor & sink, Source & source)
|
||||||
{
|
{
|
||||||
auto parser = parseAndCopyDump(sink, source);
|
auto parser = parseAndCopyDump(sink, source);
|
||||||
while (parser.next()) {
|
while (parser.next()) {
|
||||||
|
@ -390,7 +390,36 @@ void parseDump(ParseSink & sink, Source & source)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct RestoreSink : ParseSink
|
/*
|
||||||
|
* Note [NAR restoration security]:
|
||||||
|
* It's *critical* that NAR restoration will never overwrite anything even if
|
||||||
|
* duplicate filenames are passed in. It is inevitable that not all NARs are
|
||||||
|
* fit to actually successfully restore to the target filesystem; errors may
|
||||||
|
* occur due to collisions, and this *must* cause the NAR to be rejected.
|
||||||
|
*
|
||||||
|
* Although the filenames are blocked from being *the same bytes* by a higher
|
||||||
|
* layer, filesystems have other ideas on every platform:
|
||||||
|
* - The store may be on a case-insensitive filesystem like APFS, ext4 with
|
||||||
|
* casefold directories, zfs with casesensitivity=insensitive
|
||||||
|
* - The store may be on a Unicode normalizing (or normalization-insensitive)
|
||||||
|
* filesystem like APFS (where files are looked up by
|
||||||
|
* hash(normalize(fname))), HFS+ (where file names are always normalized to
|
||||||
|
* approximately NFD), or zfs with normalization=formC, etc.
|
||||||
|
*
|
||||||
|
* It is impossible to know the version of Unicode being used by the underlying
|
||||||
|
* filesystem, thus it is *impossible* to stop these collisions.
|
||||||
|
*
|
||||||
|
* Overwriting files as a result of invalid NARs will cause a security bug like
|
||||||
|
* CppNix's CVE-2024-45593 (GHSA-h4vv-h3jq-v493)
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This code restores NARs from disk.
|
||||||
|
*
|
||||||
|
* See Note [NAR restoration security] for security invariants in this procedure.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
struct NARRestoreVisitor : NARParseVisitor
|
||||||
{
|
{
|
||||||
Path dstPath;
|
Path dstPath;
|
||||||
AutoCloseFD fd;
|
AutoCloseFD fd;
|
||||||
|
@ -457,7 +486,7 @@ struct RestoreSink : ParseSink
|
||||||
|
|
||||||
void restorePath(const Path & path, Source & source)
|
void restorePath(const Path & path, Source & source)
|
||||||
{
|
{
|
||||||
RestoreSink sink;
|
NARRestoreVisitor sink;
|
||||||
sink.dstPath = path;
|
sink.dstPath = path;
|
||||||
parseDump(sink, source);
|
parseDump(sink, source);
|
||||||
}
|
}
|
||||||
|
@ -468,10 +497,9 @@ WireFormatGenerator copyNAR(Source & source)
|
||||||
// FIXME: if 'source' is the output of dumpPath() followed by EOF,
|
// FIXME: if 'source' is the output of dumpPath() followed by EOF,
|
||||||
// we should just forward all data directly without parsing.
|
// we should just forward all data directly without parsing.
|
||||||
|
|
||||||
static ParseSink parseSink; /* null sink; just parse the NAR */
|
static NARParseVisitor parseSink; /* null sink; just parse the NAR */
|
||||||
|
|
||||||
return parseAndCopyDump(parseSink, source);
|
return parseAndCopyDump(parseSink, source);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,8 +76,12 @@ WireFormatGenerator dumpString(std::string_view s);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \todo Fix this API, it sucks.
|
* \todo Fix this API, it sucks.
|
||||||
|
* A visitor for NAR parsing that performs filesystem (or virtual-filesystem)
|
||||||
|
* actions to restore a NAR.
|
||||||
|
*
|
||||||
|
* Methods of this may arbitrarily fail due to filename collisions.
|
||||||
*/
|
*/
|
||||||
struct ParseSink
|
struct NARParseVisitor
|
||||||
{
|
{
|
||||||
virtual void createDirectory(const Path & path) { };
|
virtual void createDirectory(const Path & path) { };
|
||||||
|
|
||||||
|
@ -90,33 +94,6 @@ struct ParseSink
|
||||||
virtual void createSymlink(const Path & path, const std::string & target) { };
|
virtual void createSymlink(const Path & path, const std::string & target) { };
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* If the NAR archive contains a single file at top-level, then save
|
|
||||||
* the contents of the file to `s`. Otherwise barf.
|
|
||||||
*/
|
|
||||||
struct RetrieveRegularNARSink : ParseSink
|
|
||||||
{
|
|
||||||
bool regular = true;
|
|
||||||
Sink & sink;
|
|
||||||
|
|
||||||
RetrieveRegularNARSink(Sink & sink) : sink(sink) { }
|
|
||||||
|
|
||||||
void createDirectory(const Path & path) override
|
|
||||||
{
|
|
||||||
regular = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void receiveContents(std::string_view data) override
|
|
||||||
{
|
|
||||||
sink(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void createSymlink(const Path & path, const std::string & target) override
|
|
||||||
{
|
|
||||||
regular = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace nar {
|
namespace nar {
|
||||||
|
|
||||||
struct MetadataString;
|
struct MetadataString;
|
||||||
|
@ -160,8 +137,8 @@ Generator<Entry> parse(Source & source);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WireFormatGenerator parseAndCopyDump(ParseSink & sink, Source & source);
|
WireFormatGenerator parseAndCopyDump(NARParseVisitor & sink, Source & source);
|
||||||
void parseDump(ParseSink & sink, Source & source);
|
void parseDump(NARParseVisitor & sink, Source & source);
|
||||||
|
|
||||||
void restorePath(const Path & path, Source & source);
|
void restorePath(const Path & path, Source & source);
|
||||||
|
|
||||||
|
|
|
@ -193,7 +193,7 @@ inline Paths createDirs(PathView path)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a symlink.
|
* Create a symlink. Throws if the symlink exists.
|
||||||
*/
|
*/
|
||||||
void createSymlink(const Path & target, const Path & link);
|
void createSymlink(const Path & target, const Path & link);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue