fix: S3 파일 업로드

Author: yueunfive

src/main/java/org/yourssu/festa/security/config/SecurityConfig.java

@@ -52,9 +52,7 @@ public JwtExceptionFilter jwtExceptionFilter() {
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         return http
-                .csrf(csrf -> csrf
-                        .ignoringRequestMatchers("/h2-console/**", "/api/booths/**", "/api/auth/login")
-                )
+                .csrf(csrf -> csrf.disable())  // CSRF 보호 비활성화
                 .headers(headers -> headers
                         .frameOptions(frame -> frame.sameOrigin()) //h2/console 띄우기 위해 필요
                 )

src/main/java/org/yourssu/festa/service/AmazonS3Manager.java

@@ -1,72 +1,39 @@
 package org.yourssu.festa.service;
 
-import com.amazonaws.services.s3.AmazonS3Client;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.ObjectMetadata;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-import org.yourssu.festa.common.code.BoothErrorCode;
-import org.yourssu.festa.config.AmazonConfig;
-import org.yourssu.festa.exception.CustomException;
-
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.*;
 
 @Component
 @RequiredArgsConstructor
 @Slf4j
 public class AmazonS3Manager {
-    private final AmazonS3Client amazonS3Client;
-    private final AmazonConfig amazonConfig;
+    private final AmazonS3 amazonS3;
 
-    public List<String> upload(List<MultipartFile> multipartFiles) throws IOException{
-        List<String> uploadImageUrls = new ArrayList<>();
-        String dirName =  amazonConfig.getReviewPath();
-        for (MultipartFile multipartFile : multipartFiles){
-            File uploadFile = convert(multipartFile)
-                    .orElseThrow(() -> new CustomException(BoothErrorCode.BOOTH_UPLOAD_IMAGE_FAILED));
-            String uploadImageUrl = upload(uploadFile, dirName);
-            uploadImageUrls.add(uploadImageUrl);
-        }
-        return uploadImageUrls; // 업로드된 파일들의 S3 URL 주소 리스트 반환
-    }
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
 
-    private String upload(File uploadFile, String dirName){
-        String uuid = UUID.randomUUID().toString();
-        String fileName = dirName + "/" + uuid + uploadFile.getName();
-        String uploadImageUrl = putS3(uploadFile, fileName);
-        removeNewFile(uploadFile);  // 로컬에 생성된 File 삭제 (MultipartFile -> File 전환 하며 로컬에 파일 생성됨)
-        return uploadImageUrl;
-    }
+    public List<String> upload(List<MultipartFile> multipartFiles) throws IOException {
+        List<String> fileUrls = new ArrayList<>();
 
-    private String putS3(File uploadFile, String fileName) {
-        amazonS3Client.putObject(
-                new PutObjectRequest(amazonConfig.getBucket(), fileName, uploadFile)
-                        .withCannedAcl(CannedAccessControlList.PublicRead) // PublicRead 권한으로 업로드 됨
-        );
-        return amazonS3Client.getUrl(amazonConfig.getBucket(), fileName).toString();
-    }
+        for (MultipartFile multipartFile : multipartFiles) {
+            String originalFilename = multipartFile.getOriginalFilename();
 
-    private void removeNewFile(File targetFile) {
-        if (targetFile.delete()) {
-            log.info("파일이 삭제되었습니다.");
-        } else {
-            log.info("파일이 삭제되지 못했습니다.");
-        }
-    }
+            ObjectMetadata metadata = new ObjectMetadata();
+            metadata.setContentLength(multipartFile.getSize());
+            metadata.setContentType(multipartFile.getContentType());
 
-    private Optional<File> convert(MultipartFile file) throws IOException {
-        File convertFile = new File(Objects.requireNonNull(file.getOriginalFilename()));
-        if (convertFile.createNewFile()) {
-            try (FileOutputStream fos = new FileOutputStream(convertFile)) {
-                fos.write(file.getBytes());
-            }
-            return Optional.of(convertFile);
+            amazonS3.putObject(bucket, originalFilename, multipartFile.getInputStream(), metadata);
+            String fileUrl = amazonS3.getUrl(bucket, originalFilename).toString();
+            fileUrls.add(fileUrl);
         }
-        return Optional.empty();
+
+        return fileUrls;
     }
 }