Skip to content

Modern Docker Management, Designed for Everyone

fix: add option for trivy scan timeout (#1749)

Kyle Mendell581184f1703d
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index 6f9afb5c5..cc6d9150c 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -66,6 +66,7 @@ type Config struct {
DockerAPITimeout int `env:"DOCKER_API_TIMEOUT" default:"0"`
DockerImagePullTimeout int `env:"DOCKER_IMAGE_PULL_TIMEOUT" default:"0"`
+ TrivyScanTimeout int `env:"TRIVY_SCAN_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"`
diff --git a/backend/internal/models/settings.go b/backend/internal/models/settings.go
index 148f8e918..18f715de5 100644
--- a/backend/internal/models/settings.go
+++ b/backend/internal/models/settings.go
@@ -121,6 +121,7 @@ type Settings struct {
// 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)"`
+ TrivyScanTimeout SettingVariable `key:"trivyScanTimeout,envOverride" meta:"label=Trivy Scan Timeout;type=number;keywords=trivy,vulnerability,scan,timeout,seconds,cve;category=timeouts;description=Timeout for Trivy image scans in seconds (default: 900 = 15 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)"`
diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.go
index f081d5bec..87347f538 100644
--- a/backend/internal/services/settings_service.go
+++ b/backend/internal/services/settings_service.go
@@ -138,6 +138,7 @@ func (s *SettingsService) getDefaultSettings() *models.Settings {
DockerAPITimeout: models.SettingVariable{Value: "30"},
DockerImagePullTimeout: models.SettingVariable{Value: "600"},
+ TrivyScanTimeout: models.SettingVariable{Value: "900"},
GitOperationTimeout: models.SettingVariable{Value: "300"},
HTTPClientTimeout: models.SettingVariable{Value: "30"},
RegistryTimeout: models.SettingVariable{Value: "30"},
@@ -509,6 +510,7 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates settings.U
var timeoutSettingKeys = []string{
"dockerApiTimeout",
"dockerImagePullTimeout",
+ "trivyScanTimeout",
"gitOperationTimeout",
"httpClientTimeout",
"registryTimeout",
diff --git a/backend/internal/services/settings_service_test.go b/backend/internal/services/settings_service_test.go
index 3983b836b..7114138a2 100644
--- a/backend/internal/services/settings_service_test.go
+++ b/backend/internal/services/settings_service_test.go
@@ -108,6 +108,24 @@ func TestSettingsService_GetSettings_EnvOverride_OidcMergeAccounts(t *testing.T)
require.True(t, settings2.OidcMergeAccounts.IsTrue())
}
+func TestSettingsService_GetSettings_EnvOverride_TrivyScanTimeout(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ settings1, err := svc.GetSettings(ctx)
+ require.NoError(t, err)
+ require.Equal(t, 900, settings1.TrivyScanTimeout.AsInt())
+
+ t.Setenv("TRIVY_SCAN_TIMEOUT", "1800")
+ settings2, err := svc.GetSettings(ctx)
+ require.NoError(t, err)
+ require.Equal(t, 1800, settings2.TrivyScanTimeout.AsInt())
+}
+
func TestSettingsService_isEnvOverrideActiveInternal(t *testing.T) {
ctx := context.Background()
db := setupSettingsTestDB(t)
@@ -293,6 +311,26 @@ func TestSettingsService_UpdateSettings_RefreshesCache(t *testing.T) {
require.True(t, found, "projectsDirectory setting not found in cached list")
}
+func TestSettingsService_UpdateSettings_TimeoutCallbackIncludesTrivyScanTimeout(t *testing.T) {
+ ctx := context.Background()
+ db := setupSettingsTestDB(t)
+ svc, err := NewSettingsService(ctx, db)
+ require.NoError(t, err)
+ require.NoError(t, svc.EnsureDefaultSettings(ctx))
+
+ var callbackPayload map[string]string
+ svc.OnTimeoutSettingsChanged = func(_ context.Context, timeoutSettings map[string]string) {
+ callbackPayload = timeoutSettings
+ }
+
+ newTimeout := "1200"
+ _, err = svc.UpdateSettings(ctx, settings.Update{TrivyScanTimeout: &newTimeout})
+ require.NoError(t, err)
+
+ require.NotNil(t, callbackPayload)
+ require.Equal(t, "1200", callbackPayload["trivyScanTimeout"])
+}
+
func TestSettingsService_LoadDatabaseSettings_InternalKeys_EnvMode(t *testing.T) {
// Set env + disable flag
t.Setenv("UI_CONFIGURATION_DISABLED", "true")
diff --git a/backend/internal/services/vulnerability_service.go b/backend/internal/services/vulnerability_service.go
index f19d163be..d88bdb7e6 100644
--- a/backend/internal/services/vulnerability_service.go
+++ b/backend/internal/services/vulnerability_service.go
@@ -914,8 +914,10 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, con
return nil, fmt.Errorf("failed to connect to Docker: %w", err)
}
+ trivyTimeout := s.getTrivyScanTimeoutArg()
+
execCfg := containertypes.ExecOptions{
- Cmd: []string{"trivy", "image", "--format", "json", "--quiet", imageName},
+ Cmd: []string{"trivy", "image", "--format", "json", "--quiet", "--timeout", trivyTimeout, imageName},
AttachStdout: true,
AttachStderr: true,
}
@@ -950,6 +952,9 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, con
if errMsg == "" {
errMsg = fmt.Sprintf("exit status %d", execInspect.ExitCode)
}
+ if strings.Contains(strings.ToLower(errMsg), "deadline exceeded") {
+ return nil, fmt.Errorf("trivy scan timed out for %s (increase TRIVY_SCAN_TIMEOUT or trivyScanTimeout setting)", imageName)
+ }
return nil, fmt.Errorf("trivy scan failed: %s", errMsg)
}
@@ -1134,6 +1139,15 @@ func (s *VulnerabilityService) getTrivyImageRef() string {
return override
}
+func (s *VulnerabilityService) getTrivyScanTimeoutArg() string {
+ timeoutSeconds := 0
+ if s.settingsService != nil {
+ timeoutSeconds = s.settingsService.GetSettingsConfig().TrivyScanTimeout.AsInt()
+ }
+
+ return timeouts.GetDuration(timeoutSeconds, timeouts.DefaultTrivyScan).String()
+}
+
func (s *VulnerabilityService) ensureTrivyImageInternal(ctx context.Context) (string, error) {
dockerClient, err := s.dockerService.GetClient()
if err != nil {
@@ -1249,7 +1263,7 @@ func (s *VulnerabilityService) buildTrivyCommandArgs(
configContent string,
ignoreContent string,
) ([]string, []string) {
- cmdArgs := []string{"image", "--format", "json", "--quiet"}
+ cmdArgs := []string{"image", "--format", "json", "--quiet", "--timeout", s.getTrivyScanTimeoutArg()}
var tempFiles []string
if strings.TrimSpace(configContent) != "" {
@@ -1447,6 +1461,9 @@ func (s *VulnerabilityService) runTrivyScan(ctx context.Context, trivyImage stri
if errMsg == "" {
errMsg = fmt.Sprintf("exit status %d", statusCode)
}
+ if strings.Contains(strings.ToLower(errMsg), "deadline exceeded") {
+ return nil, fmt.Errorf("trivy scan timed out for %s (increase TRIVY_SCAN_TIMEOUT or trivyScanTimeout setting)", imageName)
+ }
return nil, fmt.Errorf("trivy scan failed: %s", errMsg)
}
diff --git a/backend/internal/utils/timeouts/timeouts.go b/backend/internal/utils/timeouts/timeouts.go
index 3955a8cbd..587db3f19 100644
--- a/backend/internal/utils/timeouts/timeouts.go
+++ b/backend/internal/utils/timeouts/timeouts.go
@@ -8,6 +8,7 @@ import (
const (
DefaultDockerAPI = 30 * time.Second
DefaultDockerImagePull = 10 * time.Minute
+ DefaultTrivyScan = 15 * time.Minute
DefaultGitOperation = 5 * time.Minute
DefaultHTTPClient = 30 * time.Second
DefaultRegistry = 30 * time.Second
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 3c9879b58..2a6a55466 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1139,6 +1139,8 @@
"docker_api_timeout_description": "Timeout for Docker list operations in seconds (default: 30)",
"docker_image_pull_timeout": "Docker Image Pull Timeout",
"docker_image_pull_timeout_description": "Timeout for Docker image pulls in seconds (default: 600 = 10 minutes)",
+ "trivy_scan_timeout": "Trivy Scan Timeout",
+ "trivy_scan_timeout_description": "Timeout for Trivy vulnerability scans on Docker images.",
"git_operation_timeout": "Git Operation Timeout",
"git_operation_timeout_description": "Timeout for Git clone/fetch operations in seconds (default: 300 = 5 minutes)",
"http_client_timeout": "HTTP Client Timeout",
diff --git a/frontend/src/lib/types/settings.type.ts b/frontend/src/lib/types/settings.type.ts
index 5d4a818dc..2c16719df 100644
--- a/frontend/src/lib/types/settings.type.ts
+++ b/frontend/src/lib/types/settings.type.ts
@@ -53,6 +53,7 @@ export type Settings = {
dockerApiTimeout: number;
dockerImagePullTimeout: number;
+ trivyScanTimeout: number;
gitOperationTimeout: number;
httpClientTimeout: number;
registryTimeout: number;
diff --git a/frontend/src/routes/(app)/settings/timeouts/+page.svelte b/frontend/src/routes/(app)/settings/timeouts/+page.svelte
index 1b167871a..be8c59827 100644
--- a/frontend/src/routes/(app)/settings/timeouts/+page.svelte
+++ b/frontend/src/routes/(app)/settings/timeouts/+page.svelte
@@ -17,6 +17,7 @@
const formSchema = z.object({
dockerApiTimeout: z.coerce.number().int().min(1).max(3600),
dockerImagePullTimeout: z.coerce.number().int().min(30).max(7200),
+ trivyScanTimeout: z.coerce.number().int().min(60).max(14400),
gitOperationTimeout: z.coerce.number().int().min(30).max(3600),
httpClientTimeout: z.coerce.number().int().min(5).max(300),
registryTimeout: z.coerce.number().int().min(5).max(300),
@@ -88,6 +89,25 @@
</div>
</div>
</div>
+
+ <div class="border-t pt-6">
+ <div class="grid gap-4 md:grid-cols-[1fr_1.5fr] md:gap-8">
+ <div>
+ <Label class="text-base">{m.trivy_scan_timeout()}</Label>
+ <p class="text-muted-foreground mt-1 text-sm">{m.trivy_scan_timeout_description()}</p>
+ </div>
+ <div class="max-w-xs">
+ <TextInputWithLabel
+ bind:value={$formInputs.trivyScanTimeout.value}
+ error={$formInputs.trivyScanTimeout.error}
+ label={m.trivy_scan_timeout()}
+ placeholder="900"
+ helpText="Timeout in seconds (60-14400)"
+ type="number"
+ />
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
diff --git a/types/settings/settings.go b/types/settings/settings.go
index 77b4d371a..eb761229e 100644
--- a/types/settings/settings.go
+++ b/types/settings/settings.go
@@ -267,6 +267,11 @@ type Update struct {
// Required: false
DockerImagePullTimeout *string `json:"dockerImagePullTimeout,omitempty"`
+ // TrivyScanTimeout is the timeout for Trivy image vulnerability scans in seconds.
+ //
+ // Required: false
+ TrivyScanTimeout *string `json:"trivyScanTimeout,omitempty"`
+
// GitOperationTimeout is the timeout for Git clone/fetch operations in seconds.
//
// Required: false