Merge pull request #9827 from NixOS/backport-9363-to-2.18-maintenance

[Backport 2.18-maintenance] Fix symlink handling
This commit is contained in:
Eelco Dolstra 2024-01-22 14:30:17 +01:00 committed by GitHub
commit 5f7f68e0a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 19 additions and 6 deletions

View file

@ -802,7 +802,7 @@ std::string showType(const Value & v);
/** /**
* If `path` refers to a directory, then append "/default.nix". * If `path` refers to a directory, then append "/default.nix".
*/ */
SourcePath resolveExprPath(const SourcePath & path); SourcePath resolveExprPath(SourcePath path);
struct InvalidPathError : EvalError struct InvalidPathError : EvalError
{ {

View file

@ -682,17 +682,25 @@ Expr * EvalState::parse(
} }
SourcePath resolveExprPath(const SourcePath & path) SourcePath resolveExprPath(SourcePath path)
{ {
unsigned int followCount = 0, maxFollow = 1024;
/* If `path' is a symlink, follow it. This is so that relative /* If `path' is a symlink, follow it. This is so that relative
path references work. */ path references work. */
auto path2 = path.resolveSymlinks(); while (true) {
// Basic cycle/depth limit to avoid infinite loops.
if (++followCount >= maxFollow)
throw Error("too many symbolic links encountered while traversing the path '%s'", path);
if (path.lstat().type != InputAccessor::tSymlink) break;
path = {path.accessor, CanonPath(path.readLink(), path.path.parent().value_or(CanonPath::root))};
}
/* If `path' refers to a directory, append `/default.nix'. */ /* If `path' refers to a directory, append `/default.nix'. */
if (path2.lstat().type == InputAccessor::tDirectory) if (path.lstat().type == InputAccessor::tDirectory)
return path2 + "default.nix"; return path + "default.nix";
return path2; return path;
} }

View file

@ -0,0 +1 @@
"test"

View file

@ -0,0 +1 @@
import symlink-resolution/foo/overlays/overlay.nix

View file

@ -0,0 +1 @@
"test"

View file

@ -0,0 +1 @@
../overlays

View file

@ -0,0 +1 @@
import ../lib