lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #8452 from edolstra/fix-relative-symlinks

Browse source 
SourcePath::resolveSymlinks(): Fix handling of symlinks that start with '..'
This commit is contained in:
Eelco Dolstra 2023-06-06 12:06:23 +02:00 committed by GitHub
parent 9c6ede85fc f5c6b29940
commit f5ab40c6e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/libfetchers/input-accessor.cc
View file

@ -75,22 +75,28 @@ SourcePath SourcePath::resolveSymlinks() const
int linksAllowed = 1024; int linksAllowed = 1024;
for (auto & component : path) { std::list<std::string> todo;
res.path.push(component); for (auto & c : path)
while (true) { todo.push_back(std::string(c));
if (auto st = res.maybeLstat()) {
while (!todo.empty()) {
auto c = *todo.begin();
todo.pop_front();
if (c == "" || c == ".")
;
else if (c == "..")
res.path.pop();
else {
res.path.push(c);
if (auto st = res.maybeLstat(); st && st->type == InputAccessor::tSymlink) {
if (!linksAllowed--) if (!linksAllowed--)
throw Error("infinite symlink recursion in path '%s'", path); throw Error("infinite symlink recursion in path '%s'", path);
if (st->type != InputAccessor::tSymlink) break;
auto target = res.readLink(); auto target = res.readLink();
res.path.pop();
if (hasPrefix(target, "/")) if (hasPrefix(target, "/"))
res = CanonPath(target); res.path = CanonPath::root;
else { todo.splice(todo.begin(), tokenizeString<std::list<std::string>>(target, "/"));
res.path.pop(); }
res.path.extend(CanonPath(target));
}
} else
break;
} }
} }

6
tests/eval.sh
View file

@ -35,3 +35,9 @@ nix-instantiate --eval -E 'assert 1 + 2 == 3; true'
# Check that symlink cycles don't cause a hang. # Check that symlink cycles don't cause a hang.
ln -sfn cycle.nix $TEST_ROOT/cycle.nix ln -sfn cycle.nix $TEST_ROOT/cycle.nix
(! nix eval --file $TEST_ROOT/cycle.nix) (! nix eval --file $TEST_ROOT/cycle.nix)
# Check that relative symlinks are resolved correctly.
mkdir -p $TEST_ROOT/xyzzy $TEST_ROOT/foo
ln -sfn ../xyzzy $TEST_ROOT/foo/bar
printf 123 > $TEST_ROOT/xyzzy/default.nix
[[ $(nix eval --impure --expr "import $TEST_ROOT/foo/bar") = 123 ]]