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

[Backport 2.18-maintenance] Fix symlink handling

src/libexpr/eval.hh

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

src/libexpr/parser.y

@@ -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
        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 (path2.lstat().type == InputAccessor::tDirectory)
+    if (path.lstat().type == InputAccessor::tDirectory)
-        return path2 + "default.nix";
+        return path + "default.nix";
 
-    return path2;
+    return path;
 }
 
 

tests/functional/lang/eval-okay-symlink-resolution.exp

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

tests/functional/lang/eval-okay-symlink-resolution.nix

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

tests/functional/lang/symlink-resolution/foo/lib/default.nix

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

tests/functional/lang/symlink-resolution/foo/overlays

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

tests/functional/lang/symlink-resolution/overlays/overlay.nix

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