Skip to content

Modern Docker Management, Designed for Everyone

fix: use full absolute path for projects directory (#1409)

Kyle Mendellb1efbdfe33e2
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.go
index 2b777f138..158d9bb5a 100644
--- a/backend/internal/bootstrap/bootstrap.go
+++ b/backend/internal/bootstrap/bootstrap.go
@@ -56,6 +56,10 @@ func Bootstrap(ctx context.Context) error {
utils.InitEncryption(cfg)
utils.InitializeDefaultSettings(appCtx, cfg, appServices.Settings)
+ if err := appServices.Settings.NormalizeProjectsDirectory(appCtx, cfg.ProjectsDirectory); err != nil {
+ slog.WarnContext(appCtx, "Failed to normalize projects directory", "error", err)
+ }
+
if err := appServices.Environment.EnsureLocalEnvironment(appCtx, cfg.AppUrl); err != nil {
slog.WarnContext(appCtx, "Failed to ensure local environment", "error", err)
}
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index 56bdcd3ef..1f4f72397 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -35,6 +35,7 @@ type Config struct {
OidcSkipTlsVerify bool
DockerHost string
+ ProjectsDirectory string
LogJson bool
LogLevel string
AgentMode bool
@@ -70,6 +71,7 @@ func Load() *Config {
OidcSkipTlsVerify: getBoolEnvOrDefault("OIDC_SKIP_TLS_VERIFY", false),
DockerHost: getEnvOrDefault("DOCKER_HOST", "unix:///var/run/docker.sock"),
+ ProjectsDirectory: os.Getenv("PROJECTS_DIRECTORY"),
LogJson: getBoolEnvOrDefault("LOG_JSON", false),
LogLevel: strings.ToLower(getEnvOrDefault("LOG_LEVEL", "info")),
AgentMode: getBoolEnvOrDefault("AGENT_MODE", false),
diff --git a/backend/internal/huma/handlers/settings.go b/backend/internal/huma/handlers/settings.go
index b278515ab..4b40971f8 100644
--- a/backend/internal/huma/handlers/settings.go
+++ b/backend/internal/huma/handlers/settings.go
@@ -3,6 +3,7 @@ package handlers
import (
"context"
"encoding/json"
+ "errors"
"net/http"
"strconv"
"strings"
@@ -13,6 +14,7 @@ import (
humamw "github.com/getarcaneapp/arcane/backend/internal/huma/middleware"
"github.com/getarcaneapp/arcane/backend/internal/services"
"github.com/getarcaneapp/arcane/backend/internal/utils/mapper"
+ "github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper"
"github.com/getarcaneapp/arcane/types/base"
"github.com/getarcaneapp/arcane/types/category"
"github.com/getarcaneapp/arcane/types/search"
@@ -66,6 +68,32 @@ type GetCategoriesOutput struct {
Body []category.Category
}
+// validateProjectsDirectoryValue validates a projects directory value allowing:
+// - Unix absolute paths (/...)
+// - Windows drive paths (C:/..., C:\...)
+// - Mapping format "container:host" where container is absolute Unix or Windows path
+func validateProjectsDirectoryValue(path string) error {
+ switch {
+ case pathmapper.IsWindowsDrivePath(path):
+ return nil
+ case strings.Contains(path, ":"):
+ parts := strings.SplitN(path, ":", 2)
+ if len(parts) != 2 {
+ return errors.New("projectsDirectory must be an absolute path or valid mapping format")
+ }
+ container := parts[0]
+ if !strings.HasPrefix(container, "/") && !pathmapper.IsWindowsDrivePath(container) {
+ return errors.New("projectsDirectory mapping format: container path must be absolute")
+ }
+ return nil
+ default:
+ if !strings.HasPrefix(path, "/") {
+ return errors.New("projectsDirectory must be an absolute path starting with '/'")
+ }
+ return nil
+ }
+}
+
// RegisterSettings registers settings management routes using Huma.
func RegisterSettings(api huma.API, settingsService *services.SettingsService, settingsSearchService *services.SettingsSearchService, environmentService *services.EnvironmentService, cfg *config.Config) {
h := &SettingsHandler{
@@ -242,6 +270,13 @@ func (h *SettingsHandler) UpdateSettings(ctx context.Context, input *UpdateSetti
return nil, err
}
+ // Validate projects directory if provided
+ if input.Body.ProjectsDirectory != nil && *input.Body.ProjectsDirectory != "" {
+ if err := validateProjectsDirectoryValue(*input.Body.ProjectsDirectory); err != nil {
+ return nil, huma.Error400BadRequest(err.Error())
+ }
+ }
+
if input.EnvironmentID != "0" {
if h.environmentService == nil {
return nil, huma.Error500InternalServerError("environment service not available")
diff --git a/backend/internal/huma/handlers/settings_validation_test.go b/backend/internal/huma/handlers/settings_validation_test.go
new file mode 100644
index 000000000..5f38f3ec0
--- /dev/null
+++ b/backend/internal/huma/handlers/settings_validation_test.go
@@ -0,0 +1,104 @@
+package handlers
+
+import (
+ "strings"
+ "testing"
+
+ "github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestProjectsDirectoryValidation(t *testing.T) {
+ tests := []struct {
+ name string
+ projectsDir string
+ expectValid bool
+ }{
+ {
+ name: "valid absolute path",
+ projectsDir: "/app/data/projects",
+ expectValid: true,
+ },
+ {
+ name: "valid absolute path root",
+ projectsDir: "/projects",
+ expectValid: true,
+ },
+ {
+ name: "invalid relative path",
+ projectsDir: "data/projects",
+ expectValid: false,
+ },
+ {
+ name: "invalid relative path with dot",
+ projectsDir: "./data/projects",
+ expectValid: false,
+ },
+ {
+ name: "invalid relative path parent",
+ projectsDir: "../projects",
+ expectValid: false,
+ },
+ {
+ name: "valid mapping format",
+ projectsDir: "/app/data/projects:D:/host/path",
+ expectValid: true,
+ },
+ {
+ name: "valid Windows drive path",
+ projectsDir: "C:/projects",
+ expectValid: true,
+ },
+ {
+ name: "valid Windows drive path backslashes",
+ projectsDir: "C:\\projects",
+ expectValid: true,
+ },
+ {
+ name: "valid mapping with Windows backslashes",
+ projectsDir: "/app/data/projects:D:\\host\\path",
+ expectValid: true,
+ },
+ {
+ name: "valid mapping with Windows container path",
+ projectsDir: "C:/container:D:/host",
+ expectValid: true,
+ },
+ {
+ name: "invalid single colon not Windows",
+ projectsDir: "invalid:path",
+ expectValid: false,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ // Replicate the validation logic from UpdateSettings handler
+ path := tt.projectsDir
+ isValid := true
+
+ switch {
+ case pathmapper.IsWindowsDrivePath(path):
+ // Valid Windows path
+ case strings.Contains(path, ":"):
+ // Mapping format (container:host)
+ parts := strings.SplitN(path, ":", 2)
+ if len(parts) != 2 {
+ isValid = false
+ break
+ }
+ container := parts[0]
+ if !strings.HasPrefix(container, "/") && !pathmapper.IsWindowsDrivePath(container) {
+ isValid = false
+ }
+ default:
+ if !strings.HasPrefix(path, "/") {
+ // No colon and doesn't start with / - must be relative
+ isValid = false
+ }
+ }
+
+ assert.Equal(t, tt.expectValid, isValid, "path: %s", tt.projectsDir)
+ })
+ }
+}
diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.go
index 68c3ecee0..6d8383ee9 100644
--- a/backend/internal/services/project_service.go
+++ b/backend/internal/services/project_service.go
@@ -50,7 +50,7 @@ func NewProjectService(db *database.DB, settingsService *SettingsService, eventS
}
func (s *ProjectService) getPathMapper(ctx context.Context) (*pathmapper.PathMapper, error) {
- configuredPath := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ configuredPath := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
var containerDir, hostDir string
@@ -71,7 +71,7 @@ func (s *ProjectService) getPathMapper(ctx context.Context) (*pathmapper.PathMap
containerDirResolved, err := fs.GetProjectsDirectory(ctx, strings.TrimSpace(containerDir))
if err != nil {
slog.WarnContext(ctx, "unable to resolve container projects directory, using default", "error", err)
- containerDirResolved = "data/projects"
+ containerDirResolved = "/app/data/projects"
}
// If hostDir not obtained from mapping, attempt auto-discovery from Docker mounts
@@ -190,11 +190,11 @@ func (s *ProjectService) GetProjectServices(ctx context.Context, projectID strin
}
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -366,7 +366,7 @@ func (s *ProjectService) enrichWithGitOpsInfo(ctx context.Context, proj *models.
}
func (s *ProjectService) enrichWithComposeServiceConfigs(ctx context.Context, proj *models.Project, composeFile string, resp *project.Details) {
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, _ := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -387,7 +387,7 @@ func (s *ProjectService) enrichWithComposeServiceConfigs(ctx context.Context, pr
}
func (s *ProjectService) SyncProjectsFromFileSystem(ctx context.Context) error {
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDir, err := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if err != nil {
slog.WarnContext(ctx, "unable to prepare projects directory", "error", err)
@@ -547,7 +547,7 @@ func formatDockerPorts(ports []container.Port) []string {
}
func (s *ProjectService) countProjectFolders(ctx context.Context) (int, error) {
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDir, err := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if err != nil {
return 0, fmt.Errorf("could not determine projects directory: %w", err)
@@ -692,11 +692,11 @@ func (s *ProjectService) DeployProject(ctx context.Context, projectID string, us
}
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -757,11 +757,11 @@ func (s *ProjectService) DownProject(ctx context.Context, projectID string, user
}
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -800,7 +800,7 @@ func (s *ProjectService) DownProject(ctx context.Context, projectID string, user
func (s *ProjectService) CreateProject(ctx context.Context, name, composeContent string, envContent *string, user models.User) (*models.Project, error) {
sanitized := fs.SanitizeProjectName(name)
- projectsDirectory, err := fs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects"))
+ projectsDirectory, err := fs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects"))
if err != nil {
return nil, fmt.Errorf("failed to get projects directory: %w", err)
}
@@ -861,11 +861,11 @@ func (s *ProjectService) DestroyProject(ctx context.Context, projectID string, r
if removeVolumes {
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)
@@ -931,11 +931,11 @@ func (s *ProjectService) PullProjectImages(ctx context.Context, projectID string
}
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -975,11 +975,11 @@ func (s *ProjectService) EnsureProjectImagesPresent(ctx context.Context, project
}
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -1030,11 +1030,11 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, u
}
// Get configured projects directory from settings
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, pdErr := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if pdErr != nil {
slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
pathMapper, pmErr := s.getPathMapper(ctx)
@@ -1076,10 +1076,14 @@ func (s *ProjectService) UpdateProject(ctx context.Context, projectID string, na
}
// Get projects directory for security validation
- projectsDirectory, err := fs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects"))
+ projectsDirectory, err := fs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects"))
if err != nil {
return nil, fmt.Errorf("failed to get projects directory: %w", err)
}
+ // Ensure the project's path is under the projects root (repair legacy relative paths)
+ if err := s.ensureProjectPathUnderRoot(ctx, &proj, false); err != nil {
+ return nil, err
+ }
if name != nil {
if newName := strings.TrimSpace(*name); newName != "" && proj.Name != newName {
@@ -1112,6 +1116,11 @@ func (s *ProjectService) UpdateProjectIncludeFile(ctx context.Context, projectID
return err
}
+ // Normalize and persist project path to ensure include writes occur under projects root
+ if err := s.ensureProjectPathUnderRoot(ctx, proj, true); err != nil {
+ return err
+ }
+
if err := projects.WriteIncludeFile(proj.Path, relativePath, content); err != nil {
return fmt.Errorf("failed to update include file: %w", err)
}
@@ -1120,6 +1129,45 @@ func (s *ProjectService) UpdateProjectIncludeFile(ctx context.Context, projectID
return nil
}
+// ensureProjectPathUnderRoot validates that the project's path is a safe subdirectory of the configured projects root.
+// If not, it normalizes the path to `<projectsRoot>/<dirName or sanitized project name>`. When persist=true, it saves
+// the updated project path to the database.
+func (s *ProjectService) ensureProjectPathUnderRoot(ctx context.Context, proj *models.Project, persist bool) error {
+ projectsDirectory, err := fs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects"))
+ if err != nil {
+ return fmt.Errorf("failed to get projects directory: %w", err)
+ }
+
+ rootAbs, _ := filepath.Abs(projectsDirectory)
+ rootAbs = filepath.Clean(rootAbs)
+
+ projPathAbs := proj.Path
+ if abs, aerr := filepath.Abs(proj.Path); aerr == nil {
+ projPathAbs = filepath.Clean(abs)
+ }
+
+ if fs.IsSafeSubdirectory(rootAbs, projPathAbs) {
+ return nil
+ }
+
+ // Attempt to repair using known directory name or sanitized project name
+ dirName := utils.DerefString(proj.DirName)
+ if strings.TrimSpace(dirName) == "" {
+ dirName = fs.SanitizeProjectName(proj.Name)
+ }
+ candidate := filepath.Join(projectsDirectory, dirName)
+
+ slog.WarnContext(ctx, "Normalizing project path to projects root", "projectID", proj.ID, "oldPath", proj.Path, "newPath", candidate, "root", projectsDirectory)
+ proj.Path = filepath.Clean(candidate)
+
+ if persist {
+ if saveErr := s.db.WithContext(ctx).Save(proj).Error; saveErr != nil {
+ slog.WarnContext(ctx, "failed to persist normalized project path", "error", saveErr)
+ }
+ }
+ return nil
+}
+
func (s *ProjectService) StreamProjectLogs(ctx context.Context, projectID string, logsChan chan<- string, follow bool, tail, since string, timestamps bool) error {
proj, err := s.GetProjectFromDatabaseByID(ctx, projectID)
if err != nil {
@@ -1340,7 +1388,7 @@ func (s *ProjectService) mapProjectToDto(ctx context.Context, p models.Project,
// End Table Functions
func (s *ProjectService) countServicesFromCompose(ctx context.Context, p models.Project) (int, error) {
- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects")
+ projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")
projectsDirectory, err := fs.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))
if err != nil {
return 0, err
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index b23794c8f..701222182 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -9,6 +9,7 @@ import (
"fmt"
"log/slog"
"os"
+ "path/filepath"
"reflect"
"slices"
"strconv"
@@ -23,6 +24,7 @@ import (
"github.com/getarcaneapp/arcane/backend/internal/database"
"github.com/getarcaneapp/arcane/backend/internal/models"
"github.com/getarcaneapp/arcane/backend/internal/utils"
+ "github.com/getarcaneapp/arcane/backend/internal/utils/pathmapper"
"github.com/getarcaneapp/arcane/types/settings"
)
@@ -827,3 +829,59 @@ func (s *SettingsService) EnsureEncryptionKey(ctx context.Context) (string, erro
return key, nil
}
+
+func (s *SettingsService) NormalizeProjectsDirectory(ctx context.Context, projectsDirEnv string) error {
+ if projectsDirEnv != "" {
+ slog.DebugContext(ctx, "PROJECTS_DIRECTORY environment variable is set, skipping normalization", "value", projectsDirEnv)
+ return nil
+ }
+
+ var projectsDirSetting models.SettingVariable
+ err := s.db.WithContext(ctx).Where("key = ?", "projectsDirectory").First(&projectsDirSetting).Error
+
+ if errors.Is(err, gorm.ErrRecordNotFound) {
+ slog.DebugContext(ctx, "No projectsDirectory setting found, skipping normalization")
+ return nil
+ }
+
+ if err != nil {
+ return fmt.Errorf("failed to load projectsDirectory setting: %w", err)
+ }
+
+ value := strings.TrimSpace(projectsDirSetting.Value)
+ // Detect mapping format (container:host), allowing Windows or Unix container paths.
+ isMapping := false
+ if strings.Contains(value, ":") {
+ // Treat as mapping if the container side looks like an absolute Unix path
+ // or a Windows drive path (C:/ or C:\). We purposely avoid splitting on the
+ // first colon to not break on Windows drive letters.
+ if strings.HasPrefix(value, "/") || pathmapper.IsWindowsDrivePath(value) {
+ isMapping = true
+ }
+ }
+
+ if !filepath.IsAbs(value) && !isMapping {
+ // Resolve relative path using current working directory for transparency.
+ // Note: In containers, WORKDIR is set to /app so "data/..." becomes "/app/data/...".
+ cwd, _ := os.Getwd()
+ absPath, absErr := filepath.Abs(value)
+ if absErr != nil {
+ return fmt.Errorf("failed to resolve relative path to absolute: %w", absErr)
+ }
+ slog.InfoContext(ctx, "Normalizing projects directory from relative to absolute path", "from", value, "to", absPath, "base", cwd)
+
+ if err := s.UpdateSetting(ctx, "projectsDirectory", absPath); err != nil {
+ return fmt.Errorf("failed to update projectsDirectory: %w", err)
+ }
+
+ if err := s.LoadDatabaseSettings(ctx); err != nil {
+ return fmt.Errorf("failed to reload settings after normalization: %w", err)
+ }
+
+ slog.InfoContext(ctx, "Successfully normalized projects directory")
+ } else {
+ slog.DebugContext(ctx, "Projects directory already normalized or custom, skipping", "value", projectsDirSetting.Value)
+ }
+
+ return nil
+}
diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.go
index 13470ef15..a2def9476 100644
--- a/backend/internal/services/settings_service_test.go
+++ b/backend/internal/services/settings_service_test.go
@@ -3,6 +3,7 @@ package services
import (
"context"
"encoding/json"
+ "path/filepath"
"testing"
glsqlite "github.com/glebarez/sqlite"
@@ -444,3 +445,103 @@ func TestSettingsService_MigrateOidcConfigToFields_DefaultScopes(t *testing.T) {
require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "oidcScopes").First(&scopes).Error)
require.Equal(t, "openid email profile", scopes.Value)
}
+
+func TestSettingsService_NormalizeProjectsDirectory_ConvertsRelativeToAbsolute(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+
+ // Seed with relative path
+ require.NoError(t, svc.UpdateSetting(ctx, "projectsDirectory", "data/projects"))
+
+ // Run normalization without env var set (empty string)
+ err = svc.NormalizeProjectsDirectory(ctx, "")
+ require.NoError(t, err)
+
+ // Verify it was updated to absolute path
+ var setting models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "projectsDirectory").First(&setting).Error)
+
+ // Should be converted to absolute path
+ expectedPath, _ := filepath.Abs("data/projects")
+ require.Equal(t, expectedPath, setting.Value)
+ require.True(t, filepath.IsAbs(setting.Value), "path should be absolute")
+}
+
+func TestSettingsService_NormalizeProjectsDirectory_SkipsWhenEnvSet(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+
+ // Seed with relative path
+ require.NoError(t, svc.UpdateSetting(ctx, "projectsDirectory", "data/projects"))
+
+ // Run normalization WITH env var set
+ err = svc.NormalizeProjectsDirectory(ctx, "/custom/env/path")
+ require.NoError(t, err)
+
+ // Verify it was NOT changed
+ var setting models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "projectsDirectory").First(&setting).Error)
+ require.Equal(t, "data/projects", setting.Value, "should not change when env var is set")
+}
+
+func TestSettingsService_NormalizeProjectsDirectory_LeavesOtherPathsUnchanged(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+
+ customPath := "/custom/projects/path"
+ require.NoError(t, svc.UpdateSetting(ctx, "projectsDirectory", customPath))
+
+ // Run normalization
+ err = svc.NormalizeProjectsDirectory(ctx, "")
+ require.NoError(t, err)
+
+ // Verify it was NOT changed
+ var setting models.SettingVariable
+ require.NoError(t, svc.db.WithContext(ctx).Where("key = ?", "projectsDirectory").First(&setting).Error)
+ require.Equal(t, customPath, setting.Value, "should not change custom paths")
+}
+
+func TestSettingsService_NormalizeProjectsDirectory_HandlesNotFound(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+
+ // Don't create the setting at all
+
+ // Run normalization - should not error
+ err = svc.NormalizeProjectsDirectory(ctx, "")
+ require.NoError(t, err)
+}
+
+func TestSettingsService_NormalizeProjectsDirectory_UpdatesCacheAfterNormalization(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ // Set to relative path
+ require.NoError(t, svc.UpdateSetting(ctx, "projectsDirectory", "data/projects"))
+ require.NoError(t, svc.LoadDatabaseSettings(ctx))
+
+ // Verify cache has relative path
+ cfg1 := svc.GetSettingsConfig()
+ require.Equal(t, "data/projects", cfg1.ProjectsDirectory.Value)
+
+ // Run normalization
+ err = svc.NormalizeProjectsDirectory(ctx, "")
+ require.NoError(t, err)
+
+ // Verify cache was updated to absolute path
+ cfg2 := svc.GetSettingsConfig()
+ expectedPath, _ := filepath.Abs("data/projects")
+ require.Equal(t, expectedPath, cfg2.ProjectsDirectory.Value)
+ require.True(t, filepath.IsAbs(cfg2.ProjectsDirectory.Value), "path should be absolute")
+}
diff --git a/backend/internal/services/template_service.go b/backend/internal/services/template_service.go
index a2c62e0dd..f861682db 100644
--- a/backend/internal/services/template_service.go
+++ b/backend/internal/services/template_service.go
@@ -902,7 +902,7 @@ func (s *TemplateService) syncFilesystemTemplatesInternal(ctx context.Context) e
}
func (s *TemplateService) getGlobalVariablesPath(ctx context.Context) (string, error) {
- projectsDirectory, err := appfs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "data/projects"))
+ projectsDirectory, err := appfs.GetProjectsDirectory(ctx, s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects"))
if err != nil {
return "", fmt.Errorf("failed to get projects directory: %w", err)
}
diff --git a/backend/internal/utils/fs/fs_util.go b/backend/internal/utils/fs/fs_util.go
index 41dc12051..35b547f8b 100644
--- a/backend/internal/utils/fs/fs_util.go
+++ b/backend/internal/utils/fs/fs_util.go
@@ -16,7 +16,7 @@ import (
func GetProjectsDirectory(ctx context.Context, projectsDir string) (string, error) {
projectsDirectory := projectsDir
if projectsDirectory == "" {
- projectsDirectory = "data/projects"
+ projectsDirectory = "/app/data/projects"
}
// Handle mapping format: "container_path:host_path"
@@ -26,6 +26,16 @@ func GetProjectsDirectory(ctx context.Context, projectsDir string) (string, erro
}
}
+ // Always resolve to an absolute, cleaned path so downstream code and DB
+ // store a canonical location (prevents relative paths like "data/projects").
+ absDir, err := filepath.Abs(projectsDirectory)
+ if err == nil {
+ projectsDirectory = filepath.Clean(absDir)
+ } else {
+ // If Abs fails for any reason, still clean the provided value
+ projectsDirectory = filepath.Clean(projectsDirectory)
+ }
+
if _, err := os.Stat(projectsDirectory); os.IsNotExist(err) {
if err := os.MkdirAll(projectsDirectory, common.DirPerm); err != nil {
return "", err
diff --git a/docker/Dockerfile-agent b/docker/Dockerfile-agent
index c10f464ea..70c68aa1c 100644
--- a/docker/Dockerfile-agent
+++ b/docker/Dockerfile-agent
@@ -45,7 +45,7 @@ RUN apt-get update && apt-get upgrade -y \
WORKDIR /app
RUN mkdir -p /app/data
-COPY --from=agent-builder /out/arcane-agent /usr/local/bin/arcane-agent
+COPY --from=agent-builder /out/arcane-agent ./arcane-agent
ARG VERSION="dev"
ARG REVISION="unknown"
@@ -78,4 +78,4 @@ LABEL com.getarcaneapp.arcane.agent="true"
EXPOSE 3553
VOLUME ["/app/data"]
-CMD ["/usr/local/bin/arcane-agent"]
\ No newline at end of file
+CMD ["./arcane-agent"]
\ No newline at end of file
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index a4218b700..d12b7131b 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -821,8 +821,8 @@
"general_projects_heading": "Project Paths",
"general_projects_description": "Configure where Arcane looks for your Compose files.",
"general_projects_directory_label": "Projects Directory",
- "general_projects_directory_placeholder": "data/projects",
- "general_projects_directory_help": "Directory where Docker Compose files are stored (this is inside the container)",
+ "general_projects_directory_placeholder": "/app/data/projects",
+ "general_projects_directory_help": "Directory where Docker Compose files are stored (this is inside the container). MUST be an absolute path!",
"general_projects_directory_required": "Projects directory is required",
"general_base_url_label": "Base Server URL",
"general_base_url_placeholder": "localhost",
diff --git a/frontend/src/lib/components/disk-meter.svelte b/frontend/src/lib/components/disk-meter.svelte
index e768f6d69..5af3fe0f4 100644
--- a/frontend/src/lib/components/disk-meter.svelte
+++ b/frontend/src/lib/components/disk-meter.svelte
@@ -103,14 +103,14 @@
</div>
<div class="space-y-2">
<Label for="disk-path">{m.directory_path()}</Label>
- <Input id="disk-path" placeholder="data/projects" bind:value={diskUsagePath} disabled={isSaving} />
+ <Input id="disk-path" placeholder="/app/data/projects" bind:value={diskUsagePath} disabled={isSaving} />
</div>
<div class="flex justify-end gap-2">
<ArcaneButton
action="cancel"
size="sm"
onclick={() => {
- diskUsagePath = $settingsStore.diskUsagePath || 'data/projects';
+ diskUsagePath = $settingsStore.diskUsagePath || '/app/data/projects';
popoverOpen = false;
}}
disabled={isSaving}
diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelte
index d94bdef7e..deb4b3be4 100644
--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte
+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte
@@ -81,8 +81,8 @@
let formAutoInjectEnv = $state(false);
let formPruneMode = $state<'all' | 'dangling'>('dangling');
let formDefaultShell = $state('/bin/sh');
- let formProjectsDirectory = $state('data/projects');
- let formDiskUsagePath = $state('data/projects');
+ let formProjectsDirectory = $state('/app/data/projects');
+ let formDiskUsagePath = $state('/app/data/projects');
let formMaxImageUploadSize = $state(500);
let formBaseServerUrl = $state('http://localhost');
@@ -142,8 +142,8 @@
formAutoInjectEnv = settings.autoInjectEnv;
formPruneMode = settings.dockerPruneMode || 'dangling';
formDefaultShell = settings.defaultShell || '/bin/sh';
- formProjectsDirectory = settings.projectsDirectory || 'data/projects';
- formDiskUsagePath = settings.diskUsagePath || 'data/projects';
+ formProjectsDirectory = settings.projectsDirectory || '/app/data/projects';
+ formDiskUsagePath = settings.diskUsagePath || '/app/data/projects';
formMaxImageUploadSize = settings.maxImageUploadSize || 500;
formBaseServerUrl = settings.baseServerUrl || 'http://localhost';
@@ -198,8 +198,8 @@
formAutoInjectEnv !== settings.autoInjectEnv ||
formPruneMode !== (settings.dockerPruneMode || 'dangling') ||
formDefaultShell !== (settings.defaultShell || '/bin/sh') ||
- formProjectsDirectory !== (settings.projectsDirectory || 'data/projects') ||
- formDiskUsagePath !== (settings.diskUsagePath || 'data/projects') ||
+ formProjectsDirectory !== (settings.projectsDirectory || '/app/data/projects') ||
+ formDiskUsagePath !== (settings.diskUsagePath || '/app/data/projects') ||
formMaxImageUploadSize !== (settings.maxImageUploadSize || 500) ||
formBaseServerUrl !== (settings.baseServerUrl || 'http://localhost')))
);
@@ -328,7 +328,8 @@
}
} catch (error) {
console.error('Failed to save environment:', error);
- toast.error(m.common_update_failed({ resource: m.resource_environment() }));
+ const message = error instanceof Error ? error.message : undefined;
+ toast.error(message ?? m.common_update_failed({ resource: m.resource_environment() }));
} finally {
isSaving = false;
}
@@ -347,8 +348,8 @@
formAutoInjectEnv = settings.autoInjectEnv;
formPruneMode = settings.dockerPruneMode || 'dangling';
formDefaultShell = settings.defaultShell || '/bin/sh';
- formProjectsDirectory = settings.projectsDirectory || 'data/projects';
- formDiskUsagePath = settings.diskUsagePath || 'data/projects';
+ formProjectsDirectory = settings.projectsDirectory || '/app/data/projects';
+ formDiskUsagePath = settings.diskUsagePath || '/app/data/projects';
formMaxImageUploadSize = settings.maxImageUploadSize || 500;
formBaseServerUrl = settings.baseServerUrl || 'http://localhost';
diff --git a/types/settings/settings.go b/types/settings/settings.go
index e06c1c234..25a8cb771 100644
--- a/types/settings/settings.go
+++ b/types/settings/settings.go
@@ -32,6 +32,7 @@ type SettingDto struct {
// Update is used to update application settings.
type Update struct {
// ProjectsDirectory is the directory path where projects are stored.
+ // Must be an absolute path.
//
// Required: false
ProjectsDirectory *string `json:"projectsDirectory,omitempty"`