Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add trivy config and ignore file settings for vulnerability scans (#3949)
Kyle Mendelleff16eb5688e
diff --git a/backend/internal/settings/handler.go b/backend/internal/settings/handler.goindex 37ceb53b2..25b2c7314 100644--- a/backend/internal/settings/handler.go+++ b/backend/internal/settings/handler.go@@ -26,6 +26,7 @@ import ("github.com/getarcaneapp/arcane/types/v2/category"searchtypes "github.com/getarcaneapp/arcane/types/v2/search"settingstypes "github.com/getarcaneapp/arcane/types/v2/settings"+ "go.yaml.in/yaml/v4")const (@@ -374,6 +375,16 @@ func (h *SettingsHandler) validateSettingsUpdateInput(input settingstypes.Update}}+ if input.TrivyConfig != nil && strings.TrimSpace(*input.TrivyConfig) != "" {+ var doc map[string]any+ if err := yaml.Unmarshal([]byte(*input.TrivyConfig), &doc); err != nil {+ return huma.Error400BadRequest("trivyConfig must be a YAML mapping: " + err.Error())+ }+ if doc == nil {+ return huma.Error400BadRequest("trivyConfig must be a YAML mapping")+ }+ }+return nil}diff --git a/backend/internal/vulnerability/service_test.go b/backend/internal/vulnerability/service_test.goindex 544536434..03e5be454 100644--- a/backend/internal/vulnerability/service_test.go+++ b/backend/internal/vulnerability/service_test.go@@ -64,9 +64,8 @@ func TestBuildTrivyCommandArgs_WithCacheDir(t *testing.T) {svc := &VulnerabilityService{}outputPath := "/tmp/trivy-result-test.json"- cmdArgs, tempFiles := svc.buildTrivyCommandArgs(context.Background(), "alpine:3.20", "", "", "/tmp/trivy-cache", outputPath)+ cmdArgs := svc.buildTrivyCommandArgs("alpine:3.20", "/tmp/trivy-cache", outputPath, nil)- require.Empty(t, tempFiles)require.Contains(t, cmdArgs, "--cache-dir")require.Contains(t, cmdArgs, "/tmp/trivy-cache")require.Contains(t, cmdArgs, "--output")@@ -78,9 +77,8 @@ func TestBuildTrivyCommandArgs_WithoutCacheDir(t *testing.T) {svc := &VulnerabilityService{}outputPath := "/tmp/trivy-result-test.json"- cmdArgs, tempFiles := svc.buildTrivyCommandArgs(context.Background(), "alpine:3.20", "", "", "", outputPath)+ cmdArgs := svc.buildTrivyCommandArgs("alpine:3.20", "", outputPath, nil)- require.Empty(t, tempFiles)require.NotContains(t, cmdArgs, "--cache-dir")require.Contains(t, cmdArgs, "--output")require.Contains(t, cmdArgs, outputPath)@@ -89,7 +87,7 @@ func TestBuildTrivyCommandArgs_WithoutCacheDir(t *testing.T) {func TestBuildTrivyCommandArgs_IncludesDefaultRepositories(t *testing.T) {svc := &VulnerabilityService{}- cmdArgs, _ := svc.buildTrivyCommandArgs(context.Background(), "alpine:3.20", "", "", "", "/tmp/out.json")+ cmdArgs := svc.buildTrivyCommandArgs("alpine:3.20", "", "/tmp/out.json", nil)require.Contains(t, cmdArgs, "--db-repository")require.Contains(t, cmdArgs, "ghcr.io/"+vuln.DBRepository)diff --git a/backend/internal/vulnerability/vulnerability_feature_test.go b/backend/internal/vulnerability/vulnerability_feature_test.goindex 8d67421ca..dd3243a28 100644--- a/backend/internal/vulnerability/vulnerability_feature_test.go+++ b/backend/internal/vulnerability/vulnerability_feature_test.go@@ -60,7 +60,7 @@ func TestVulnerabilityFeatureDisabledRejectsScansAndRetainsReports(t *testing.T)require.ErrorIs(t, err, common.ErrFeatureDisabled)_, _, err = svc.ScanAllImages(t.Context(), "0", common.User{}, false)require.ErrorIs(t, err, common.ErrFeatureDisabled)- _, _, err = svc.setupTrivyBatchContainersInternal(t.Context(), 1)+ _, _, _, err = svc.setupTrivyBatchContainersInternal(t.Context(), 1)require.ErrorIs(t, err, common.ErrFeatureDisabled)summaries, err := svc.GetScanSummariesByImageIDs(t.Context(), []string{"test-image"})require.NoError(t, err)@@ -148,7 +148,7 @@ func TestDisabledScheduledItemPreservesPreviousResult(t *testing.T) {svc := &VulnerabilityService{settingsService: settingsSvc, db: db}require.NoError(t, db.Create(&VulnerabilityScanRecord{ID: "test-image", Status: ScanStatusCompleted, ScanTime: time.Now()}).Error)require.NoError(t, settingsSvc.SetBoolSetting(t.Context(), features.VulnerabilityManagementSettingKey, false))- status := svc.scanSingleImage(t.Context(), nil, "test-image", "test:latest", "", "0", common.User{}, newScheduledScanNotificationSummary())+ status := svc.scanSingleImage(t.Context(), nil, "test-image", "test:latest", "", "0", common.User{}, newScheduledScanNotificationSummary(), nil)require.Equal(t, scanStatusSkipped, status)var scan VulnerabilityScanRecordrequire.NoError(t, db.First(&scan, "id = ?", "test-image").Error)diff --git a/backend/internal/vulnerability/vulnerability_scan.go b/backend/internal/vulnerability/vulnerability_scan.goindex 96ef0f2fb..125a193b4 100644--- a/backend/internal/vulnerability/vulnerability_scan.go+++ b/backend/internal/vulnerability/vulnerability_scan.go@@ -442,6 +442,7 @@ func (s *VulnerabilityService) runScheduledImageScanInternal(ctx context.Context,containerPool chan string,imageName, imageID, scannerVersion string,+ files map[string][]byte,) (*vulnerability.ScanResult, int64, error) {startTime := time.Now()slotID, releaseSlot, slotErr := s.acquireTrivyScanSlotInternal(ctx, "", true)@@ -461,7 +462,7 @@ func (s *VulnerabilityService) runScheduledImageScanInternal(if err := s.settingsService.RequireFeature(ctx, features.VulnerabilityManagement); err != nil {return nil, 0, err}- result, scanErr := s.execTrivyScanInContainer(ctx, containerID, imageName, imageID, scannerVersion, slotID)+ result, scanErr := s.execTrivyScanInContainer(ctx, containerID, imageName, imageID, scannerVersion, slotID, files)return result, time.Since(startTime).Milliseconds(), scanErr}@@ -598,7 +599,7 @@ func (s *VulnerabilityService) ScanAllImages(ctx context.Context, envID string,}concurrency := s.getTrivyConcurrentScanContainersInternal()- containerIDs, cleanup, err := s.setupTrivyBatchContainersInternal(ctx, concurrency)+ containerIDs, files, cleanup, err := s.setupTrivyBatchContainersInternal(ctx, concurrency)if err != nil {return 0, 0, err}@@ -625,7 +626,7 @@ func (s *VulnerabilityService) ScanAllImages(ctx context.Context, envID string,featureStopped.Store(true)return nil}- switch s.scanSingleImage(gctx, containerPool, target.imageID, target.imageName, scannerVersion, envID, user, notificationSummary) {+ switch s.scanSingleImage(gctx, containerPool, target.imageID, target.imageName, scannerVersion, envID, user, notificationSummary, files) {case scanStatusSuccess:scannedCount.Add(1)case scanStatusFailed:diff --git a/backend/internal/vulnerability/vulnerability_trivy.go b/backend/internal/vulnerability/vulnerability_trivy.goindex fe1eedbd3..aa4a55bed 100644--- a/backend/internal/vulnerability/vulnerability_trivy.go+++ b/backend/internal/vulnerability/vulnerability_trivy.go@@ -168,18 +168,18 @@ const (scanStatusSkipped)-func (s *VulnerabilityService) setupTrivyBatchContainersInternal(ctx context.Context, count int) ([]string, func(), error) {+func (s *VulnerabilityService) setupTrivyBatchContainersInternal(ctx context.Context, count int) ([]string, map[string][]byte, func(), error) {if err := s.settingsService.RequireFeature(ctx, features.VulnerabilityManagement); err != nil {- return nil, nil, err+ return nil, nil, nil, err}dockerClient, err := s.dockerService.GetClient(ctx)if err != nil {- return nil, nil, errors.WrapIf(err, "failed to connect to Docker")+ return nil, nil, nil, errors.WrapIf(err, "failed to connect to Docker")}scannerImage, err := s.ensureTrivyImageInternal(ctx)if err != nil {- return nil, nil, errors.WrapIf(err, "trivy scanner not available")+ return nil, nil, nil, errors.WrapIf(err, "trivy scanner not available")}serverURL, _ := s.getTrivyServerConfig()@@ -187,10 +187,11 @@ func (s *VulnerabilityService) setupTrivyBatchContainersInternal(ctx context.Conif serverURL == "" {cacheVolume, err = s.ensureTrivyCacheVolumeInternal(ctx)if err != nil {- return nil, nil, errors.WrapIf(err, "failed to ensure trivy cache volume")+ return nil, nil, nil, errors.WrapIf(err, "failed to ensure trivy cache volume")}}+ files := s.trivyContainerFilesInternal(ctx)containerIDs := make([]string, 0, max(count, 1))cleanup := func() {for _, containerID := range containerIDs {@@ -199,15 +200,15 @@ func (s *VulnerabilityService) setupTrivyBatchContainersInternal(ctx context.Con}for range max(count, 1) {- containerID, createErr := s.createBatchTrivyContainer(ctx, scannerImage, cacheVolume)+ containerID, createErr := s.createBatchTrivyContainer(ctx, scannerImage, cacheVolume, files)if createErr != nil {cleanup()- return nil, nil, errors.WrapIf(createErr, "failed to create batch trivy container")+ return nil, nil, nil, errors.WrapIf(createErr, "failed to create batch trivy container")}containerIDs = append(containerIDs, containerID)}- return containerIDs, cleanup, nil+ return containerIDs, files, cleanup, nil}func (s *VulnerabilityService) scanSingleImage(@@ -216,10 +217,11 @@ func (s *VulnerabilityService) scanSingleImage(imageID, imageName, scannerVersion, envID string,user common.User,notificationSummary *scheduledScanNotificationSummary,+ files map[string][]byte,) scanResultStatus {slog.InfoContext(ctx, "scheduled vulnerability scan: scanning image", "image", imageName, "imageId", imageID)- result, duration, scanErr := s.runScheduledImageScanInternal(ctx, containerPool, imageName, imageID, scannerVersion)+ result, duration, scanErr := s.runScheduledImageScanInternal(ctx, containerPool, imageName, imageID, scannerVersion, files)if scanErr != nil {if errors.Is(scanErr, common.ErrFeatureDisabled) {return scanStatusSkipped@@ -236,7 +238,7 @@ func (s *VulnerabilityService) scanSingleImage(// createBatchTrivyContainer creates a long-running Trivy container that stays// alive so we can exec individual scan commands into it. This avoids the// overhead of creating/starting/removing a container for every image.-func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, scannerImage, cacheVolume string) (string, error) {+func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, scannerImage, cacheVolume string, files map[string][]byte) (string, error) {dockerClient, err := s.dockerService.GetClient(ctx)if err != nil {return "", errors.WrapIf(err, "failed to connect to Docker")@@ -247,9 +249,8 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, screturn "", err}- registryConfigJSON := s.buildTrivyRegistryConfigInternal(ctx)env := append([]string(nil), runtimeOptions.ContainerEnv...)- if len(registryConfigJSON) > 0 {+ if files[vuln.RegistryConfigFile] != nil {env = append(env, "DOCKER_CONFIG="+vuln.RegistryConfigDir)// ECR tokens are refreshed when the batch container is created; a multi-hour// batch could outlive the token and fall back to anonymous pulls.@@ -271,7 +272,7 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, scresources, cpuSet, applyLimits := s.getTrivyContainerResourceOptionsInternal(ctx, dockerClient)vuln.ApplyContainerResources(hostConfig, resources, cpuSet, applyLimits)- containerID, err := s.createAndStartTrivyContainerInternal(ctx, dockerClient, "batch", config, hostConfig, registryConfigJSON)+ containerID, err := s.createAndStartTrivyContainerInternal(ctx, dockerClient, "batch", config, hostConfig, files)if err != nil {return "", err}@@ -283,7 +284,7 @@ func (s *VulnerabilityService) createBatchTrivyContainer(ctx context.Context, sc// execTrivyScanInContainer runs a trivy scan for a single image inside an// already-running container via docker exec.-func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, containerID, imageName, imageID, scannerVersion string, slotID int) (*vulnerability.ScanResult, error) {+func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, containerID, imageName, imageID, scannerVersion string, slotID int, files map[string][]byte) (*vulnerability.ScanResult, error) {dockerClient, err := s.dockerService.GetClient(ctx)if err != nil {return nil, errors.WrapIf(err, "failed to connect to Docker")@@ -301,19 +302,15 @@ func (s *VulnerabilityService) execTrivyScanInContainer(ctx context.Context, con}defer vuln.CleanupLogTempFiles(ctx, stdoutFile, stderrFile)- trivyTimeout := s.getTrivyScanTimeoutArg()outputPath := vuln.NewOutputPath()defer vuln.CleanupOutputFileInContainer(ctx, dockerClient, containerID, outputPath)serverURL, serverToken := s.getTrivyServerConfig()- execCmd := make([]string, 0, 16)- execCmd = append(execCmd, "trivy", "image", "--format", "json", "--quiet", "--output", outputPath, "--timeout", trivyTimeout)- execCmd = append(execCmd, vuln.ScanSourceArgs(serverURL, s.getTrivyDbRegistryInternal())...)+ var cacheDir stringif serverURL == "" {- execCmd = append(execCmd, "--cache-dir", s.getTrivySingleScanCacheDirForSlotInternal(slotID))+ cacheDir = s.getTrivySingleScanCacheDirForSlotInternal(slotID)}- execCmd = append(execCmd, vuln.IgnoreUnfixedArgs(s.getTrivyIgnoreUnfixed())...)- execCmd = append(execCmd, imageName)+ execCmd := append([]string{"trivy"}, s.buildTrivyCommandArgs(imageName, cacheDir, outputPath, files)...)exitCode, err := dockerutils.ExecInContainer(ctx, dockerClient, containerID, client.ExecCreateOptions{Cmd: execCmd,@@ -769,68 +766,33 @@ func (s *VulnerabilityService) getTrivyIgnoreUnfixed() bool {return cfg != nil && cfg.TrivyIgnoreUnfixed.IsTrue()}-func (s *VulnerabilityService) createTrivyConfigTempFile(ctx context.Context, content string) mo.Option[string] {- // System temp scratch: no acfs root exists for it.- configFile, err := os.CreateTemp("", "trivy-config-*.yaml")- if err != nil {- slog.WarnContext(ctx, "failed to create trivy config temp file", "error", err)- return mo.None[string]()- }- if _, err := configFile.WriteString(content); err != nil {- slog.WarnContext(ctx, "failed to write trivy config", "error", err)- _ = configFile.Close()- _ = os.Remove(configFile.Name())- return mo.None[string]()+func (s *VulnerabilityService) trivyContainerFilesInternal(ctx context.Context) map[string][]byte {+ files := map[string][]byte{}+ if registryConfigJSON := s.buildTrivyRegistryConfigInternal(ctx); len(registryConfigJSON) > 0 {+ files[vuln.RegistryConfigFile] = registryConfigJSON}- _ = configFile.Close()- return mo.Some(configFile.Name())-}--func (s *VulnerabilityService) createTrivyIgnoreTempFile(ctx context.Context, content string) mo.Option[string] {- // System temp scratch: no acfs root exists for it.- ignoreFile, err := os.CreateTemp("", "trivy-ignore-*")- if err != nil {- slog.WarnContext(ctx, "failed to create trivy ignore temp file", "error", err)- return mo.None[string]()+ configContent, ignoreContent := s.getTrivyConfigFiles()+ if strings.TrimSpace(configContent) != "" {+ files[vuln.TrivyConfigFile] = []byte(configContent)}- if _, err := ignoreFile.WriteString(content); err != nil {- slog.WarnContext(ctx, "failed to write trivy ignore", "error", err)- _ = ignoreFile.Close()- _ = os.Remove(ignoreFile.Name())- return mo.None[string]()+ if strings.TrimSpace(ignoreContent) != "" {+ files[vuln.TrivyIgnoreFile] = []byte(ignoreContent)}- _ = ignoreFile.Close()- return mo.Some(ignoreFile.Name())+ return files}-// trivyScanCacheBackendArgsForArchInternal returns extra Trivy flags that switch-// the scan cache to Trivy's documented in-memory backend on 32-bit architectures.-func (s *VulnerabilityService) buildTrivyCommandArgs(- ctx context.Context,- imageName string,- configContent string,- ignoreContent string,- cacheDir string,- outputPath string,-) ([]string, []string) {+// Flags passed here take precedence over the user-supplied trivy.yaml.+func (s *VulnerabilityService) buildTrivyCommandArgs(imageName, cacheDir, outputPath string, files map[string][]byte) []string {serverURL, _ := s.getTrivyServerConfig()- cmdArgs := []string{"image", "--format", "json", "--quiet", "--timeout", s.getTrivyScanTimeoutArg()}+ cmdArgs := []string{"image", "--format", "json", "--quiet", "--exit-code", "0", "--exit-on-eol", "0", "--timeout", s.getTrivyScanTimeoutArg()}cmdArgs = append(cmdArgs, vuln.ScanSourceArgs(serverURL, s.getTrivyDbRegistryInternal())...)cmdArgs = append(cmdArgs, vuln.IgnoreUnfixedArgs(s.getTrivyIgnoreUnfixed())...)- var tempFiles []string- if strings.TrimSpace(configContent) != "" {- if tempFile, ok := s.createTrivyConfigTempFile(ctx, configContent).Get(); ok {- tempFiles = append(tempFiles, tempFile)- cmdArgs = append(cmdArgs, "--config", "/tmp/trivy-config.yaml")- }+ if files[vuln.TrivyConfigFile] != nil {+ cmdArgs = append(cmdArgs, "--config", vuln.ContainerFilesDir+"/"+vuln.TrivyConfigFile)}-- if strings.TrimSpace(ignoreContent) != "" {- if tempFile, ok := s.createTrivyIgnoreTempFile(ctx, ignoreContent).Get(); ok {- tempFiles = append(tempFiles, tempFile)- cmdArgs = append(cmdArgs, "--ignorefile", "/tmp/trivy-ignore")- }+ if files[vuln.TrivyIgnoreFile] != nil {+ cmdArgs = append(cmdArgs, "--ignorefile", vuln.ContainerFilesDir+"/"+vuln.TrivyIgnoreFile)}if strings.TrimSpace(cacheDir) != "" {@@ -841,9 +803,7 @@ func (s *VulnerabilityService) buildTrivyCommandArgs(cmdArgs = append(cmdArgs, "--output", outputPath)}- cmdArgs = append(cmdArgs, imageName)-- return cmdArgs, tempFiles+ return append(cmdArgs, imageName)}func (s *VulnerabilityService) createAndStartTrivyContainerInternal(@@ -852,7 +812,7 @@ func (s *VulnerabilityService) createAndStartTrivyContainerInternal(scope string,config *containertypes.Config,hostConfig *containertypes.HostConfig,- registryConfigJSON []byte,+ files map[string][]byte,) (string, error) {vuln.LogContainerStartupRequest(ctx, scope, config, hostConfig)@@ -868,17 +828,19 @@ func (s *VulnerabilityService) createAndStartTrivyContainerInternal(return "", errors.WrapIf(err, "failed to create container")}- if len(registryConfigJSON) > 0 {- if err := vuln.CopyRegistryConfigToContainer(ctx, dockerClient, resp.ID, registryConfigJSON); err != nil {- // DOCKER_CONFIG may still point at the target directory. When the- // config file is absent, Trivy falls back to anonymous registry access.- slog.WarnContext(ctx,- "failed to inject registry credentials into trivy container; continuing anonymously",- "scope", scope,- "containerId", resp.ID,- "error", err,- )+ if err := vuln.CopyFilesToContainer(ctx, dockerClient, resp.ID, vuln.ContainerFilesDir, files); err != nil {+ if files[vuln.TrivyConfigFile] != nil || files[vuln.TrivyIgnoreFile] != nil {+ vuln.RemoveContainer(ctx, dockerClient, resp.ID, "failed to cleanup trivy container after file copy failure")+ return "", errors.WrapIf(err, "failed to copy scan files into container")}+ // DOCKER_CONFIG may still point at the target directory. When the+ // config file is absent, Trivy falls back to anonymous registry access.+ slog.WarnContext(ctx,+ "failed to inject registry credentials into trivy container; continuing anonymously",+ "scope", scope,+ "containerId", resp.ID,+ "error", err,+ )}startCtx, startCancel := context.WithTimeout(ctx, timeouts.GetDuration(0, timeouts.DefaultDockerAPI))@@ -1006,7 +968,7 @@ func (s *VulnerabilityService) runTrivyContainer(imageID string,config *containertypes.Config,hostConfig *containertypes.HostConfig,- registryConfigJSON []byte,+ files map[string][]byte,) (*os.File, *os.File, int64, int64, string, error) {stdoutFile, err := vuln.CreateLogTempFile("trivy-stdout-*")if err != nil {@@ -1028,7 +990,7 @@ func (s *VulnerabilityService) runTrivyContainer(}}()- containerID, err = s.createAndStartTrivyContainerInternal(ctx, dockerClient, "single-scan", config, hostConfig, registryConfigJSON)+ containerID, err = s.createAndStartTrivyContainerInternal(ctx, dockerClient, "single-scan", config, hostConfig, files)if err != nil {return nil, nil, 0, 0, "", errors.WrapIf(err, "failed to prepare trivy scan container")}@@ -1150,9 +1112,6 @@ func (s *VulnerabilityService) runTrivyScanInternal(ctx context.Context, scanner}}- // Get Trivy config files if they exist- configContent, ignoreContent := s.getTrivyConfigFiles()-var cacheDir stringif serverURL == "" {cacheDir = s.getTrivySingleScanCacheDirForSlotInternal(slotID)@@ -1167,18 +1126,16 @@ func (s *VulnerabilityService) runTrivyScanInternal(ctx context.Context, scanner}outputPath := vuln.NewOutputPath()-- cmdArgs, tempFiles := s.buildTrivyCommandArgs(ctx, imageName, configContent, ignoreContent, cacheDir, outputPath)- defer vuln.CleanupTempFiles(ctx, tempFiles)+ files := s.trivyContainerFilesInternal(ctx)+ cmdArgs := s.buildTrivyCommandArgs(imageName, cacheDir, outputPath, files)runtimeOptions, err := s.resolveTrivyRuntimeOptionsInternal(ctx, dockerClient)if err != nil {return nil, err}- registryConfigJSON := s.buildTrivyRegistryConfigInternal(ctx)env := append([]string(nil), runtimeOptions.ContainerEnv...)- if len(registryConfigJSON) > 0 {+ if files[vuln.RegistryConfigFile] != nil {env = append(env, "DOCKER_CONFIG="+vuln.RegistryConfigDir)}if serverToken != "" {@@ -1191,7 +1148,6 @@ func (s *VulnerabilityService) runTrivyScanInternal(ctx context.Context, scannersecurityOpts, privileged := runtimeSecurity.securityOpts, runtimeSecurity.privilegedhostConfig := vuln.BuildHostConfig(cacheVolume,- tempFiles,resources,cpuSet,applyLimits,@@ -1201,7 +1157,7 @@ func (s *VulnerabilityService) runTrivyScanInternal(ctx context.Context, scanner)s.setScanPhaseInternal(imageID, vulnerability.ScanPhaseCreatingContainer)- stdoutFile, stderrFile, duration, statusCode, containerID, err := s.runTrivyContainer(ctx, dockerClient, imageID, config, hostConfig, registryConfigJSON)+ stdoutFile, stderrFile, duration, statusCode, containerID, err := s.runTrivyContainer(ctx, dockerClient, imageID, config, hostConfig, files)if err != nil {return nil, err}diff --git a/backend/pkg/libarcane/vuln/driver.go b/backend/pkg/libarcane/vuln/driver.goindex 72f182b55..8d7ac9df7 100644--- a/backend/pkg/libarcane/vuln/driver.go+++ b/backend/pkg/libarcane/vuln/driver.go@@ -11,6 +11,7 @@ import ("log/slog""math""os"+ "path""path/filepath""strconv""strings"@@ -43,10 +44,14 @@ const (NanoCPUsPerCore = int64(1_000_000_000)BytesPerMB = int64(1024 * 1024)- outputPathPrefixInternal = "/tmp/arcane-trivy-result-"- registryConfigCopyDestInternal = "/tmp"- registryConfigTarNameInternal = "arcane-registry-auth/config.json"- errorExcerptSizeInternal = int64(32 * 1024)+ // ContainerFilesDir is where generated files are copied inside the scan container.+ ContainerFilesDir = "/tmp"+ RegistryConfigFile = "arcane-registry-auth/config.json"+ TrivyConfigFile = "trivy-config.yaml"+ TrivyIgnoreFile = "trivy-ignore"++ outputPathPrefixInternal = "/tmp/arcane-trivy-result-"+ errorExcerptSizeInternal = int64(32 * 1024))type RuntimeOptions struct {@@ -87,15 +92,6 @@ func NewOutputPath() string {return outputPathPrefixInternal + strconv.FormatInt(time.Now().UnixNano(), 10) + ".json"}-func CleanupTempFiles(ctx context.Context, tempFiles []string) {- // System temp scratch: no acfs root exists for it.- for _, f := range tempFiles {- if err := os.Remove(f); err != nil {- slog.WarnContext(ctx, "failed to remove trivy temp file", "path", f, "error", err)- }- }-}-func BuildBatchHostConfig(cacheVolume string,runtimeOptions RuntimeOptions,@@ -122,7 +118,6 @@ func BuildBatchHostConfig(func BuildHostConfig(cacheVolume string,- tempFiles []string,resources containertypes.Resources,cpuSet string,applyLimits bool,@@ -149,8 +144,6 @@ func BuildHostConfig(ApplyRuntimeSecurity(hostConfig, securityOpts, privileged)ApplyContainerResources(hostConfig, resources, cpuSet, applyLimits)-- addTempFileMountsInternal(hostConfig, tempFiles)return hostConfig}@@ -186,27 +179,6 @@ func ApplyContainerResources(hostConfig *containertypes.HostConfig, resources cohostConfig.Resources = resources}-func addTempFileMountsInternal(hostConfig *containertypes.HostConfig, tempFiles []string) {- for _, tempFile := range tempFiles {- switch {- case strings.Contains(tempFile, "trivy-config"):- hostConfig.Mounts = append(hostConfig.Mounts, mounttypes.Mount{- Type: mounttypes.TypeBind,- Source: tempFile,- Target: "/tmp/trivy-config.yaml",- ReadOnly: true,- })- case strings.Contains(tempFile, "trivy-ignore"):- hostConfig.Mounts = append(hostConfig.Mounts, mounttypes.Mount{- Type: mounttypes.TypeBind,- Source: tempFile,- Target: "/tmp/trivy-ignore",- ReadOnly: true,- })- }- }-}-func CreateLogTempFile(prefix string) (*os.File, error) {// System temp scratch (with a user cache dir fallback below): no acfs root// exists for either location.@@ -371,22 +343,26 @@ func RemoveContainer(ctx context.Context, dockerClient *client.Client, container}}-func CopyRegistryConfigToContainer(ctx context.Context, dockerClient *client.Client, containerID string, configJSON []byte) error {- if dockerClient == nil || containerID == "" || len(configJSON) == 0 {+func CopyFilesToContainer(ctx context.Context, dockerClient *client.Client, containerID, destDir string, files map[string][]byte) error {+ if dockerClient == nil || containerID == "" || len(files) == 0 {return nil}var buf bytes.Buffertw := tar.NewWriter(&buf)- if err := tw.WriteHeader(&tar.Header{Name: "arcane-registry-auth/", Mode: 0o755, Typeflag: tar.TypeDir}); err != nil {- return err- }- if err := tw.WriteHeader(&tar.Header{Name: registryConfigTarNameInternal, Mode: 0o644, Size: int64(len(configJSON))}); err != nil {- return err- }- if _, err := tw.Write(configJSON); err != nil {- return err+ for name, content := range files {+ if dir := path.Dir(name); dir != "." {+ if err := tw.WriteHeader(&tar.Header{Name: dir + "/", Mode: 0o755, Typeflag: tar.TypeDir}); err != nil {+ return err+ }+ }+ if err := tw.WriteHeader(&tar.Header{Name: name, Mode: 0o644, Size: int64(len(content))}); err != nil {+ return err+ }+ if _, err := tw.Write(content); err != nil {+ return err+ }}if err := tw.Close(); err != nil {return err@@ -396,7 +372,7 @@ func CopyRegistryConfigToContainer(ctx context.Context, dockerClient *client.Clidefer copyCancel()_, err := dockerClient.CopyToContainer(copyCtx, containerID, client.CopyToContainerOptions{- DestinationPath: registryConfigCopyDestInternal,+ DestinationPath: destDir,Content: &buf,})return errdiff --git a/backend/pkg/libarcane/vuln/driver_test.go b/backend/pkg/libarcane/vuln/driver_test.goindex a8ee87012..8d666bbca 100644--- a/backend/pkg/libarcane/vuln/driver_test.go+++ b/backend/pkg/libarcane/vuln/driver_test.go@@ -203,7 +203,6 @@ func TestBuildTrivyHostConfig_ExcludesResourcesWhenLimitsDisabled(t *testing.T)hostConfig := BuildHostConfig("cache-volume",- nil,resources,"",false,@@ -228,7 +227,6 @@ func TestBuildTrivyHostConfig_IncludesResourcesWhenLimitsEnabled(t *testing.T) {hostConfig := BuildHostConfig("cache-volume",- nil,resources,"",true,@@ -251,7 +249,6 @@ func TestBuildTrivyHostConfig_UsesCPUSetAndClearsNanoCPUs(t *testing.T) {hostConfig := BuildHostConfig("cache-volume",- nil,resources,"0-1",true,@@ -269,7 +266,6 @@ func TestBuildTrivyHostConfig_UsesCPUSetAndClearsNanoCPUs(t *testing.T) {func TestBuildTrivyHostConfig_AppliesRuntimeSecurity(t *testing.T) {hostConfig := BuildHostConfig("cache-volume",- nil,containertypes.Resources{},"",false,@@ -285,7 +281,6 @@ func TestBuildTrivyHostConfig_AppliesRuntimeSecurity(t *testing.T) {func TestBuildTrivyHostConfig_SkipsCacheMountWhenVolumeEmpty(t *testing.T) {hostConfig := BuildHostConfig("",- nil,containertypes.Resources{},"",false,@@ -303,7 +298,6 @@ func TestBuildTrivyHostConfig_SkipsCacheMountWhenVolumeEmpty(t *testing.T) {}hostConfig = BuildHostConfig("",- nil,containertypes.Resources{},"",false,@@ -348,7 +342,6 @@ func TestBuildTrivyBatchHostConfig_SkipsCacheMountWhenVolumeEmpty(t *testing.T)func TestBuildTrivyHostConfig_IncludesInheritedSocketMount(t *testing.T) {hostConfig := BuildHostConfig("cache-volume",- nil,containertypes.Resources{},"",false,diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 0af85253c..a7237bd4d 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -1574,6 +1574,12 @@"security_trivy_concurrent_scan_containers_min": "Must be at least 1","security_trivy_ignore_unfixed_label": "Only Report Fixable Vulnerabilities","security_trivy_ignore_unfixed_description": "Only report vulnerabilities that have a known fix available. Reduces noise from vulnerabilities you cannot act on.",+ "security_trivy_config_label": "Trivy Config (YAML)",+ "security_trivy_config_description": "Contents of a trivy.yaml applied to every scan. Options Arcane sets on the command line take precedence: format, output, timeout, cache directory, database repositories or server, exit code, and only-fixable.",+ "security_trivy_config_placeholder": "severity:\n - HIGH\n - CRITICAL\nscanners:\n - vuln",+ "security_trivy_ignore_label": ".trivyignore",+ "security_trivy_ignore_description": "One vulnerability ID per line, applied to every scan. Lines starting with # are comments.",+ "security_trivy_ignore_placeholder": "# comment\nCVE-2024-12345","security_trivy_server_enabled_label": "Use Remote Trivy Server","security_trivy_server_enabled_description": "Scan against a remote Trivy server instead of downloading the vulnerability database locally. Recommended for 32-bit hosts (arm/v7) where the local database cannot be loaded.","security_trivy_server_url_label": "Trivy Server URL",diff --git a/frontend/src/lib/components/code-editor/editor.svelte b/frontend/src/lib/components/code-editor/editor.svelteindex 6ce18be73..012e6cf0b 100644--- a/frontend/src/lib/components/code-editor/editor.svelte+++ b/frontend/src/lib/components/code-editor/editor.svelte@@ -83,7 +83,8 @@diagnosticSummary = $bindable(createDefaultSummary()),outlineOpen = $bindable(false),diffOpen = $bindable(false),- commandPaletteOpen = $bindable(false)+ commandPaletteOpen = $bindable(false),+ statusBar = true}: {value?: string;language?: CodeLanguage;@@ -102,6 +103,7 @@outlineOpen?: boolean;diffOpen?: boolean;commandPaletteOpen?: boolean;+ statusBar?: boolean;} = $props();void hasErrors;@@ -807,17 +809,18 @@{/if}</div>- <div class="editor-status">- <span>{diagnosticSummary.errors} errors</span>- <span>{diagnosticSummary.errors} {m.editor_errors()}</span>- <span>{diagnosticSummary.warnings} {m.editor_warnings()}</span>- <span>{m.editor_schema()}: {diagnosticSummary.schemaStatus}</span>- <span>{m.editor_line()} {diagnosticSummary.cursorLine}, {m.editor_column()} {diagnosticSummary.cursorCol}</span>- <span>{m.diagnostics()}: {countCurrentDiagnostics()}</span>- {#if !validationReady}- <span class="status-muted">{m.editor_validating()}</span>- {/if}- </div>+ {#if statusBar}+ <div class="editor-status">+ <span>{diagnosticSummary.errors} {m.editor_errors()}</span>+ <span>{diagnosticSummary.warnings} {m.editor_warnings()}</span>+ <span>{m.editor_schema()}: {diagnosticSummary.schemaStatus}</span>+ <span>{m.editor_line()} {diagnosticSummary.cursorLine}, {m.editor_column()} {diagnosticSummary.cursorCol}</span>+ <span>{m.diagnostics()}: {countCurrentDiagnostics()}</span>+ {#if !validationReady}+ <span class="status-muted">{m.editor_validating()}</span>+ {/if}+ </div>+ {/if}<Command.Dialog bind:open={commandPaletteOpen} title={m.editor_commands()} description={m.editor_commands_desc()}><Command.Input placeholder={m.editor_search_commands()} />diff --git a/frontend/src/lib/components/settings/trivy-security-settings.svelte b/frontend/src/lib/components/settings/trivy-security-settings.svelteindex c9c6c2e57..b489c63dd 100644--- a/frontend/src/lib/components/settings/trivy-security-settings.svelte+++ b/frontend/src/lib/components/settings/trivy-security-settings.svelte@@ -14,6 +14,7 @@import SelectWithLabel from '#lib/components/form/select-with-label.svelte';import TextInputWithLabel from '#lib/components/form/text-input-with-label.svelte';import SettingsRow from '#lib/components/settings/settings-row.svelte';+ import CodeEditor from '#lib/components/code-editor/editor.svelte';import { SecurityIcon, InfoIcon } from '#lib/icons/index.js';import { m } from '#lib/paraglide/messages.js';import { toast } from 'svelte-sonner';@@ -38,6 +39,8 @@| 'trivyServerUrl'| 'trivyServerToken'| 'trivyIgnoreUnfixed'+ | 'trivyConfig'+ | 'trivyIgnore'>;type FormField<T> = {@@ -184,6 +187,34 @@<Switch id="trivyIgnoreUnfixedSwitch" bind:checked={formInputs.trivyIgnoreUnfixed.value} /></SettingsRow>+ <SettingsRow label={m.security_trivy_config_label()} description={m.security_trivy_config_description()}>+ <div class="overflow-hidden rounded-md border border-border/60">+ <CodeEditor+ bind:value={formInputs.trivyConfig.value}+ language="yaml"+ validationMode="none"+ autoHeight={true}+ statusBar={false}+ fontSize="13px"+ placeholder={m.security_trivy_config_placeholder()}+ />+ </div>+ </SettingsRow>++ <SettingsRow label={m.security_trivy_ignore_label()} description={m.security_trivy_ignore_description()}>+ <div class="overflow-hidden rounded-md border border-border/60">+ <CodeEditor+ bind:value={formInputs.trivyIgnore.value}+ language="plaintext"+ validationMode="none"+ autoHeight={true}+ statusBar={false}+ fontSize="13px"+ placeholder={m.security_trivy_ignore_placeholder()}+ />+ </div>+ </SettingsRow>+<SettingsRowlabel={m.security_trivy_network_label()}description={m.security_trivy_network_description()}diff --git a/frontend/src/lib/types/settings.ts b/frontend/src/lib/types/settings.tsindex ef5537e2b..e891dcf43 100644--- a/frontend/src/lib/types/settings.ts+++ b/frontend/src/lib/types/settings.ts@@ -83,6 +83,8 @@ export type Settings = {trivyServerUrl: string;trivyServerToken: string;trivyIgnoreUnfixed: boolean;+ trivyConfig: string;+ trivyIgnore: string;imagePatchSuffix: string;imagePatchTimeoutSec: number;imagePatchAllPlatforms: boolean;diff --git a/frontend/src/routes/(app)/environments/[id]/+page.svelte b/frontend/src/routes/(app)/environments/[id]/+page.svelteindex 2e4e4a1b0..2aa155aa4 100644--- a/frontend/src/routes/(app)/environments/[id]/+page.svelte+++ b/frontend/src/routes/(app)/environments/[id]/+page.svelte@@ -326,6 +326,8 @@trivyServerUrl: settings?.trivyServerUrl || '',trivyServerToken: settings?.trivyServerToken || '',trivyIgnoreUnfixed: settings?.trivyIgnoreUnfixed ?? true,+ trivyConfig: settings?.trivyConfig || '',+ trivyIgnore: settings?.trivyIgnore || '',imagePatchSuffix: settings?.imagePatchSuffix || 'patched',imagePatchTimeoutSec: settings?.imagePatchTimeoutSec ?? 600,imagePatchAllPlatforms: settings?.imagePatchAllPlatforms ?? false,@@ -415,6 +417,8 @@trivyServerUrl: formData.trivyServerUrl,trivyServerToken: formData.trivyServerToken,trivyIgnoreUnfixed: formData.trivyIgnoreUnfixed,+ trivyConfig: formData.trivyConfig,+ trivyIgnore: formData.trivyIgnore,imagePatchSuffix: formData.imagePatchSuffix,imagePatchTimeoutSec: formData.imagePatchTimeoutSec,imagePatchAllPlatforms: formData.imagePatchAllPlatforms,diff --git a/frontend/src/routes/(app)/environments/[id]/components/environment-form-schema.ts b/frontend/src/routes/(app)/environments/[id]/components/environment-form-schema.tsindex 09c2b0c3d..15ea711e5 100644--- a/frontend/src/routes/(app)/environments/[id]/components/environment-form-schema.ts+++ b/frontend/src/routes/(app)/environments/[id]/components/environment-form-schema.ts@@ -48,6 +48,8 @@ export const environmentFormSchema = ztrivyServerUrl: z.string(),trivyServerToken: z.string(),trivyIgnoreUnfixed: z.boolean(),+ trivyConfig: z.string(),+ trivyIgnore: z.string(),imagePatchSuffix: z.string(),imagePatchTimeoutSec: z.coerce.number().int().min(1),imagePatchAllPlatforms: z.boolean(),diff --git a/types/settings/settings.go b/types/settings/settings.goindex b1a42e08b..cd54ad16f 100644--- a/types/settings/settings.go+++ b/types/settings/settings.go@@ -359,6 +359,16 @@ type Update struct {// Required: falseTrivyIgnoreUnfixed *string `json:"trivyIgnoreUnfixed,omitzero"`+ // TrivyConfig is the trivy.yaml content passed to scans with --config.+ //+ // Required: false+ TrivyConfig *string `json:"trivyConfig,omitzero"`++ // TrivyIgnore is the .trivyignore content passed to scans with --ignorefile.+ //+ // Required: false+ TrivyIgnore *string `json:"trivyIgnore,omitzero"`+// ImagePatchSuffix is the suffix appended to the source tag when patching an image.//// Required: false