From a78182cfc75726d5d5c0fcfa472b50f708337d81 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Wed, 15 Apr 2026 16:24:37 +0800 Subject: [PATCH] feat(handler): validate bucket name format and improve MinIO error handling - Added validation for bucket name format to ensure it meets specified criteria, returning an error message for invalid formats. - Simplified error messages for MinIO client creation and bucket auto-creation failures, enhancing clarity for users. - Updated success messages to reflect the correct status of bucket creation without public-read policy settings. This update improves the robustness of the MinIO integration and enhances user feedback during storage checks. --- internal/handler/system.go | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/internal/handler/system.go b/internal/handler/system.go index f067f407..1af6391d 100644 --- a/internal/handler/system.go +++ b/internal/handler/system.go @@ -824,6 +824,11 @@ func (h *SystemHandler) checkMinio(c *gin.Context, ctx context.Context, cfg *typ return } + if cfg.BucketName != "" && !cosFieldPattern.MatchString(cfg.BucketName) { + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: "Bucket 名称格式不正确,仅允许字母、数字、点、连字符"}}) + return + } + endpoint, accessKeyID, secretAccessKey := cfg.Endpoint, cfg.AccessKeyID, cfg.SecretAccessKey if cfg.Mode != "remote" { endpoint = os.Getenv("MINIO_ENDPOINT") @@ -846,7 +851,7 @@ func (h *SystemHandler) checkMinio(c *gin.Context, ctx context.Context, cfg *typ err := file.CheckMinioConnectivity(ctx, endpoint, accessKeyID, secretAccessKey, cfg.BucketName, cfg.UseSSL) if err != nil { errMsg := err.Error() - // If bucket does not exist, auto-create it with public-read policy + // If bucket does not exist, auto-create it if strings.Contains(errMsg, "does not exist") && cfg.BucketName != "" { logger.Info(ctx, "Storage check: bucket does not exist, attempting auto-creation", "bucket", cfg.BucketName) minioClient, clientErr := minio.New(endpoint, &minio.Options{ @@ -854,39 +859,16 @@ func (h *SystemHandler) checkMinio(c *gin.Context, ctx context.Context, cfg *typ Secure: cfg.UseSSL, }) if clientErr != nil { - c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("创建 MinIO 客户端失败: %s", sanitizeStorageCheckError(clientErr))}}) + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("Failed to create MinIO client: %s", sanitizeStorageCheckError(clientErr))}}) return } if mkErr := minioClient.MakeBucket(ctx, cfg.BucketName, minio.MakeBucketOptions{}); mkErr != nil { logger.Error(ctx, "Storage check: failed to create bucket", "bucket", cfg.BucketName, "error", mkErr) - c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("自动创建 Bucket「%s」失败: %s", cfg.BucketName, sanitizeStorageCheckError(mkErr))}}) + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: false, Message: fmt.Sprintf("Failed to auto-create Bucket '%s': %s", cfg.BucketName, sanitizeStorageCheckError(mkErr))}}) return } - // Set public-read policy - publicReadPolicy := fmt.Sprintf(`{ - "Version": "2012-10-17", - "Statement": [ - { - "Effect": "Allow", - "Principal": {"AWS": ["*"]}, - "Action": ["s3:GetBucketLocation", "s3:ListBucket"], - "Resource": ["arn:aws:s3:::%s"] - }, - { - "Effect": "Allow", - "Principal": {"AWS": ["*"]}, - "Action": ["s3:GetObject"], - "Resource": ["arn:aws:s3:::%s/*"] - } - ] - }`, cfg.BucketName, cfg.BucketName) - if policyErr := minioClient.SetBucketPolicy(ctx, cfg.BucketName, publicReadPolicy); policyErr != nil { - logger.Error(ctx, "Storage check: bucket created but failed to set public-read policy", "bucket", cfg.BucketName, "error", policyErr) - c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: true, BucketCreated: true, Message: fmt.Sprintf("Bucket「%s」已自动创建,但设置公有读策略失败,请手动配置权限", cfg.BucketName)}}) - return - } - logger.Info(ctx, "Storage check: bucket created with public-read policy", "bucket", cfg.BucketName) - c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: true, BucketCreated: true, Message: fmt.Sprintf("Bucket「%s」不存在,已自动创建并设置公有读权限", cfg.BucketName)}}) + logger.Info(ctx, "Storage check: bucket created", "bucket", cfg.BucketName) + c.JSON(200, gin.H{"code": 0, "data": StorageCheckResponse{OK: true, BucketCreated: true, Message: fmt.Sprintf("Bucket '%s' does not exist, and has been automatically created", cfg.BucketName)}}) return } logger.Error(ctx, "Storage check: MinIO connectivity failed", "error", err)