fix: move sessions to user-specific temp dir

storage/config_test.go

@@ -19,7 +19,7 @@ func Test_Config(t *testing.T) {
 	assert.Equal(t, &Config{
 		Profile:       "default",
 		Profiles:      make(map[string]*Profile),
-		LastMigration: 1,
+		LastMigration: 2,
 	}, config)
 
 	profile := _storage.GetProfile()
@@ -51,6 +51,6 @@ func Test_Config(t *testing.T) {
 		Profiles: map[string]*Profile{
 			"default": {Token: profile.Token},
 		},
-		LastMigration: 1,
+		LastMigration: 2,
 	}, c)
 }

storage/migrations.go

@@ -56,3 +56,46 @@ func (s *LocalStorage) UpdateSessionDir() error {
 	}
 	return nil
 }
+
+func (s *LocalStorage) MoveSessionsToUserDir() error {
+	// Old location: TempDir() + ".globalping-cli/sessions"
+	// New location: TempDir() + ".globalping-cli-userid/sessions"
+	oldSessionsDir := filepath.Join(os.TempDir(), ".globalping-cli", "sessions")
+
+	if _, err := os.Stat(oldSessionsDir); os.IsNotExist(err) {
+		return nil
+	}
+
+	entries, err := os.ReadDir(oldSessionsDir)
+	if err != nil {
+		return err
+	}
+
+	err = os.MkdirAll(s.sessionsDir, 0755)
+	if err != nil {
+		return err
+	}
+
+	for _, e := range entries {
+		if !e.IsDir() {
+			continue
+		}
+
+		oldPath := filepath.Join(oldSessionsDir, e.Name())
+		newPath := filepath.Join(s.sessionsDir, e.Name())
+
+		if _, err := os.Stat(newPath); err == nil {
+			continue
+		}
+
+		err = os.Rename(oldPath, newPath)
+		if err != nil {
+			fmt.Printf("Warning: failed to move session %s: %v\n", e.Name(), err)
+			continue
+		}
+	}
+
+	os.RemoveAll(oldSessionsDir)
+
+	return nil
+}

storage/storage.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/user"
 	"path/filepath"
 	"runtime"
 
@@ -35,6 +36,7 @@ func NewLocalStorage(utils utils.Utils) *LocalStorage {
 func (s *LocalStorage) Init(dirName string) error {
 	s.migrations = []MigrationFunc{
 		s.UpdateSessionDir,
+		s.MoveSessionsToUserDir,
 	}
 
 	homeDir, err := os.UserHomeDir()
@@ -46,13 +48,16 @@ func (s *LocalStorage) Init(dirName string) error {
 	if err != nil {
 		return err
 	}
-	s.tempDir = filepath.Join(os.TempDir(), dirName)
+
+	userId := getUserID()
+	s.tempDir = filepath.Join(os.TempDir(), dirName+"-"+userId)
 	s.sessionsDir = filepath.Join(s.tempDir, "sessions")
 	s.currentSessionDir = filepath.Join(s.sessionsDir, getSessionId())
 	err = os.MkdirAll(s.currentSessionDir, 0755)
 	if err != nil {
 		return err
 	}
+
 	_, err = s.LoadConfig()
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -134,6 +139,20 @@ func getSessionId() string {
 	return fmt.Sprintf("%d_%d", createTime, p.Pid)
 }
 
+func getUserID() string {
+	user, err := user.Current()
+	if err != nil {
+		return "unknown"
+	}
+	if user.Uid == "" {
+		if user.Username == "" {
+			return "unknown"
+		}
+		return user.Username
+	}
+	return user.Uid
+}
+
 func truncateFile(file string, maxSize int64) error {
 	f, err := os.OpenFile(file, os.O_RDWR, 0644)
 	if err != nil {