[LINKER-X] fix: 불필요한 코드 삭제, 파일 확장자 Validation

YAPP-Github · Jan 28, 2024 · d8773ea · d8773ea
1 parent 6c81174
commit d8773ea
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/domain/src/main/java/com/imlinker/domain/common/file/FileType.java b/domain/src/main/java/com/imlinker/domain/common/file/FileType.java
@@ -1,12 +1,17 @@
 package com.imlinker.domain.common.file;
 
+import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
 public enum FileType {
-    JPEG("image/jpeg");
+    IMAGE(List.of(new String[] {"image/jpeg", "image/png"}));
 
-    private final String contentType;
+    private final List<String> contentType;
+
+    public boolean isSupported(String type) {
+        return contentType.contains(type);
+    }
 }
diff --git a/domain/src/main/java/com/imlinker/domain/user/UserService.java b/domain/src/main/java/com/imlinker/domain/user/UserService.java
@@ -84,7 +84,7 @@ public OperationResult update(UpdateUserParam param) {
 
     public OperationResult updateProfileImage(Long userId, MultipartFile file) {
         String fileName = String.format("user:%s-profile-%s", userId, LocalDateTime.now());
-        URL fileUrl = fileUploader.uploadImage(new UploadFileRequest(fileName, FileType.JPEG, file));
+        URL fileUrl = fileUploader.uploadImage(new UploadFileRequest(fileName, FileType.IMAGE, file));
 
         userUpdater.updateProfileImage(userId, fileUrl);
         return OperationResult.SUCCESS;

diff --git a/modules/aws/src/main/java/com/imlinker/s3/S3Uploader.java b/modules/aws/src/main/java/com/imlinker/s3/S3Uploader.java
@@ -30,16 +30,22 @@ public URL uploadImage(UploadFileRequest request) {
                 request.getFileName(),
                 request.getFileType().getContentType());
 
+        if (!request.getFileType().isSupported(request.getFile().getContentType())) {
+            log.info(
+                    "[S3][FileUpload][실패] 지원하지 않는 이미지 파일 형식(contentType={})",
+                    request.getFile().getContentType());
+            throw new ApplicationException(ErrorType.INVALID_REQUEST_PARAMETER);
+        }
+
         try {
             InputStream fis = request.getFile().getInputStream();
             ObjectMetadata metaData = new ObjectMetadata();
             metaData.setContentLength(request.getFile().getSize());
-            metaData.setContentType(request.getFileType().getContentType());
+            metaData.setContentType(request.getFile().getContentType());
 
             s3Client.putObject(bucket, request.getFileName(), fis, metaData);
             String responseUrl = s3Client.getUrl(bucket, request.getFileName()).toString();
 
-            System.out.println(responseUrl);
             return URL.of(responseUrl);
         } catch (Exception e) {
             log.info(

diff --git a/modules/aws/src/main/resources/application-aws-local.yml b/modules/aws/src/main/resources/application-aws-local.yml
@@ -2,4 +2,4 @@ aws:
   accessKey: ${AWS_ACCESS_KEY}
   secretKey: ${AWS_SECRET_KEY}
   s3:
-    bucket: ${AWS_S3_BUCKET:dangle-image}
+    bucket: ${AWS_S3_BUCKET}