Merge branch 'main' into feat/custom-project-files

Author: kmendell

backend/internal/api/ws_handler.go

@@ -182,6 +182,9 @@ func (h *WebSocketHandler) ProjectLogs(c *gin.Context) {
 	}
 
 	hub := h.startProjectLogHub(projectID, format, batched, follow, tail, since, timestamps)
+	// WebSocket connections use context.Background() because they are long-lived and should not
+	// be tied to the HTTP request context. Cleanup is handled via the hub's OnEmpty callback
+	// which triggers when all clients disconnect.
 	ws.ServeClient(context.Background(), hub, conn)
 }
 
@@ -202,10 +205,10 @@ func (h *WebSocketHandler) startProjectLogHub(projectID, format string, batched,
 	go ls.hub.Run(ctx)
 
 	lines := make(chan string, 256)
-	go func() {
+	go func(ctx context.Context) {
 		defer close(lines)
 		_ = h.projectService.StreamProjectLogs(ctx, projectID, lines, follow, tail, since, timestamps)
-	}()
+	}(ctx)
 
 	if format == "json" {
 		msgs := make(chan ws.LogMessage, 256)
@@ -291,6 +294,9 @@ func (h *WebSocketHandler) ContainerLogs(c *gin.Context) {
 	}
 
 	hub := h.startContainerLogHub(containerID, format, batched, follow, tail, since, timestamps)
+	// WebSocket connections use context.Background() because they are long-lived and should not
+	// be tied to the HTTP request context. Cleanup is handled via the hub's OnEmpty callback
+	// which triggers when all clients disconnect.
 	ws.ServeClient(context.Background(), hub, conn)
 }
 
@@ -311,10 +317,10 @@ func (h *WebSocketHandler) startContainerLogHub(containerID, format string, batc
 	go ls.hub.Run(ctx)
 
 	lines := make(chan string, 256)
-	go func() {
+	go func(ctx context.Context) {
 		defer close(lines)
 		_ = h.containerService.StreamLogs(ctx, containerID, lines, follow, tail, since, timestamps)
-	}()
+	}(ctx)
 
 	if format == "json" {
 		msgs := make(chan ws.LogMessage, 256)
@@ -368,6 +374,9 @@ func (h *WebSocketHandler) ContainerStats(c *gin.Context) {
 	}
 
 	hub := h.startContainerStatsHub(containerID)
+	// WebSocket connections use context.Background() because they are long-lived and should not
+	// be tied to the HTTP request context. Cleanup is handled via the hub's OnEmpty callback
+	// which triggers when all clients disconnect.
 	ws.ServeClient(context.Background(), hub, conn)
 }
 
@@ -384,10 +393,10 @@ func (h *WebSocketHandler) startContainerStatsHub(containerID string) *ws.Hub {
 	go hub.Run(ctx)
 
 	statsChan := make(chan interface{}, 64)
-	go func() {
+	go func(ctx context.Context) {
 		defer close(statsChan)
 		_ = h.containerService.StreamStats(ctx, containerID, statsChan)
-	}()
+	}(ctx)
 
 	go func() {
 		for {
@@ -457,6 +466,12 @@ func (h *WebSocketHandler) ContainerExec(c *gin.Context) {
 		defer close(done)
 		buf := make([]byte, 4096)
 		for {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+			}
+
 			n, err := stdout.Read(buf)
 			if err != nil {
 				return
@@ -472,6 +487,12 @@ func (h *WebSocketHandler) ContainerExec(c *gin.Context) {
 	// Read from websocket, write to container
 	go func() {
 		for {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+			}
+
 			_, data, err := conn.ReadMessage()
 			if err != nil {
 				cancel()

backend/internal/bootstrap/bootstrap.go

@@ -32,7 +32,7 @@ func Bootstrap(ctx context.Context) error {
 	appCtx, cancelApp := context.WithCancel(ctx)
 	defer cancelApp()
 
-	db, err := initializeDBAndMigrate(cfg)
+	db, err := initializeDBAndMigrate(appCtx, cfg)
 	if err != nil {
 		return fmt.Errorf("failed to initialize database: %w", err)
 	}
@@ -46,6 +46,9 @@ func Bootstrap(ctx context.Context) error {
 	}(appCtx)
 
 	httpClient := httputils.NewHTTPClient()
+	if cfg.HTTPClientTimeout > 0 {
+		httpClient = httputils.NewHTTPClientWithTimeout(time.Duration(cfg.HTTPClientTimeout) * time.Second)
+	}
 
 	appServices, dockerClientService, err := initializeServices(appCtx, db, cfg, httpClient)
 	if err != nil {

backend/internal/bootstrap/db_bootstrap.go

@@ -1,15 +1,16 @@
 package bootstrap
 
 import (
+	"context"
 	"fmt"
 	"log/slog"
 
 	"github.com/getarcaneapp/arcane/backend/internal/config"
 	"github.com/getarcaneapp/arcane/backend/internal/database"
 )
 
-func initializeDBAndMigrate(cfg *config.Config) (*database.DB, error) {
-	db, err := database.Initialize(cfg.DatabaseURL)
+func initializeDBAndMigrate(ctx context.Context, cfg *config.Config) (*database.DB, error) {
+	db, err := database.Initialize(ctx, cfg.DatabaseURL)
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize database: %w", err)
 	}

backend/internal/bootstrap/services_bootstrap.go

@@ -56,7 +56,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Config
 	svcs.CustomizeSearch = services.NewCustomizeSearchService()
 	svcs.AppImages = services.NewApplicationImagesService(resources.FS, svcs.Settings)
 	svcs.Font = services.NewFontService(resources.FS)
-	dockerClient := services.NewDockerClientService(db, cfg)
+	dockerClient := services.NewDockerClientService(db, cfg, svcs.Settings)
 	svcs.Docker = dockerClient
 	svcs.User = services.NewUserService(db)
 	svcs.ContainerRegistry = services.NewContainerRegistryService(db)
@@ -65,19 +65,19 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Config
 	svcs.ImageUpdate = services.NewImageUpdateService(db, svcs.Settings, svcs.ContainerRegistry, svcs.Docker, svcs.Event, svcs.Notification)
 	svcs.Image = services.NewImageService(db, svcs.Docker, svcs.ContainerRegistry, svcs.ImageUpdate, svcs.Event)
 	svcs.Project = services.NewProjectService(db, svcs.Settings, svcs.Event, svcs.Image, svcs.Docker)
-	svcs.Environment = services.NewEnvironmentService(db, httpClient, svcs.Docker, svcs.Event)
-	svcs.Container = services.NewContainerService(db, svcs.Event, svcs.Docker, svcs.Image)
-	svcs.Volume = services.NewVolumeService(db, svcs.Docker, svcs.Event)
+	svcs.Environment = services.NewEnvironmentService(db, httpClient, svcs.Docker, svcs.Event, svcs.Settings)
+	svcs.Container = services.NewContainerService(db, svcs.Event, svcs.Docker, svcs.Image, svcs.Settings)
+	svcs.Volume = services.NewVolumeService(db, svcs.Docker, svcs.Event, svcs.Settings)
 	svcs.Network = services.NewNetworkService(db, svcs.Docker, svcs.Event)
 	svcs.Template = services.NewTemplateService(ctx, db, httpClient, svcs.Settings)
 	svcs.Auth = services.NewAuthService(svcs.User, svcs.Settings, svcs.Event, cfg.JWTSecret, cfg)
 	svcs.Oidc = services.NewOidcService(svcs.Auth, cfg, httpClient)
 	svcs.ApiKey = services.NewApiKeyService(db, svcs.User)
 	svcs.System = services.NewSystemService(db, svcs.Docker, svcs.Container, svcs.Image, svcs.Volume, svcs.Network, svcs.Settings)
 	svcs.Version = services.NewVersionService(httpClient, cfg.UpdateCheckDisabled, config.Version, config.Revision, svcs.ContainerRegistry, svcs.Docker)
-	svcs.SystemUpgrade = services.NewSystemUpgradeService(svcs.Docker, svcs.Version, svcs.Event)
+	svcs.SystemUpgrade = services.NewSystemUpgradeService(svcs.Docker, svcs.Version, svcs.Event, svcs.Settings)
 	svcs.Updater = services.NewUpdaterService(db, svcs.Settings, svcs.Docker, svcs.Project, svcs.ImageUpdate, svcs.ContainerRegistry, svcs.Event, svcs.Image, svcs.Notification, svcs.SystemUpgrade)
-	svcs.GitRepository = services.NewGitRepositoryService(db, cfg.GitWorkDir, svcs.Event)
+	svcs.GitRepository = services.NewGitRepositoryService(db, cfg.GitWorkDir, svcs.Event, svcs.Settings)
 	svcs.GitOpsSync = services.NewGitOpsSyncService(db, svcs.GitRepository, svcs.Project, svcs.Event)
 
 	return svcs, dockerClient, nil

backend/internal/config/config.go

@@ -53,10 +53,17 @@ type Config struct {
 	GPUMonitoringEnabled    bool   `env:"GPU_MONITORING_ENABLED" default:"false"`
 	GPUType                 string `env:"GPU_TYPE" default:"auto"`
 
-	FilePerm             os.FileMode `env:"FILE_PERM" default:"0644"`
-	DirPerm              os.FileMode `env:"DIR_PERM" default:"0755"`
-	AllowedExternalPaths string      `env:"ALLOWED_EXTERNAL_PATHS" default:""`
-	GitWorkDir           string      `env:"GIT_WORK_DIR" default:"data/git"`
+	FilePerm   os.FileMode `env:"FILE_PERM" default:"0644"`
+	DirPerm    os.FileMode `env:"DIR_PERM" default:"0755"`
+  AllowedExternalPaths string      `env:"ALLOWED_EXTERNAL_PATHS" default:""`
+	GitWorkDir string      `env:"GIT_WORK_DIR" default:"data/git"`
+
+	DockerAPITimeout       int `env:"DOCKER_API_TIMEOUT" default:"0"`
+	DockerImagePullTimeout int `env:"DOCKER_IMAGE_PULL_TIMEOUT" default:"0"`
+	GitOperationTimeout    int `env:"GIT_OPERATION_TIMEOUT" default:"0"`
+	HTTPClientTimeout      int `env:"HTTP_CLIENT_TIMEOUT" default:"0"`
+	RegistryTimeout        int `env:"REGISTRY_TIMEOUT" default:"0"`
+	ProxyRequestTimeout    int `env:"PROXY_REQUEST_TIMEOUT" default:"0"`
 }
 
 func Load() *Config {
@@ -200,6 +207,11 @@ func setFieldValue(field reflect.Value, value string) {
 			field.SetUint(i)
 		}
 
+	case reflect.Int:
+		if i, err := strconv.Atoi(value); err == nil {
+			field.SetInt(int64(i))
+		}
+
 	default:
 		// Handle custom types based on underlying kind
 		if field.Type().ConvertibleTo(reflect.TypeFor[string]()) {

backend/internal/database/database.go

@@ -1,6 +1,7 @@
 package database
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"log/slog"
@@ -35,12 +36,16 @@ func SetGormLogger(l logger.Interface) {
 	customGormLogger = l
 }
 
-func Initialize(databaseURL string) (*DB, error) {
-	db, err := connectDatabase(databaseURL)
+func Initialize(ctx context.Context, databaseURL string) (*DB, error) {
+	db, err := connectDatabase(ctx, databaseURL)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to database: %w", err)
 	}
 
+	if err := ctx.Err(); err != nil {
+		return nil, err
+	}
+
 	// Get underlying sql.DB for migrations
 	sqlDB, err := db.DB.DB()
 	if err != nil {
@@ -86,7 +91,7 @@ func Initialize(databaseURL string) (*DB, error) {
 	return db, nil
 }
 
-func connectDatabase(databaseURL string) (*DB, error) {
+func connectDatabase(ctx context.Context, databaseURL string) (*DB, error) {
 	var dialector gorm.Dialector
 
 	switch {
@@ -109,6 +114,9 @@ func connectDatabase(databaseURL string) (*DB, error) {
 	var db *gorm.DB
 	var err error
 	for i := 1; i <= 3; i++ {
+		if err := ctx.Err(); err != nil {
+			return nil, err
+		}
 		db, err = gorm.Open(dialector, &gorm.Config{
 			Logger: customGormLogger,
 			NowFunc: func() time.Time {
@@ -123,7 +131,11 @@ func connectDatabase(databaseURL string) (*DB, error) {
 
 		slog.Info("Failed to initialize database", "attempt", i)
 		if i < 3 {
-			time.Sleep(3 * time.Second)
+			select {
+			case <-time.After(3 * time.Second):
+			case <-ctx.Done():
+				return nil, ctx.Err()
+			}
 		}
 	}
 

backend/internal/models/settings.go

@@ -104,6 +104,14 @@ type Settings struct {
 
 	// API Keys category (admin management page - no actual settings)
 	ApiKeysCategoryPlaceholder SettingVariable `key:"apiKeysCategory,internal" meta:"label=API Keys;type=internal;keywords=api,keys,tokens,authentication,access,programmatic,integration;category=apikeys;description=Manage API keys for programmatic access" catmeta:"id=apikeys;title=API Keys;icon=apikey;url=/settings/api-keys;description=Create and manage API keys for programmatic access to Arcane"`
+
+	// Timeout category
+	DockerAPITimeout       SettingVariable `key:"dockerApiTimeout,envOverride" meta:"label=Docker API Timeout;type=number;keywords=docker,api,timeout,seconds,list,operations;category=timeouts;description=Timeout for Docker list operations in seconds (default: 30)" catmeta:"id=timeouts;title=Timeouts;icon=clock;url=/settings/timeouts;description=Configure operation timeouts for slow networks or hardware"`
+	DockerImagePullTimeout SettingVariable `key:"dockerImagePullTimeout,envOverride" meta:"label=Docker Image Pull Timeout;type=number;keywords=docker,image,pull,timeout,seconds,download;category=timeouts;description=Timeout for Docker image pulls in seconds (default: 600 = 10 minutes)"`
+	GitOperationTimeout    SettingVariable `key:"gitOperationTimeout,envOverride" meta:"label=Git Operation Timeout;type=number;keywords=git,clone,timeout,seconds,repository;category=timeouts;description=Timeout for Git clone/fetch operations in seconds (default: 300 = 5 minutes)"`
+	HTTPClientTimeout      SettingVariable `key:"httpClientTimeout,envOverride" meta:"label=HTTP Client Timeout;type=number;keywords=http,client,timeout,seconds,api,request;category=timeouts;description=Default timeout for HTTP requests in seconds (default: 30)"`
+	RegistryTimeout        SettingVariable `key:"registryTimeout,envOverride" meta:"label=Registry Timeout;type=number;keywords=registry,timeout,seconds,docker,auth;category=timeouts;description=Timeout for container registry operations in seconds (default: 30)"`
+	ProxyRequestTimeout    SettingVariable `key:"proxyRequestTimeout,envOverride" meta:"label=Proxy Request Timeout;type=number;keywords=proxy,request,timeout,seconds,forward;category=timeouts;description=Timeout for proxied requests in seconds (default: 60)"`
 }
 
 func (SettingVariable) TableName() string {

backend/internal/services/container_service.go

@@ -17,20 +17,28 @@ import (
 	"github.com/getarcaneapp/arcane/backend/internal/database"
 	"github.com/getarcaneapp/arcane/backend/internal/models"
 	"github.com/getarcaneapp/arcane/backend/internal/utils/pagination"
+	"github.com/getarcaneapp/arcane/backend/internal/utils/timeouts"
 	containertypes "github.com/getarcaneapp/arcane/types/container"
 	"github.com/getarcaneapp/arcane/types/containerregistry"
 	imagetypes "github.com/getarcaneapp/arcane/types/image"
 )
 
 type ContainerService struct {
-	db            *database.DB
-	dockerService *DockerClientService
-	eventService  *EventService
-	imageService  *ImageService
+	db              *database.DB
+	dockerService   *DockerClientService
+	eventService    *EventService
+	imageService    *ImageService
+	settingsService *SettingsService
 }
 
-func NewContainerService(db *database.DB, eventService *EventService, dockerService *DockerClientService, imageService *ImageService) *ContainerService {
-	return &ContainerService{db: db, eventService: eventService, dockerService: dockerService, imageService: imageService}
+func NewContainerService(db *database.DB, eventService *EventService, dockerService *DockerClientService, imageService *ImageService, settingsService *SettingsService) *ContainerService {
+	return &ContainerService{
+		db:              db,
+		eventService:    eventService,
+		dockerService:   dockerService,
+		imageService:    imageService,
+		settingsService: settingsService,
+	}
 }
 
 func (s *ContainerService) StartContainer(ctx context.Context, containerID string, user models.User) error {
@@ -193,8 +201,16 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containe
 			pullOptions = image.PullOptions{}
 		}
 
-		reader, pullErr := dockerClient.ImagePull(ctx, config.Image, pullOptions)
+		settings := s.settingsService.GetSettingsConfig()
+		pullCtx, pullCancel := timeouts.WithTimeout(ctx, settings.DockerImagePullTimeout.AsInt(), timeouts.DefaultDockerImagePull)
+		defer pullCancel()
+
+		reader, pullErr := dockerClient.ImagePull(pullCtx, config.Image, pullOptions)
 		if pullErr != nil {
+			if errors.Is(pullCtx.Err(), context.DeadlineExceeded) {
+				s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", pullErr, models.JSON{"action": "create", "image": config.Image, "step": "pull_image_timeout"})
+				return nil, fmt.Errorf("image pull timed out for %s (increase DOCKER_IMAGE_PULL_TIMEOUT or setting)", config.Image)
+			}
 			s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", pullErr, models.JSON{"action": "create", "image": config.Image, "step": "pull_image"})
 			return nil, fmt.Errorf("failed to pull image %s: %w", config.Image, pullErr)
 		}