From 13369dbbf8eb7c5936c5778d1554ac8e101a1892 Mon Sep 17 00:00:00 2001 From: Indra Prasetya <11029197+prascli@users.noreply.github.com> Date: Thu, 19 Nov 2026 06:31:53 +0000 Subject: [PATCH] fix(tokens): reject path traversal in readAntigravity conversation id Signed-off-by: Indra Prasetya <11029197+prascli@users.noreply.github.com> --- packages/guard/tokens/parse.go | 19 ++++++++++++++++--- packages/guard/tokens/parse_test.go | 8 ++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/guard/tokens/parse.go b/packages/guard/tokens/parse.go index de193366..2dd7f9a8 100644 --- a/packages/guard/tokens/parse.go +++ b/packages/guard/tokens/parse.go @@ -9,6 +9,7 @@ import ( "os" "path/filepath" "strconv" + "strings" _ "modernc.org/sqlite" ) @@ -245,16 +246,28 @@ func readAntigravity(conversationID string) []tokenTurn { if conversationID == "" { return nil } + // Reject IDs that could escape the conversations directory: no path + // separators, no traversal segments, no absolute-path tricks. + if strings.ContainsAny(conversationID, `/\`) || strings.Contains(conversationID, "..") { + return nil + } home, err := os.UserHomeDir() if err != nil { return nil } - dbPath := filepath.Join(home, ".gemini", "antigravity-cli", "conversations", conversationID+".db") - if _, err := os.Stat(dbPath); err != nil { + baseDir := filepath.Join(home, ".gemini", "antigravity-cli", "conversations") + dbPath := filepath.Join(baseDir, conversationID+".db") + // Containment check: the resolved path must stay inside baseDir. + cleanPath := filepath.Clean(dbPath) + rel, err := filepath.Rel(baseDir, cleanPath) + if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) { + return nil + } + if _, err := os.Stat(cleanPath); err != nil { return nil } - db, err := sql.Open("sqlite", "file:"+dbPath+"?mode=ro") + db, err := sql.Open("sqlite", "file:"+cleanPath+"?mode=ro") if err != nil { return nil } diff --git a/packages/guard/tokens/parse_test.go b/packages/guard/tokens/parse_test.go index b57a573e..fd70ba4b 100644 --- a/packages/guard/tokens/parse_test.go +++ b/packages/guard/tokens/parse_test.go @@ -214,6 +214,14 @@ func TestReadAntigravity(t *testing.T) { } } +func TestReadAntigravityRejectsTraversal(t *testing.T) { + for _, id := range []string{"../etc/passwd", "../../secret", "a/b", `a\b`, "a..b"} { + if got := readAntigravity(id); got != nil { + t.Errorf("readAntigravity(%q) = %v, want nil", id, got) + } + } +} + func TestReadAntigravityNotFound(t *testing.T) { if got := readAntigravity(""); got != nil { t.Errorf("readAntigravity(\"\") = %v, want nil", got)