🐛 修复自动设置 CORS 时，某些 S3 兼容性不同导致的 BUG（BackBlaze 不支持 * 和实际域名写到一起，不支持空值）

src/main/java/im/zhaojun/zfile/module/storage/service/base/AbstractS3BaseFileService.java

@@ -5,16 +5,7 @@ import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.amazonaws.HttpMethod;
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.BucketCrossOriginConfiguration;
-import com.amazonaws.services.s3.model.CORSRule;
-import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.services.s3.model.PutObjectResult;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
-import com.amazonaws.services.s3.model.SetBucketCrossOriginConfigurationRequest;
+import com.amazonaws.services.s3.model.*;
 import im.zhaojun.zfile.core.constant.ZFileConstant;
 import im.zhaojun.zfile.core.exception.StorageSourceAutoConfigCorsException;
 import im.zhaojun.zfile.core.util.StringUtils;
@@ -28,31 +19,27 @@ import javax.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author zhaojun
  */
 @Slf4j
 public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends AbstractBaseFileService<P> {
-    
+
     protected AmazonS3 s3Client;
-    
+
     public static final InputStream EMPTY_INPUT_STREAM = new ByteArrayInputStream(new byte[0]);
-    
+
     @Resource
     private SystemConfigService systemConfigService;
-    
+
     @Override
     public List<FileItemResult> fileList(String folderPath) {
         return s3FileList(folderPath);
     }
-    
-    
+
+
     /**
      * 默认 S3 获取对象下载链接的方法, 如果指定了域名, 则替换为自定义域名.
      * @return  S3 对象访问地址
@@ -61,33 +48,33 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
     public String getDownloadUrl(String pathAndName) {
         String bucketName = param.getBucketName();
         String domain = param.getDomain();
-        
+
         String fullPath = StringUtils.concatTrimStartSlashes(param.getBasePath() + pathAndName);
-        
+
         // 如果不是私有空间, 且指定了加速域名, 则直接返回下载地址.
         if (BooleanUtil.isFalse(param.isPrivate()) && StrUtil.isNotEmpty(domain)) {
             return StringUtils.concat(domain, StringUtils.encodeAllIgnoreSlashes(fullPath));
         }
-        
+
         Integer tokenTime = param.getTokenTime();
         if (param.getTokenTime() == null || param.getTokenTime() < 1) {
             tokenTime = 1800;
         }
-        
+
         Date expirationDate = new Date(System.currentTimeMillis() + tokenTime * 1000);
-        
+
         GeneratePresignedUrlRequest generatePresignedUrlRequest = new GeneratePresignedUrlRequest(bucketName, fullPath, HttpMethod.GET);
         generatePresignedUrlRequest.setExpiration(expirationDate);
         URL url = s3Client.generatePresignedUrl(generatePresignedUrlRequest);
-        
+
         String defaultUrl = url.toExternalForm();
         if (StrUtil.isNotEmpty(domain)) {
             defaultUrl = StringUtils.concat(domain, url.getFile());
         }
         return defaultUrl;
     }
-    
-    
+
+
     /**
      * 获取 S3 指定目录下的对象列表
      * @param path      路径
@@ -97,23 +84,23 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
         String bucketName = param.getBucketName();
         path = StringUtils.trimStartSlashes(path);
         String fullPath = StringUtils.trimStartSlashes(StringUtils.concat(param.getBasePath(), path, ZFileConstant.PATH_SEPARATOR));
-        
+
         List<FileItemResult> fileItemList = new ArrayList<>();
-    
+
         ListObjectsRequest listObjectsRequest = new ListObjectsRequest()
                 .withBucketName(bucketName)
                 .withPrefix(fullPath)
                 .withMaxKeys(1000)
                 .withDelimiter("/");
         ObjectListing objectListing = s3Client.listObjects(listObjectsRequest);
-        
+
         boolean isFirstWhile = true;
-        
+
         do {
             if (!isFirstWhile) {
                 objectListing = s3Client.listNextBatchOfObjects(objectListing);
             }
-    
+
             for (S3ObjectSummary s : objectListing.getObjectSummaries()) {
                 FileItemResult fileItemResult = new FileItemResult();
                 if (s.getKey().equals(fullPath)) {
@@ -124,13 +111,13 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
                 fileItemResult.setTime(s.getLastModified());
                 fileItemResult.setType(FileTypeEnum.FILE);
                 fileItemResult.setPath(path);
-        
+
                 String fullPathAndName = StringUtils.concat(path, fileItemResult.getName());
                 fileItemResult.setUrl(getDownloadUrl(fullPathAndName));
-        
+
                 fileItemList.add(fileItemResult);
             }
-    
+
             for (String commonPrefix : objectListing.getCommonPrefixes()) {
                 FileItemResult fileItemResult = new FileItemResult();
                 fileItemResult.setName(commonPrefix.substring(fullPath.length(), commonPrefix.length() - 1));
@@ -138,25 +125,25 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
                 if (StrUtil.isEmpty(name) || StrUtil.equals(name, StringUtils.DELIMITER_STR)) {
                     continue;
                 }
-        
+
                 fileItemResult.setType(FileTypeEnum.FOLDER);
                 fileItemResult.setPath(path);
                 fileItemList.add(fileItemResult);
             }
             isFirstWhile = false;
         } while (objectListing.isTruncated());
-        
+
         return fileItemList;
     }
-    
+
     @Override
     public FileItemResult getFileItem(String pathAndName) {
         String fileName = FileUtil.getName(pathAndName);
         String parentPath = StringUtils.getParentPath(pathAndName);
-        
+
         String trimStartPath = StringUtils.concatTrimStartSlashes(param.getBasePath(), pathAndName);
         ObjectMetadata objectMetadata = s3Client.getObjectMetadata(param.getBucketName(), trimStartPath);
-        
+
         FileItemResult fileItemResult = new FileItemResult();
         fileItemResult.setName(fileName);
         fileItemResult.setSize(objectMetadata.getInstanceLength());
@@ -166,7 +153,7 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
         fileItemResult.setUrl(getDownloadUrl(pathAndName));
         return fileItemResult;
     }
-    
+
     @Override
     public boolean newFolder(String path, String name) {
         name = StringUtils.trimSlashes(name);
@@ -176,7 +163,7 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
         PutObjectResult putObjectResult = s3Client.putObject(putObjectRequest);
         return putObjectResult != null;
     }
-    
+
     @Override
     public boolean deleteFile(String path, String name) {
         String fullPath = StringUtils.concat(param.getBasePath(), path, name);
@@ -184,7 +171,7 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
         s3Client.deleteObject(param.getBucketName(), fullPath);
         return true;
     }
-    
+
     @Override
     public boolean deleteFolder(String path, String name) {
         String fullPath = StringUtils.concat(param.getBasePath(), path, name);
@@ -192,36 +179,36 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
         s3Client.deleteObject(param.getBucketName(), fullPath + '/');
         return true;
     }
-    
+
     @Override
     public boolean renameFile(String path, String name, String newName) {
         String srcPath = StringUtils.concatTrimStartSlashes(param.getBasePath(), path, name);
         String distPath = StringUtils.concatTrimStartSlashes(param.getBasePath(), path, newName);
-        
+
         String bucketName = param.getBucketName();
         s3Client.copyObject(bucketName, srcPath, bucketName, distPath);
         deleteFile(path, name);
         return true;
     }
-    
+
     @Override
     public boolean renameFolder(String path, String name, String newName) {
         throw new UnsupportedOperationException("该存储类型不支持此操作");
     }
-    
+
     @Override
     public String getUploadUrl(String path, String name, Long size) {
         String bucketName = param.getBucketName();
         String uploadToPath = StringUtils.concat(param.getBasePath(), path, name);
         uploadToPath = StringUtils.trimStartSlashes(uploadToPath);
-        
+
         GeneratePresignedUrlRequest req =
                 new GeneratePresignedUrlRequest(bucketName, uploadToPath, HttpMethod.PUT);
         URL url = s3Client.generatePresignedUrl(req);
-        
+
         return url.toExternalForm();
     }
-    
+
     protected void setUploadCors() {
         if (param.isAutoConfigCors()) {
             try {
@@ -234,35 +221,46 @@ public abstract class AbstractS3BaseFileService<P extends S3BaseParam> extends A
                 if (corsRules == null) {
                     corsRules = new ArrayList<>();
                 }
-                
-                
+
+
                 // 当前要添加的规则
-                List<String> allowOrigins = Arrays.asList("*", systemConfigService.getDomain(), systemConfigService.getFrontDomain());
-                
+                List<String> allowOrigins = new ArrayList<>();
+                if (StrUtil.isNotEmpty(systemConfigService.getDomain())) {
+                    allowOrigins.add(systemConfigService.getDomain());
+                }
+                if (StrUtil.isNotEmpty(systemConfigService.getFrontDomain())) {
+                    allowOrigins.add(systemConfigService.getFrontDomain());
+                }
+
+                if (allowOrigins.isEmpty()) {
+                    throw new IllegalStateException("请先在 \"站点设置\" 中配置站点域名");
+                }
+
                 // 从历史规则中查找是否已经存在, 如果存在则不添加.
                 boolean presentCorsRules = corsRules.stream().anyMatch(corsRule -> {
                     List<String> origins = corsRule.getAllowedOrigins();
                     return new HashSet<>(origins).containsAll(allowOrigins);
                 });
-                
+
                 if (presentCorsRules) {
                     log.info("存储源 {} CORS 规则已经存在，不需要重复添加", storageId);
                     return;
                 }
-                
+
                 CORSRule corsRule = new CORSRule();
                 corsRule.setAllowedMethods(CORSRule.AllowedMethods.PUT, CORSRule.AllowedMethods.GET);
                 corsRule.setAllowedOrigins(allowOrigins);
                 corsRules.add(corsRule);
                 bucketCrossOriginConfiguration.setRules(corsRules);
-                
+
                 SetBucketCrossOriginConfigurationRequest setBucketCrossOriginConfigurationRequest =
                         new SetBucketCrossOriginConfigurationRequest(param.getBucketName(), bucketCrossOriginConfiguration);
+                log.info("{} 设置 CORS 规则: [allowedMethods={}, allowOrigins={}]", getStorageSimpleInfo(), corsRule.getAllowedMethods(), corsRule.getAllowedOrigins());
                 s3Client.setBucketCrossOriginConfiguration(setBucketCrossOriginConfigurationRequest);
             } catch (Exception e) {
                 throw new StorageSourceAutoConfigCorsException("设置跨域失败，请检查 API 密钥、地域、存储器名称是否正确，或 API 是否有权限设置跨域", e, param);
             }
         }
     }
-    
+
 }