Skip to content

Modern Docker Management, Designed for Everyone

fix: registries fields validations (#2087)

Paulo Rochac718d880d71f
diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.go
index a934569b8..f0007eef0 100644
--- a/backend/internal/services/container_registry_service.go
+++ b/backend/internal/services/container_registry_service.go
@@ -134,13 +134,13 @@ func (s *ContainerRegistryService) CreateRegistry(ctx context.Context, req model
if registryType == registryTypeECR {
if strings.TrimSpace(req.AWSAccessKeyID) == "" {
- return nil, &models.ValidationError{Field: "awsAccessKeyId", Message: "AWS Access Key ID is required for ECR registries"}
+ return nil, &models.ValidationError{Field: "awsAccessKeyId", Message: "AWS Access Key ID is required"}
}
if strings.TrimSpace(req.AWSRegion) == "" {
- return nil, &models.ValidationError{Field: "awsRegion", Message: "AWS Region is required for ECR registries"}
+ return nil, &models.ValidationError{Field: "awsRegion", Message: "AWS Region is required"}
}
if strings.TrimSpace(req.AWSSecretAccessKey) == "" {
- return nil, &models.ValidationError{Field: "awsSecretAccessKey", Message: "AWS Secret Access Key is required for ECR registries"}
+ return nil, &models.ValidationError{Field: "awsSecretAccessKey", Message: "AWS Secret Access Key is required"}
}
encryptedSecret, err := crypto.Encrypt(req.AWSSecretAccessKey)
if err != nil {
@@ -150,6 +150,12 @@ func (s *ContainerRegistryService) CreateRegistry(ctx context.Context, req model
registry.AWSSecretAccessKey = encryptedSecret
registry.AWSRegion = req.AWSRegion
} else {
+ if strings.TrimSpace(req.Username) == "" {
+ return nil, &models.ValidationError{Field: "username", Message: "Username is required"}
+ }
+ if strings.TrimSpace(req.Token) == "" {
+ return nil, &models.ValidationError{Field: "token", Message: "Token is required"}
+ }
encryptedToken, err := crypto.Encrypt(req.Token)
if err != nil {
return nil, fmt.Errorf("failed to encrypt token: %w", err)
@@ -208,22 +214,10 @@ func (s *ContainerRegistryService) applyRegistryTypeUpdateInternal(registry *mod
return err
}
- if nextType == registry.RegistryType {
- return nil
+ if nextType != registry.RegistryType {
+ return &models.ValidationError{Field: "registryType", Message: "Registry type cannot be changed after creation"}
}
- if nextType == registryTypeECR {
- registry.Username = ""
- registry.Token = ""
- } else {
- registry.AWSAccessKeyID = ""
- registry.AWSSecretAccessKey = ""
- registry.AWSRegion = ""
- registry.ECRToken = ""
- registry.ECRTokenGeneratedAt = nil
- }
-
- registry.RegistryType = nextType
return nil
}
@@ -240,13 +234,13 @@ func (s *ContainerRegistryService) updateECRRegistryFieldsInternal(registry *mod
}
if strings.TrimSpace(registry.AWSAccessKeyID) == "" {
- return &models.ValidationError{Field: "awsAccessKeyId", Message: "AWS Access Key ID is required for ECR registries"}
+ return &models.ValidationError{Field: "awsAccessKeyId", Message: "AWS Access Key ID is required"}
}
if strings.TrimSpace(registry.AWSRegion) == "" {
- return &models.ValidationError{Field: "awsRegion", Message: "AWS Region is required for ECR registries"}
+ return &models.ValidationError{Field: "awsRegion", Message: "AWS Region is required"}
}
if strings.TrimSpace(registry.AWSSecretAccessKey) == "" {
- return &models.ValidationError{Field: "awsSecretAccessKey", Message: "AWS Secret Access Key is required for ECR registries"}
+ return &models.ValidationError{Field: "awsSecretAccessKey", Message: "AWS Secret Access Key is required"}
}
if req.AWSAccessKeyID != nil || req.AWSSecretAccessKey != nil || req.AWSRegion != nil {
@@ -260,15 +254,18 @@ func (s *ContainerRegistryService) updateECRRegistryFieldsInternal(registry *mod
func (s *ContainerRegistryService) updateGenericRegistryFieldsInternal(registry *models.ContainerRegistry, req models.UpdateContainerRegistryRequest) error {
utils.UpdateIfChanged(&registry.Username, req.Username)
- if req.Token == nil || *req.Token == "" {
- return nil
+ if req.Token != nil && *req.Token != "" {
+ encryptedToken, err := crypto.Encrypt(*req.Token)
+ if err != nil {
+ return fmt.Errorf("failed to encrypt token: %w", err)
+ }
+ utils.UpdateIfChanged(&registry.Token, &encryptedToken)
}
- encryptedToken, err := crypto.Encrypt(*req.Token)
- if err != nil {
- return fmt.Errorf("failed to encrypt token: %w", err)
+ if strings.TrimSpace(registry.Username) == "" {
+ return &models.ValidationError{Field: "username", Message: "Username is required"}
}
- utils.UpdateIfChanged(&registry.Token, encryptedToken)
+
return nil
}
diff --git a/backend/internal/services/container_registry_service_test.go b/backend/internal/services/container_registry_service_test.go
index 9d0a763f3..90d296a90 100644
--- a/backend/internal/services/container_registry_service_test.go
+++ b/backend/internal/services/container_registry_service_test.go
@@ -131,6 +131,139 @@ func TestContainerRegistryService_CreateRegistry_RejectsUnsupportedRegistryType(
assert.Equal(t, "registryType", validationErr.Field)
}
+func TestContainerRegistryService_CreateRegistry_RejectsEmptyUsernameForGeneric(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ _, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "",
+ Token: "my-token",
+ })
+ require.Error(t, err)
+
+ var validationErr *models.ValidationError
+ require.ErrorAs(t, err, &validationErr)
+ assert.Equal(t, "username", validationErr.Field)
+}
+
+func TestContainerRegistryService_CreateRegistry_RejectsEmptyTokenForGeneric(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ _, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "my-user",
+ Token: "",
+ })
+ require.Error(t, err)
+
+ var validationErr *models.ValidationError
+ require.ErrorAs(t, err, &validationErr)
+ assert.Equal(t, "token", validationErr.Field)
+}
+
+func TestContainerRegistryService_CreateRegistry_AcceptsValidGenericCredentials(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ reg, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "my-user",
+ Token: "my-token",
+ })
+ require.NoError(t, err)
+ assert.Equal(t, "my-user", reg.Username)
+ assert.NotEmpty(t, reg.Token)
+}
+
+func TestContainerRegistryService_UpdateRegistry_RejectsBlankingUsername(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ reg, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "my-user",
+ Token: "my-token",
+ })
+ require.NoError(t, err)
+
+ empty := ""
+ _, err = svc.UpdateRegistry(context.Background(), reg.ID, models.UpdateContainerRegistryRequest{
+ Username: &empty,
+ })
+ require.Error(t, err)
+
+ var validationErr *models.ValidationError
+ require.ErrorAs(t, err, &validationErr)
+ assert.Equal(t, "username", validationErr.Field)
+}
+
+func TestContainerRegistryService_UpdateRegistry_KeepsExistingTokenWhenNotProvided(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ reg, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "my-user",
+ Token: "my-token",
+ })
+ require.NoError(t, err)
+ originalToken := reg.Token
+
+ newUser := "updated-user"
+ updated, err := svc.UpdateRegistry(context.Background(), reg.ID, models.UpdateContainerRegistryRequest{
+ Username: &newUser,
+ })
+ require.NoError(t, err)
+ assert.Equal(t, "updated-user", updated.Username)
+ assert.Equal(t, originalToken, updated.Token)
+}
+
+func TestContainerRegistryService_UpdateRegistry_RejectsChangingRegistryType(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ reg, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "my-user",
+ Token: "my-token",
+ })
+ require.NoError(t, err)
+
+ ecrType := "ecr"
+ _, err = svc.UpdateRegistry(context.Background(), reg.ID, models.UpdateContainerRegistryRequest{
+ RegistryType: &ecrType,
+ })
+ require.Error(t, err)
+
+ var validationErr *models.ValidationError
+ require.ErrorAs(t, err, &validationErr)
+ assert.Equal(t, "registryType", validationErr.Field)
+}
+
+func TestContainerRegistryService_UpdateRegistry_AllowsSameRegistryType(t *testing.T) {
+ _, db := setupImageServiceAuthTest(t)
+ svc := NewContainerRegistryService(db, nil)
+
+ reg, err := svc.CreateRegistry(context.Background(), models.CreateContainerRegistryRequest{
+ URL: "https://registry.example.com",
+ Username: "my-user",
+ Token: "my-token",
+ })
+ require.NoError(t, err)
+
+ genericType := "generic"
+ newUser := "updated-user"
+ updated, err := svc.UpdateRegistry(context.Background(), reg.ID, models.UpdateContainerRegistryRequest{
+ RegistryType: &genericType,
+ Username: &newUser,
+ })
+ require.NoError(t, err)
+ assert.Equal(t, "updated-user", updated.Username)
+ assert.Equal(t, "generic", updated.RegistryType)
+}
+
func TestContainerRegistryService_SyncRegistries_ClearsGenericTokenWhenManagerSendsEmptyValue(t *testing.T) {
_, db := setupImageServiceAuthTest(t)
createTestPullRegistry(t, db, "https://registry.example.com", "registry-user", "old-token")
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 4cfabe0bd..28ff3094c 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1336,9 +1336,11 @@
"registries_type_generic": "Generic (Docker / OCI)",
"registries_type_ecr": "Amazon ECR",
"registries_username_key_label": "Username/Key",
- "registries_aws_access_key_id_required": "AWS Access Key ID is required for ECR registries",
- "registries_aws_region_required": "AWS Region is required for ECR registries",
- "registries_aws_secret_access_key_required": "AWS Secret Access Key is required for ECR registries",
+ "registries_username_required": "Username is required",
+ "registries_token_required": "Token is required",
+ "registries_aws_access_key_id_required": "AWS Access Key ID is required",
+ "registries_aws_region_required": "AWS Region is required",
+ "registries_aws_secret_access_key_required": "AWS Secret Access Key is required",
"registries_aws_access_key_id": "AWS Access Key ID",
"registries_aws_secret_access_key": "AWS Secret Access Key",
"registries_aws_region": "AWS Region",
diff --git a/frontend/src/lib/components/sheets/container-registry-sheet.svelte b/frontend/src/lib/components/sheets/container-registry-sheet.svelte
index ef3abff91..c25d03b7d 100644
--- a/frontend/src/lib/components/sheets/container-registry-sheet.svelte
+++ b/frontend/src/lib/components/sheets/container-registry-sheet.svelte
@@ -66,6 +66,21 @@
path: ['awsSecretAccessKey']
});
}
+ } else {
+ if (!data.username?.trim()) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: m.registries_username_required(),
+ path: ['username']
+ });
+ }
+ if (!isEditMode && !data.token?.trim()) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: m.registries_token_required(),
+ path: ['token']
+ });
+ }
}
});
@@ -115,6 +130,7 @@
label={m.registries_type_label()}
options={registryTypeOptions}
bind:value={$inputs.registryType.value}
+ disabled={isEditMode}
/>
<FormInput