From 51c4a30db047558d28509a653fe212cf40db1a03 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Thu, 12 Nov 2026 22:57:15 -0600 Subject: [PATCH] fix(flatpak): start host process in a host-valid directory --- pkg/flatpak/flatpak.go | 25 +++++++++++++++++++++++-- pkg/flatpak/flatpak_test.go | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/pkg/flatpak/flatpak.go b/pkg/flatpak/flatpak.go index e2a08267dc..879c30fdee 100644 --- a/pkg/flatpak/flatpak.go +++ b/pkg/flatpak/flatpak.go @@ -6,13 +6,17 @@ import ( "os" "os/exec" "path/filepath" + "strings" "github.com/devsy-org/devsy/pkg/log" ) var flatpakInfoPath = "/.flatpak-info" -const flatpakSpawn = "flatpak-spawn" +const ( + flatpakSpawn = "flatpak-spawn" + sandboxOnlyRoot = "/app" +) func InSandbox() bool { _, err := os.Stat(flatpakInfoPath) @@ -27,6 +31,22 @@ func HostBinaryPath() string { return filepath.Join(dataHome, "devsy", "devsy") } +func hostSpawnDirectory(cwd, home string) string { + if cwd == "" || cwd == sandboxOnlyRoot || strings.HasPrefix(cwd, sandboxOnlyRoot+"/") { + return home + } + return cwd +} + +func buildSpawnArgs(hostBinary, cwd, home string, args []string) []string { + spawnArgs := []string{} + if dir := hostSpawnDirectory(cwd, home); dir != "" { + spawnArgs = append(spawnArgs, "--directory="+dir) + } + spawnArgs = append(spawnArgs, "--host", hostBinary) + return append(spawnArgs, args...) +} + func ReexecOnHost() (bool, error) { if !InSandbox() { return false, nil @@ -40,7 +60,8 @@ func ReexecOnHost() (bool, error) { ) } - spawnArgs := append([]string{"--host", hostBinary}, os.Args[1:]...) + cwd, _ := os.Getwd() + spawnArgs := buildSpawnArgs(hostBinary, cwd, os.Getenv("HOME"), os.Args[1:]) log.Debugf("re-executing on host via flatpak-spawn: args=%v", os.Args[1:]) //nolint:gosec diff --git a/pkg/flatpak/flatpak_test.go b/pkg/flatpak/flatpak_test.go index 648d9858bf..b4e4f1157f 100644 --- a/pkg/flatpak/flatpak_test.go +++ b/pkg/flatpak/flatpak_test.go @@ -3,6 +3,7 @@ package flatpak import ( "os" "path/filepath" + "slices" "testing" ) @@ -73,6 +74,40 @@ func TestReexecOnHost_MissingHostBinary(t *testing.T) { } } +const testHome = "/home/u" + +func TestHostSpawnDirectory(t *testing.T) { + cases := []struct{ name, cwd, home, want string }{ + {"host path kept", "/home/u/project", testHome, "/home/u/project"}, + {"app root falls back to home", "/app", testHome, testHome}, + {"app subdirectory falls back to home", "/app/extra/claude-desktop", testHome, testHome}, + {"app-like prefix kept", "/application/data", testHome, "/application/data"}, + {"empty cwd falls back to home", "", testHome, testHome}, + {"empty cwd and home yields empty", "", "", ""}, + } + for _, tc := range cases { + t.Run(tc.name, func(t *testing.T) { + if got := hostSpawnDirectory(tc.cwd, tc.home); got != tc.want { + t.Fatalf("hostSpawnDirectory(%q, %q) = %q, want %q", tc.cwd, tc.home, got, tc.want) + } + }) + } +} + +func TestBuildSpawnArgs(t *testing.T) { + got := buildSpawnArgs("/h/devsy", "/app/x", testHome, []string{"workspace", "ssh"}) + want := []string{"--directory=/home/u", "--host", "/h/devsy", "workspace", "ssh"} + if !slices.Equal(got, want) { + t.Fatalf("buildSpawnArgs() = %v, want %v", got, want) + } + + got = buildSpawnArgs("/h/devsy", "", "", []string{"up"}) + want = []string{"--host", "/h/devsy", "up"} + if !slices.Equal(got, want) { + t.Fatalf("buildSpawnArgs() without directory = %v, want %v", got, want) + } +} + func withFlatpakInfoPath(t *testing.T, path string) { t.Helper() orig := flatpakInfoPath