Skip to content

fix: presigned url 에만 https 프로토콜 적용되도록 수정 #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Choi-JJunho merged 1 commit into from
Mar 3, 2024
Merged

fix: presigned url 에만 https 프로토콜 적용되도록 수정 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/main/java/koreatech/in/domain/Upload/UploadFileLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
@Getter
public class UploadFileLocation {

private static final String HTTPS_PROTOCOL = "https://";

private final String fileUrl;
private final String fileName;

Expand All @@ -16,13 +14,12 @@ private UploadFileLocation(String fileUrl, String fileName) {
}

public static UploadFileLocation of(String domainName, UploadFile uploadFile) {
return new UploadFileLocation(HTTPS_PROTOCOL + domainName + UploadFileFullPath.SLASH + uploadFile.getFullPath(),
return new UploadFileLocation(domainName + UploadFileFullPath.SLASH + uploadFile.getFullPath(),
uploadFile.getFileName());
}

public static UploadFileLocation of(String domainName, UploadFileFullPath uploadFileFullPath) {
return new UploadFileLocation(
HTTPS_PROTOCOL + domainName + UploadFileFullPath.SLASH + uploadFileFullPath.unixValue(),
return new UploadFileLocation(domainName + UploadFileFullPath.SLASH + uploadFileFullPath.unixValue(),
uploadFileFullPath.getFileFullName());
}

Expand Down
27 changes: 14 additions & 13 deletions src/main/java/koreatech/in/service/S3UploadServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import koreatech.in.domain.Upload.DomainEnum;
import koreatech.in.domain.Upload.PreSignedUrlResult;
import koreatech.in.domain.Upload.UploadFile;
Expand All @@ -24,12 +18,17 @@
import koreatech.in.dto.normal.upload.response.UploadFilesResponse;
import koreatech.in.mapstruct.normal.upload.UploadFileConverter;
import koreatech.in.util.S3Util;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

@Service
public class S3UploadServiceImpl implements UploadService {

private final S3Util s3Util;
private static final String HTTPS_PROTOCOL = "https://";

private final S3Util s3Util;
private final String bucketName;
private final String domainUrlPrefix;

Expand All @@ -54,7 +53,7 @@ public UploadFileResponse uploadAndGetUrl(MultipartFile multipartFile, DomainEnu

@Override
public UploadFileResponse uploadAndGetUrlForAdmin(MultipartFile multipartFile, DomainEnum domain) throws
IOException {
IOException {
domain.validateFor(multipartFile);

UploadFile file = UploadFile.of(multipartFile, domain.enrichDomainPathForAdmin());
Expand All @@ -65,7 +64,7 @@ public UploadFileResponse uploadAndGetUrlForAdmin(MultipartFile multipartFile, D
}

@Override
public UploadFilesResponse uploadAndGetUrls(List<MultipartFile> multipartFiles, DomainEnum domain) {
public UploadFilesResponse uploadAndGetUrls(List<MultipartFile> multipartFiles, DomainEnum domain) {
multipartFiles.forEach(domain::validateFor);

UploadFiles uploadFiles = UploadFiles.of(multipartFiles, domain.enrichDomainPath());
Expand All @@ -75,7 +74,7 @@ public UploadFilesResponse uploadAndGetUrls(List<MultipartFile> multipartFiles,
}

@Override
public UploadFilesResponse uploadAndGetUrlsForAdmin(List<MultipartFile> multipartFiles, DomainEnum domain) {
public UploadFilesResponse uploadAndGetUrlsForAdmin(List<MultipartFile> multipartFiles, DomainEnum domain) {
multipartFiles.forEach(domain::validateFor);

UploadFiles uploadFiles = UploadFiles.of(multipartFiles, domain.enrichDomainPathForAdmin());
Expand All @@ -91,11 +90,13 @@ public PreSignedUrlResponse generatePreSignedUrl(DomainEnum domain, PreSignedUrl

domain.validateMetaData(uploadFileMetaData);

UploadFileFullPath uploadFileFullPath = UploadFileFullPath.of(domain.enrichDomainPath(), uploadFileMetaData.getFileName());
UploadFileFullPath uploadFileFullPath = UploadFileFullPath.of(domain.enrichDomainPath(),
uploadFileMetaData.getFileName());
PreSignedUrlResult preSignedUrlResult = s3Util.generatePreSignedUrlForPut(bucketName, uploadFileMetaData,
uploadFileFullPath.unixValue(), new Date());
uploadFileFullPath.unixValue(), new Date());

UploadFileLocation uploadFileLocation = UploadFileLocation.of(domainUrlPrefix, uploadFileFullPath);
UploadFileLocation uploadFileLocation = UploadFileLocation.of(HTTPS_PROTOCOL + domainUrlPrefix,
Copy link
Member Author

@Choi-JJunho Choi-JJunho Mar 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

해당 부분에 추가

uploadFileFullPath);
return UploadFileConverter.INSTANCE.toPreSignedUrlResponse(preSignedUrlResult, uploadFileLocation);
}

Expand Down