Eval symlinks on XDG_RUNTIME_DIR

Partial Fix for #14606 [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
containers · Oct 19, 2022 · 7c6bf96 · 7c6bf96
1 parent f6053ce
commit 7c6bf96
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go
@@ -103,9 +103,15 @@ func setXdgDirs() error {
 	}
 
 	if _, found := os.LookupEnv("DBUS_SESSION_BUS_ADDRESS"); !found {
-		sessionAddr := filepath.Join(os.Getenv("XDG_RUNTIME_DIR"), "bus")
-		if _, err := os.Stat(sessionAddr); err == nil {
-			os.Setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path="+sessionAddr)
+		runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
+		if runtimeDir != "" {
+			sessionAddr, err := filepath.EvalSymlinks(runtimeDir, "bus")
+			if err != nil {
+				return err
+			}
+			if _, err := os.Stat(sessionAddr); err == nil {
+				os.Setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path="+sessionAddr)
+			}
 		}
 	}
 

diff --git a/libpod/reset.go b/libpod/reset.go
@@ -157,7 +157,13 @@ func (r *Runtime) reset(ctx context.Context) error {
 		}
 	}
 
-	xdgRuntimeDir := filepath.Clean(os.Getenv("XDG_RUNTIME_DIR"))
+	xdgRuntimeDir := os.Getenv("XDG_RUNTIME_DIR")
+	if xdgRuntimeDir != "" {
+		xdgRuntimeDir, err = filepath.EvalSymlinks(xdgRuntimeDir)
+		if err != nil {
+			return err
+		}
+	}
 	_, prevError := r.store.Shutdown(true)
 	graphRoot := filepath.Clean(r.store.GraphRoot())
 	if graphRoot == xdgRuntimeDir {

diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go
@@ -129,7 +129,11 @@ func dbusAuthRootlessConnection(createBus func(opts ...godbus.ConnOption) (*godb
 func newRootlessConnection() (*dbus.Conn, error) {
 	return dbus.NewConnection(func() (*godbus.Conn, error) {
 		return dbusAuthRootlessConnection(func(opts ...godbus.ConnOption) (*godbus.Conn, error) {
-			path := filepath.Join(os.Getenv("XDG_RUNTIME_DIR"), "systemd/private")
+			path := filepath.Join(os.Getenv("XDG_RUNTIME_DIR"), "systemd", "private")
+			path, err := filepath.EvalSymlinks(path)
+			if err != nil {
+				return nil, err
+			}
 			return godbus.Dial(fmt.Sprintf("unix:path=%s", path))
 		})
 	})

diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go
@@ -27,6 +27,12 @@ func GetRuntimeDir() (string, error) {
 
 	rootlessRuntimeDirOnce.Do(func() {
 		runtimeDir := os.Getenv("XDG_RUNTIME_DIR")
+
+		if runtimeDir != "" {
+			rootlessRuntimeDir, rootlessRuntimeDirError = filepath.EvalSymlinks(runtimeDir)
+			return
+		}
+
 		uid := fmt.Sprintf("%d", rootless.GetRootlessUID())
 		if runtimeDir == "" {
 			tmpDir := filepath.Join("/run", "user", uid)