From 673b7ddda1bc37585ef6397b1072525648f9ef3f Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Wed, 25 Jan 2023 15:38:14 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat=20:=20=EC=BF=A0=ED=82=A4=20Path=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../6.8/executionHistory/executionHistory.bin | Bin 0 -> 19688 bytes .../6.8/executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .../.gradle/6.8/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/6.8/fileHashes/fileHashes.bin | Bin 0 -> 18697 bytes .../.gradle/6.8/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes server/collusic-be/.gradle/6.8/gc.properties | 0 .../buildOutputCleanup/buildOutputCleanup.lock | Bin 0 -> 17 bytes .../.gradle/buildOutputCleanup/cache.properties | 2 ++ .../.gradle/checksums/checksums.lock | Bin 0 -> 17 bytes .../.gradle/configuration-cache/gc.properties | 0 server/collusic-be/.gradle/vcs-1/gc.properties | 0 .../collusicbe/global/util/CookieUtils.java | 3 ++- 12 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 server/collusic-be/.gradle/6.8/executionHistory/executionHistory.bin create mode 100644 server/collusic-be/.gradle/6.8/executionHistory/executionHistory.lock create mode 100644 server/collusic-be/.gradle/6.8/fileChanges/last-build.bin create mode 100644 server/collusic-be/.gradle/6.8/fileHashes/fileHashes.bin create mode 100644 server/collusic-be/.gradle/6.8/fileHashes/fileHashes.lock create mode 100644 server/collusic-be/.gradle/6.8/gc.properties create mode 100644 server/collusic-be/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 server/collusic-be/.gradle/buildOutputCleanup/cache.properties create mode 100644 server/collusic-be/.gradle/checksums/checksums.lock create mode 100644 server/collusic-be/.gradle/configuration-cache/gc.properties create mode 100644 server/collusic-be/.gradle/vcs-1/gc.properties diff --git a/server/collusic-be/.gradle/6.8/executionHistory/executionHistory.bin b/server/collusic-be/.gradle/6.8/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..b838cd40aa1c3adcad75d1575ef0e118413e2e97 GIT binary patch literal 19688 zcmeI(Pe>F|90%~(KZQxrb`XT14q8yOJGSonuP$zD8fA&=Rzxt(pSSMYU3Z6hGcJ0F zFcCqq6x68b5_u?0GU{d?A~M2A4?%|#Is^q#hFzkt*?+7;2O)!q@4(JH-kW*9-|w^U z&1G3X#}zx4vj>+yitX8Qrehl}I-`Y52{o@(9rxw9y(3ldC zHLB`Dsh}BgL5?Mup^^Qixt3cXvZ6@UZn-j4P0UM3lI4)s>j`-(yi%1MQXEZZTW){f zd+6S4THf8WtK?%rzo^M!+D?2TBL#QYQfXwE#KyjZmPL>&_B0)fBb9L)Z4P>MfTo^s2!#;Vp&*^XnbxF zWb4gs8Z!vzc(v0%J3r%|n;o5+?;0L0x%xSk!{Zk=`z2LNn0rg7gr#$N|2K2V$Ko8* z=Rf(Dni|jioLtx;Ee-WvNvAYpvG=j`&P!+WWIeJ;a*juD+#9C(vBJcK=?|0V7L7ZL Osrq}Ic8mFDy7>#uTJEm^ literal 0 HcmV?d00001 diff --git a/server/collusic-be/.gradle/6.8/executionHistory/executionHistory.lock b/server/collusic-be/.gradle/6.8/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..114d170b418a81ad6f1d645e165e514f139a5306 GIT binary patch literal 17 UcmZR6&$;@un~?np1_)pV05ban`~Uy| literal 0 HcmV?d00001 diff --git a/server/collusic-be/.gradle/6.8/fileChanges/last-build.bin b/server/collusic-be/.gradle/6.8/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/server/collusic-be/.gradle/6.8/fileHashes/fileHashes.bin b/server/collusic-be/.gradle/6.8/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..f553a81cb67fa3f317381965a45310b5d9e2c79f GIT binary patch literal 18697 zcmeI%ze@sP9LMpmQ9}}BL*Z0ZQ}n}7TEfM;p$I{!AezE|AR?m4kjf~6hA@n#mRy>$ zp+f4WKnRC(s41c#q@f|OvFtgXJ0u+2;{CvL&zH~f;dox_86tjP)mc(o?X{5!0R#|0 z009ILKmY**5I_I{1Q0*~0R#|0009L4i@>b9h*w|6KhR(gt*au#Eox{?ZYJj9JCkWU z6`6>*{}1v#XSXBS=RGH1cJn~2e>#zmhMoMu%_E^yTFmcPCqHp>_f+|ke#a951Q0*~ z0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY** z{vr@kRYC{RQuxI){EY?z@a)sSvb^nd{Q} zL8ezXE{=4gJYL^0*WSk}vFQ9)?x{0g+23{=hq@t!`o_&;u*nQ$y^BfnEw}Koq8pc| Ky3w&^H+}#X=X;+3 literal 0 HcmV?d00001 diff --git a/server/collusic-be/.gradle/6.8/fileHashes/fileHashes.lock b/server/collusic-be/.gradle/6.8/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..13b892f0406e9969cd8f6370b3ec5ea20726cf4e GIT binary patch literal 17 UcmZQxyZ%s;G04fIqeE Date: Wed, 25 Jan 2023 15:57:33 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat=20:=20=EC=BF=A0=ED=82=A4=20Secure=20fa?= =?UTF-8?q?lse=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/collusic/collusicbe/global/util/CookieUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java index 81638b04..00278f24 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java @@ -31,7 +31,7 @@ public static String extractRefreshToken(HttpServletRequest request) { public static Cookie setCookieWith(String refreshToken) { Cookie cookie = new Cookie("refreshToken", refreshToken); cookie.setMaxAge(REFRESH_TIME); - cookie.setSecure(true); + cookie.setSecure(false); cookie.setHttpOnly(true); cookie.setPath("/"); return cookie; From 163ea956718c7e3e74429bc75ecde0b63461e547 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Tue, 9 Jan 2024 20:53:41 +0900 Subject: [PATCH 3/5] fix: cookie path / -> /reissue --- .../java/com/collusic/collusicbe/global/util/CookieUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java index 00278f24..c7749e0a 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java @@ -33,7 +33,7 @@ public static Cookie setCookieWith(String refreshToken) { cookie.setMaxAge(REFRESH_TIME); cookie.setSecure(false); cookie.setHttpOnly(true); - cookie.setPath("/"); + cookie.setPath("/reissue"); return cookie; } } \ No newline at end of file From 06879b02c4bceedb46c5515252456e2ae859295b Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Wed, 17 Jan 2024 22:12:29 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83?= =?UTF-8?q?,=20=ED=86=A0=ED=81=B0=20=EC=9E=AC=EB=B0=9C=EA=B8=89=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B3=B5=ED=86=B5=EB=90=9C=20=EC=83=81?= =?UTF-8?q?=EC=9C=84=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20=EA=B0=80=EC=A7=80?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/collusic/collusicbe/global/util/CookieUtils.java | 2 +- .../collusic/collusicbe/web/controller/MemberController.java | 2 +- .../com/collusic/collusicbe/web/controller/TokenController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java index c7749e0a..3ad12034 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/global/util/CookieUtils.java @@ -33,7 +33,7 @@ public static Cookie setCookieWith(String refreshToken) { cookie.setMaxAge(REFRESH_TIME); cookie.setSecure(false); cookie.setHttpOnly(true); - cookie.setPath("/reissue"); + cookie.setPath("/auth"); return cookie; } } \ No newline at end of file diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/MemberController.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/MemberController.java index 01b7d758..b00376d7 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/MemberController.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/MemberController.java @@ -87,7 +87,7 @@ public ResponseEntity getProfileUrl(@PathVariable String } @Operation(summary = "로그아웃", description = "로그인된 회원을 로그아웃 시킨다.") - @GetMapping("/logout") + @GetMapping("/auth/logout") public ResponseEntity logout(HttpServletRequest request, HttpServletResponse response) { tokenService.deleteRefreshToken(CookieUtils.extractRefreshToken(request)); CookieUtils.expireCookie(response, "refreshToken"); diff --git a/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/TokenController.java b/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/TokenController.java index c94a7525..20b71848 100644 --- a/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/TokenController.java +++ b/server/collusic-be/src/main/java/com/collusic/collusicbe/web/controller/TokenController.java @@ -17,7 +17,7 @@ public class TokenController { private final static String BEARER_PREFIX = "Bearer "; @Operation(summary = "토큰 재발급", description = "refresh token을 통한 access token 재발급") - @PostMapping("/reissue") + @PostMapping("/auth/reissue") public ResponseEntity reissue(HttpServletResponse response) { String bearer = response.getHeader("Authorization"); String accessToken = bearer.substring(BEARER_PREFIX.length()); From faf977d430305cd337700f9eb3d4347d504cf262 Mon Sep 17 00:00:00 2001 From: sunghyuki Date: Wed, 17 Jan 2024 22:56:43 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20/projects=20http=20get=20method=20?= =?UTF-8?q?=ED=98=B8=EC=B6=9C=20=EC=8B=9C=20spring=20security=20filter=20?= =?UTF-8?q?=EC=A7=80=EB=82=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collusicbe/global/auth/JWTAuthenticationFilter.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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..333445b3 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 @@ -7,6 +7,7 @@ import com.collusic.collusicbe.global.util.JWTUtil; import com.collusic.collusicbe.global.util.ParsingUtil; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -38,6 +39,14 @@ public JWTAuthenticationFilter(AuthenticationManager authenticationManager, Toke @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException, ExpiredTokenException { + String requestURI = request.getRequestURI(); + String method = request.getMethod(); + + if (HttpMethod.GET.matches(method) && requestURI.startsWith("/projects")) { + chain.doFilter(request, response); + return; + } + String bearer = request.getHeader(HttpHeaders.AUTHORIZATION); String refreshToken = CookieUtils.extractRefreshToken(request);