Skip to content

Modern Docker Management, Designed for Everyone

fix: registry credentials not reliably being passed to remote environments

Kyle Mendell31cfd540dbd7
diff --git a/backend/internal/api/image_update_handler.go b/backend/internal/api/image_update_handler.go
index 5e00abbb3..fcfef7518 100644
--- a/backend/internal/api/image_update_handler.go
+++ b/backend/internal/api/image_update_handler.go
@@ -22,7 +22,7 @@ func NewImageUpdateHandler(group *gin.RouterGroup, imageUpdateService *services.
apiGroup.GET("/check", handler.CheckImageUpdate)
apiGroup.GET("/check/:imageId", handler.CheckImageUpdateByID)
apiGroup.POST("/check-batch", handler.CheckMultipleImages)
- apiGroup.GET("/check-all", handler.CheckAllImages)
+ apiGroup.POST("/check-all", handler.CheckAllImages)
apiGroup.GET("/summary", handler.GetUpdateSummary)
}
}
diff --git a/backend/internal/services/image_update_service.go b/backend/internal/services/image_update_service.go
index f072fa02e..0d2227925 100644
--- a/backend/internal/services/image_update_service.go
+++ b/backend/internal/services/image_update_service.go
@@ -729,6 +729,23 @@ func (s *ImageUpdateService) buildRegistryAuthMap(ctx context.Context, rc *regis
return strings.TrimSuffix(u, "/")
}
+ slog.DebugContext(ctx, "Building registry auth map",
+ slog.Int("registryCount", len(regRepos)),
+ slog.Any("registries", func() []string {
+ regs := make([]string, 0, len(regRepos))
+ for r := range regRepos {
+ regs = append(regs, r)
+ }
+ return regs
+ }()),
+ slog.Any("credMapKeys", func() []string {
+ keys := make([]string, 0, len(credMap))
+ for k := range credMap {
+ keys = append(keys, k)
+ }
+ return keys
+ }()))
+
for regHost, set := range regRepos {
repos := make([]string, 0, len(set))
for r := range set {
@@ -748,24 +765,47 @@ func (s *ImageUpdateService) buildRegistryAuthMap(ctx context.Context, rc *regis
regAuthMap[regHost] = regAuth{token: "", auth: &authDetails{Method: "none", Registry: regHost}}
continue
}
- // Anonymous multi-scope
- if anonToken, anonErr := rc.GetTokenMulti(ctx, authURL, repos, nil); anonErr == nil && anonToken != "" {
- regAuthMap[regHost] = regAuth{token: anonToken, auth: &authDetails{Method: "anonymous", Registry: regHost}}
- continue
- }
- // Credential attempt
+
+ // Credential attempt first (if available)
host := normalizeHost(regHost)
+ slog.DebugContext(ctx, "Looking up credentials for registry",
+ slog.String("registry", regHost),
+ slog.String("normalizedHost", host),
+ slog.Bool("hasCredentials", credMap[host].username != ""))
if c, ok := credMap[host]; ok && c.username != "" && c.token != "" {
creds := &registry.Credentials{Username: c.username, Token: c.token}
if tok, tokErr := rc.GetTokenMulti(ctx, authURL, repos, creds); tokErr == nil && tok != "" {
+ slog.InfoContext(ctx, "Using credential auth for registry",
+ slog.String("registry", regHost),
+ slog.String("username", c.username))
regAuthMap[regHost] = regAuth{
token: tok,
auth: &authDetails{Method: "credential", Username: c.username, Registry: regHost},
}
continue
+ } else {
+ slog.WarnContext(ctx, "Failed to get token with credentials, falling back to anonymous",
+ slog.String("registry", regHost),
+ slog.String("username", c.username),
+ slog.String("error", func() string {
+ if tokErr != nil {
+ return tokErr.Error()
+ }
+ return "empty token"
+ }()))
}
}
+
+ // Anonymous multi-scope fallback
+ if anonToken, anonErr := rc.GetTokenMulti(ctx, authURL, repos, nil); anonErr == nil && anonToken != "" {
+ slog.DebugContext(ctx, "Using anonymous auth for registry",
+ slog.String("registry", regHost))
+ regAuthMap[regHost] = regAuth{token: anonToken, auth: &authDetails{Method: "anonymous", Registry: regHost}}
+ continue
+ }
// Fallback unknown
+ slog.DebugContext(ctx, "No valid credentials found for registry, using unknown auth",
+ slog.String("registry", regHost))
regAuthMap[regHost] = regAuth{token: "", auth: &authDetails{Method: "unknown", Registry: regHost}}
}
return regAuthMap
@@ -850,6 +890,10 @@ func (s *ImageUpdateService) CheckMultipleImages(ctx context.Context, imageRefs
return results, nil
}
+ slog.DebugContext(ctx, "Starting batch image update check",
+ slog.Int("imageCount", len(imageRefs)),
+ slog.Int("externalCredCount", len(externalCreds)))
+
rc := registry.NewClient()
regRepos, initialResults, images := s.parseAndGroupImages(imageRefs)
@@ -858,6 +902,10 @@ func (s *ImageUpdateService) CheckMultipleImages(ctx context.Context, imageRefs
}
credMap, enabledRegs := s.buildCredentialMap(ctx, externalCreds)
+
+ slog.DebugContext(ctx, "Built credential map",
+ slog.Int("credMapSize", len(credMap)),
+ slog.Int("enabledRegsCount", len(enabledRegs)))
regAuthMap := s.buildRegistryAuthMap(ctx, rc, regRepos, credMap)
diff --git a/backend/internal/utils/remenv/remenv.go b/backend/internal/utils/remenv/remenv.go
index 8d7cf3fe6..2307db121 100644
--- a/backend/internal/utils/remenv/remenv.go
+++ b/backend/internal/utils/remenv/remenv.go
@@ -121,7 +121,12 @@ func injectBatchUpdateCredentials(ctx context.Context, bodyBytes []byte, req *ht
return nil //nolint:nilerr
}
+ slog.DebugContext(ctx, "Batch update credential injection check",
+ slog.Int("existingCredentials", len(batchReq.Credentials)),
+ slog.Any("imageRefs", batchReq.ImageRefs))
+
if len(batchReq.Credentials) > 0 {
+ slog.DebugContext(ctx, "Credentials already present in request, skipping injection")
return nil
}
@@ -131,6 +136,7 @@ func injectBatchUpdateCredentials(ctx context.Context, bodyBytes []byte, req *ht
}
if len(creds) == 0 {
+ slog.DebugContext(ctx, "No enabled registry credentials found to inject")
return nil
}
@@ -141,8 +147,15 @@ func injectBatchUpdateCredentials(ctx context.Context, bodyBytes []byte, req *ht
}
updateRequestBody(req, modifiedBody)
- slog.DebugContext(ctx, "Injected registry credentials into batch update request",
- slog.Int("credentialCount", len(creds)))
+ slog.InfoContext(ctx, "Injected registry credentials into batch update request",
+ slog.Int("credentialCount", len(creds)),
+ slog.Any("credentialURLs", func() []string {
+ urls := make([]string, len(creds))
+ for i, c := range creds {
+ urls[i] = c.URL
+ }
+ return urls
+ }()))
return nil
}
diff --git a/frontend/src/lib/services/image-service.ts b/frontend/src/lib/services/image-service.ts
index 7626ab8ad..f4c1fad2a 100644
--- a/frontend/src/lib/services/image-service.ts
+++ b/frontend/src/lib/services/image-service.ts
@@ -47,7 +47,7 @@ export class ImageService extends BaseAPIService {
async checkAllImages(): Promise<Record<string, ImageUpdateInfoDto>> {
const envId = await environmentStore.getCurrentEnvironmentId();
- return this.handleResponse(this.api.get(`/environments/${envId}/image-updates/check-all`));
+ return this.handleResponse(this.api.post(`/environments/${envId}/image-updates/check-all`, {}));
}
async runAutoUpdate(options?: AutoUpdateCheck): Promise<AutoUpdateResult> {