refactor: 호환 가능 확장자 파일 추가 및 파일 최대 용량 제한 (#82)

SOPT-all · Jan 23, 2025 · e540ee3 · e540ee3
1 parent 6db52b2
commit e540ee3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/java/be/dash/dashserver/api/support/GlobalExceptionHandler.java b/src/main/java/be/dash/dashserver/api/support/GlobalExceptionHandler.java
@@ -9,6 +9,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
 import be.dash.dashserver.api.exception.DashApiException;
 import be.dash.dashserver.api.exception.ErrorMessage;
@@ -18,6 +19,7 @@
 import be.dash.dashserver.core.exception.NotFoundException;
 import be.dash.dashserver.core.log.LogForm;
 import lombok.extern.slf4j.Slf4j;
+import software.amazon.awssdk.services.s3.model.S3Exception;
 
 @Slf4j
 @RestControllerAdvice
@@ -84,6 +86,18 @@ public ResponseEntity<ErrorMessage> handleNotFoundException(NotFoundException e)
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorMessage(e.getMessage()));
     }
 
+    @ExceptionHandler(MaxUploadSizeExceededException.class)
+    public ResponseEntity<ErrorMessage> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) {
+        log.warn("handleMaxUploadSizeExceededException in GlobalExceptionHandler throw {} : {}", e.getClass(), e.getMessage());
+        return ResponseEntity.status(HttpStatus.PAYLOAD_TOO_LARGE).body(new ErrorMessage(e.getMessage()));
+    }
+
+    @ExceptionHandler(S3Exception.class)
+    public ResponseEntity<ErrorMessage> handleS3Exception(S3Exception e) {
+        log.warn("handleS3Exception in GlobalExceptionHandler throw {} : {}", e.getClass(), e.getMessage());
+        return ResponseEntity.badRequest().body(new ErrorMessage(e.getMessage()));
+    }
+
     @ExceptionHandler(DashApiException.class)
     public ResponseEntity<ErrorMessage> handleDashApiException(DashApiException e) {
         log.warn("handleDashApiException in GlobalExceptionHandler throw {} : {}", e.getClass(), e.getMessage());

diff --git a/src/main/java/be/dash/dashserver/external/s3/S3ImageUploader.java b/src/main/java/be/dash/dashserver/external/s3/S3ImageUploader.java
@@ -20,7 +20,7 @@
 public class S3ImageUploader implements ImageUploader {
     private final S3Properties s3Properties;
     private final S3Config s3Config;
-    private static final List<String> IMAGE_EXTENSIONS = Arrays.asList("image/jpeg", "image/png", "image/jpg", "image/webp");
+    private static final List<String> IMAGE_EXTENSIONS = Arrays.asList("image/jpeg", "image/png", "image/jpg", "image/webp", "image/heic", "image/heif");
 
     @Override
     public String uploadImage(MultipartFile image) throws IOException {
@@ -49,7 +49,7 @@ private String generateImageFileName() {
     private void validateExtension(MultipartFile image) {
         String contentType = image.getContentType();
         if (!IMAGE_EXTENSIONS.contains(contentType)) {
-            throw new BadRequestException("이미지 확장자는 jpg, png, webp만 가능합니다.");
+            throw new BadRequestException("이미지 확장자는 jpg, png, webp, heic, heif만 가능합니다.");
         }
     }
 }