From d944cb7f582ab16172764c60bcf8c2e3adb18796 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 14 Jan 2025 17:42:26 +0100
Subject: [PATCH] Use isAbsolute()

(cherry picked from commit ff9d886f3cb28db13bfb88d1dc4d6fe3dc83270f)
---
 src/libexpr/eval.cc            | 2 +-
 src/libfetchers/path.cc        | 2 +-
 src/libfetchers/registry.cc    | 2 +-
 src/libflake/flake/flakeref.cc | 2 +-
 src/libutil/file-system.cc     | 7 +------
 src/libutil/file-system.hh     | 5 +++++
 src/libutil/source-accessor.cc | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 4de464678..15a289360 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -438,7 +438,7 @@ void EvalState::checkURI(const std::string & uri)
 
     /* If the URI is a path, then check it against allowedPaths as
        well. */
-    if (hasPrefix(uri, "/")) {
+    if (isAbsolute(uri)) {
         if (auto rootFS2 = rootFS.dynamic_pointer_cast<AllowListSourceAccessor>())
             rootFS2->checkAccess(CanonPath(uri));
         return;
diff --git a/src/libfetchers/path.cc b/src/libfetchers/path.cc
index fca0df84b..e255dd228 100644
--- a/src/libfetchers/path.cc
+++ b/src/libfetchers/path.cc
@@ -96,7 +96,7 @@ struct PathInputScheme : InputScheme
     std::optional<std::string> isRelative(const Input & input) const
     {
         auto path = getStrAttr(input.attrs, "path");
-        if (hasPrefix(path, "/"))
+        if (isAbsolute(path))
             return std::nullopt;
         else
             return path;
diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc
index 3c893c8ea..7f2552143 100644
--- a/src/libfetchers/registry.cc
+++ b/src/libfetchers/registry.cc
@@ -156,7 +156,7 @@ static std::shared_ptr<Registry> getGlobalRegistry(const Settings & settings, re
             return std::make_shared<Registry>(settings, Registry::Global); // empty registry
         }
 
-        if (!hasPrefix(path, "/")) {
+        if (!isAbsolute(path)) {
             auto storePath = downloadFile(store, path, "flake-registry.json").storePath;
             if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>())
                 store2->addPermRoot(storePath, getCacheDir() + "/nix/flake-registry.json");
diff --git a/src/libflake/flake/flakeref.cc b/src/libflake/flake/flakeref.cc
index a57fce9f3..8fd15a52d 100644
--- a/src/libflake/flake/flakeref.cc
+++ b/src/libflake/flake/flakeref.cc
@@ -175,7 +175,7 @@ std::pair<FlakeRef, std::string> parsePathFlakeRefWithFragment(
         }
 
     } else {
-        if (!hasPrefix(path, "/"))
+        if (!isAbsolute(path))
             throw BadURL("flake reference '%s' is not an absolute path", url);
         path = canonPath(path + "/" + getOr(query, "dir", ""));
     }
diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index 732e0a327..558593ca3 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -29,12 +29,7 @@ namespace fs = std::filesystem;
 
 namespace nix {
 
-/**
- * Treat the string as possibly an absolute path, by inspecting the
- * start of it. Return whether it was probably intended to be
- * absolute.
- */
-static bool isAbsolute(PathView path)
+bool isAbsolute(PathView path)
 {
     return fs::path { path }.is_absolute();
 }
diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
index 92168cbb9..7d2f6a916 100644
--- a/src/libutil/file-system.hh
+++ b/src/libutil/file-system.hh
@@ -42,6 +42,11 @@ namespace nix {
 struct Sink;
 struct Source;
 
+/**
+ * Return whether the path denotes an absolute path.
+ */
+bool isAbsolute(PathView path);
+
 /**
  * @return An absolutized path, resolving paths relative to the
  * specified directory, or the current directory otherwise.  The path
diff --git a/src/libutil/source-accessor.cc b/src/libutil/source-accessor.cc
index e797951c7..1876db92c 100644
--- a/src/libutil/source-accessor.cc
+++ b/src/libutil/source-accessor.cc
@@ -94,7 +94,7 @@ CanonPath SourceAccessor::resolveSymlinks(
                         throw Error("infinite symlink recursion in path '%s'", showPath(path));
                     auto target = readLink(res);
                     res.pop();
-                    if (hasPrefix(target, "/"))
+                    if (isAbsolute(target))
                         res = CanonPath::root;
                     todo.splice(todo.begin(), tokenizeString<std::list<std::string>>(target, "/"));
                 }