From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 12 Sep 2025 09:26:13 +0000 (+0200)
Subject: sandbox: Make all relative paths absolute during argparsing
X-Git-Tag: v26~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37023686166f5eefda09afd2a936a7b06a0bc4dd;p=thirdparty%2Fmkosi.git

sandbox: Make all relative paths absolute during argparsing

We change the current working directory during processing in
mkosi-sandbox so let's make sure that we don't have any relative paths
leftover by that point that would become invalid.
---

diff --git a/mkosi/sandbox.py b/mkosi/sandbox.py
index a265e5276..5fa480d39 100755
--- a/mkosi/sandbox.py
+++ b/mkosi/sandbox.py
@@ -938,38 +938,45 @@ def main(argv: list[str] = sys.argv[1:]) -> None:
             print(__version__, file=sys.stderr)
             sys.exit(0)
         if arg == "--tmpfs":
-            fsops.append(TmpfsOperation(argv.pop()))
+            fsops.append(TmpfsOperation(os.path.abspath(argv.pop())))
         elif arg == "--dev":
-            fsops.append(DevOperation(ttyname, argv.pop()))
+            fsops.append(DevOperation(ttyname, os.path.abspath(argv.pop())))
         elif arg == "--proc":
-            fsops.append(ProcOperation(argv.pop()))
+            fsops.append(ProcOperation(os.path.abspath(argv.pop())))
         elif arg == "--dir":
-            fsops.append(DirOperation(argv.pop()))
+            fsops.append(DirOperation(os.path.abspath(argv.pop())))
         elif arg in ("--bind", "--ro-bind", "--bind-try", "--ro-bind-try"):
             readonly = arg.startswith("--ro")
             required = not arg.endswith("-try")
             src = argv.pop()
             fsops.append(
                 BindOperation(
-                    src.removeprefix("+"),
-                    argv.pop(),
+                    os.path.abspath(src.removeprefix("+")),
+                    os.path.abspath(argv.pop()),
                     readonly=readonly,
                     required=required,
                     relative=src.startswith("+"),
                 )
             )
         elif arg == "--symlink":
-            fsops.append(SymlinkOperation(argv.pop(), argv.pop()))
+            fsops.append(SymlinkOperation(argv.pop(), os.path.abspath(argv.pop())))
         elif arg == "--write":
-            fsops.append(WriteOperation(argv.pop(), argv.pop()))
+            fsops.append(WriteOperation(argv.pop(), os.path.abspath(argv.pop())))
         elif arg == "--overlay-lowerdir":
-            lowerdirs.append(argv.pop())
+            lowerdirs.append(os.path.abspath(argv.pop()))
         elif arg == "--overlay-upperdir":
-            upperdir = argv.pop()
+            upperdir = os.path.abspath(argv.pop())
         elif arg == "--overlay-workdir":
-            workdir = argv.pop()
+            workdir = os.path.abspath(argv.pop())
         elif arg == "--overlay":
-            fsops.append(OverlayOperation(tuple(reversed(lowerdirs)), upperdir, workdir, argv.pop()))
+            fsops.append(
+                OverlayOperation(
+                    tuple(reversed(lowerdirs)),
+                    upperdir,
+                    workdir,
+                    os.path.abspath(argv.pop()),
+                )
+            )
             upperdir = ""
             workdir = ""
             lowerdirs = []
@@ -978,7 +985,7 @@ def main(argv: list[str] = sys.argv[1:]) -> None:
         elif arg == "--setenv":
             setenv.append((argv.pop(), argv.pop()))
         elif arg == "--chdir":
-            chdir = argv.pop()
+            chdir = os.path.abspath(argv.pop())
         elif arg == "--same-dir":
             chdir = os.getcwd()
         elif arg == "--become-root":