diff --git a/server/collusic-be/.gitignore b/server/collusic-be/.gitignore index 4791b467..3a02b827 100644 --- a/server/collusic-be/.gitignore +++ b/server/collusic-be/.gitignore @@ -59,4 +59,5 @@ gradle-app.setting ### Gradle Patch ### # Java heap dump -*.hprof \ No newline at end of file +*.hprof +**/out \ No newline at end of file diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java index 2243e0c6..65e04181 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/auth/JWTAuthenticationFilter.java @@ -80,6 +80,7 @@ private void authenticateWithRefreshToken(HttpServletRequest request, HttpServle chain.doFilter(request, response); } catch (ExpiredTokenException | EntityNotFoundException | AbnormalAccessException e) { tokenService.deleteRefreshToken(refreshToken); + CookieUtils.expireCookie(response, "refreshToken"); throw e; } } diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java index 9b740cb5..008561a8 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/JWTUtil.java @@ -3,13 +3,18 @@ import com.collusic.collusicbe.global.exception.jwt.ExpiredTokenException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.jsonwebtoken.*; -import lombok.extern.slf4j.Slf4j; - +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.SignatureException; +import io.jsonwebtoken.UnsupportedJwtException; import java.time.Instant; import java.util.Base64; import java.util.HashMap; import java.util.Map; +import lombok.extern.slf4j.Slf4j; @Slf4j public class JWTUtil { @@ -90,4 +95,5 @@ private static Map jwtHeaders() { headers.put("alg", SignatureAlgorithm.HS256); return headers; } + } \ No newline at end of file diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java index 5ed3f652..7b134729 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/service/S3Service.java @@ -4,6 +4,11 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -11,12 +16,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.time.LocalDateTime; -import java.util.Optional; - @Slf4j @RequiredArgsConstructor @Service @@ -45,7 +44,7 @@ public String upload(String nickname, @ModelAttribute MultipartFile multipartFil objectMetadata.setContentLength(multipartFile.getSize()); s3Client.putObject(new PutObjectRequest(bucket, path.toString(), multipartFile.getInputStream(), objectMetadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); + .withCannedAcl(CannedAccessControlList.PublicRead)); return cloudFrontDomain + path; } @@ -109,8 +108,9 @@ public String uploadAudioFile(MultipartFile audioFile) throws IOException { objectMetadata.setContentLength(audioFile.getSize()); s3Client.putObject(new PutObjectRequest(bucket, path.toString(), audioFile.getInputStream(), objectMetadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); + .withCannedAcl(CannedAccessControlList.PublicRead)); - return cloudFrontDomain + path; + return cloudFrontDomain + "/" + path; } + } diff --git a/server/collusic-be/src/main/resources/application-dev_db.yml b/server/collusic-be/src/main/resources/application-dev_db.yml index 859a4f4c..db789f11 100644 --- a/server/collusic-be/src/main/resources/application-dev_db.yml +++ b/server/collusic-be/src/main/resources/application-dev_db.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: org.h2.Driver - url: jdbc:h2:mem:testdb;MODE=MYSQL - username: sa - password: + url: ENC(gnyYY2my5ZaFbvuc1ShsFN8N/6HyTS1sQ5UD+qe72zTg/xZCwIDJsttUCG56/ZZfmIRoFEy6c0gJgFE1FhmB9lYNO9nGF2bf8F75TJqccuicBum0mkyqp30RmK7tC4VoKmHw97c6MRAyx3Iv7LagNw==) + username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) + password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) jpa: show-sql: true diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index 6a473cd1..856dfa29 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) + url: ENC(UGndU3lx2AdAtuUBkeDqoZNFWNVtiLKgCb4VNNobbK9khWEsKypyQgRfyc5gNbyWjCPYowzsLH3b+S4W5b8YR4AvNwmOkhFihe3+gXI4GgWHdjopECQldkFLaJBRR9HFl2Ir6fQydv6ENNImswxwCaBuAYBQJK9AyW1/l0PXE3ETuM+MR9fVj2u8lZdeYntG) username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) diff --git a/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java b/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java index 50963d23..b9ee83bc 100644 --- a/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java +++ b/server/collusic-be/src/test/java/com/collusic/collusicbe/config/JasyptTest.java @@ -39,7 +39,6 @@ public void setUp() { public void decryptTest() { String decryptedText = jasyptStringEncryptor.decrypt(defaultEncryptedText); - assertThat(decryptedText).isEqualTo(defaultRawText); }