max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the NAR parser much stricter wrt field order

Browse source 
We really want to enforce a canonical representation since NAR
hashing/signing/deduplication depends on that.
This commit is contained in:
Eelco Dolstra 2024-09-12 15:57:46 +02:00
parent 27ec0def74
commit 7aa3e7e3a5
4 changed files with 85 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
src/libutil/archive.cc
View file

@ -168,49 +168,42 @@ struct CaseInsensitiveCompare
static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath & path)
{
std::string s;
s = readString(source);
if (s != "(") throw badArchive("expected open tag");
auto getString = [&]() {
checkInterrupt();
return readString(source);
};
// For first iteration
s = getString();
auto expectTag = [&](std::string_view expected) {
auto tag = getString();
if (tag != expected)
throw badArchive("expected tag '%s', got '%s'", expected, tag);
};
while (1) {
expectTag("(");
if (s == ")") {
break;
}
expectTag("type");
else if (s == "type") {
std::string t = getString();
auto type = getString();
if (t == "regular") {
if (type == "regular") {
sink.createRegularFile(path, [&](auto & crf) {
while (1) {
s = getString();
auto tag = getString();
if (s == "contents") {
parseContents(crf, source);
}
else if (s == "executable") {
if (tag == "executable") {
auto s2 = getString();
if (s2 != "") throw badArchive("executable marker has non-empty value");
crf.isExecutable();
tag = getString();
}
else break;
}
if (tag == "contents")
parseContents(crf, source);
expectTag(")");
});
}
else if (t == "directory") {
else if (type == "directory") {
sink.createDirectory(path);
std::map<Path, int, CaseInsensitiveCompare> names;
@ -218,21 +211,18 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
std::string prevName;
while (1) {
s = getString();
auto tag = getString();
if (s == "entry") {
std::string name;
if (tag == ")") break;
s = getString();
if (s != "(") throw badArchive("expected open tag '%s'", s);
if (tag != "entry")
throw badArchive("expected tag 'entry' or ')', got '%s'", tag);
while (1) {
s = getString();
expectTag("(");
if (s == ")") {
break;
} else if (s == "name") {
name = getString();
expectTag("name");
auto name = getString();
if (name.empty() || name == "." || name == ".." || name.find('/') != std::string::npos || name.find((char) 0) != std::string::npos)
throw badArchive("NAR contains invalid file name '%1%'", name);
if (name <= prevName)
@ -250,38 +240,25 @@ static void parse(FileSystemObjectSink & sink, Source & source, const CanonPath
} else
names[name] = 0;
}
} else if (s == "node") {
if (name.empty()) throw badArchive("entry name missing");
expectTag("node");
parse(sink, source, path / name);
} else
throw badArchive("unknown field '%s'", s);
expectTag(")");
}
}
else break;
}
}
else if (type == "symlink") {
expectTag("target");
else if (t == "symlink") {
s = getString();
if (s != "target")
throw badArchive("expected 'target', got '%s'", s);
std::string target = getString();
auto target = getString();
sink.createSymlink(path, target);
// for the next iteration
s = getString();
expectTag(")");
}
else throw badArchive("unknown file type '%s'", t);
}
else
throw badArchive("unknown field '%s'", s);
}
else throw badArchive("unknown file type '%s'", type);
}

BIN
tests/functional/executable-after-contents.nar Normal file
View file

Binary file not shown.

BIN
tests/functional/name-after-node.nar Normal file
View file

Binary file not shown.

8
tests/functional/nars.sh
View file

@ -112,3 +112,11 @@ expectStderr 1 nix-store --restore "$TEST_ROOT/out" < slash.nar | grepQuiet "NAR
# Likewise for an empty filename.
rm -rf "$TEST_ROOT/out"
expectStderr 1 nix-store --restore "$TEST_ROOT/out" < empty.nar | grepQuiet "NAR contains invalid file name ''"
# Test that the 'executable' field cannot come before the 'contents' field.
rm -rf "$TEST_ROOT/out"
expectStderr 1 nix-store --restore "$TEST_ROOT/out" < executable-after-contents.nar | grepQuiet "expected tag ')', got 'executable'"
# Test that the 'name' field cannot come before the 'node' field in a directory entry.
rm -rf "$TEST_ROOT/out"
expectStderr 1 nix-store --restore "$TEST_ROOT/out" < name-after-node.nar | grepQuiet "expected tag 'name'"