From 83796f2ffb535171a971b5452ef22bd460f575fc Mon Sep 17 00:00:00 2001 From: seungtaekhong Date: Mon, 15 Apr 2024 10:04:39 +0900 Subject: [PATCH 1/5] feat: add logging filter class --- .../global/security/LoggingFilter.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/com/playkuround/playkuroundserver/global/security/LoggingFilter.java diff --git a/src/main/java/com/playkuround/playkuroundserver/global/security/LoggingFilter.java b/src/main/java/com/playkuround/playkuroundserver/global/security/LoggingFilter.java new file mode 100644 index 00000000..a849e9d9 --- /dev/null +++ b/src/main/java/com/playkuround/playkuroundserver/global/security/LoggingFilter.java @@ -0,0 +1,33 @@ +package com.playkuround.playkuroundserver.global.security; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Slf4j +public class LoggingFilter extends OncePerRequestFilter { + + private static void logRequest(HttpServletRequest request) { + if (request.getRequestURI() != null && request.getRequestURI().contains("/prometheus")) { + return; + } + String queryString = request.getQueryString(); + log.info("Request : {} uri=[{}] content-type=[{}]", request.getMethod(), queryString == null ? request.getRequestURI() : request.getRequestURI() + queryString, request.getContentType()); + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + if (!isAsyncDispatch(request)) { + logRequest(request); + } + filterChain.doFilter(request, response); + } + +} + + From 777c3babef374312ca28be284666d852e558f839 Mon Sep 17 00:00:00 2001 From: seungtaekhong Date: Mon, 15 Apr 2024 10:04:51 +0900 Subject: [PATCH 2/5] feat: register logging filter --- .../playkuroundserver/global/config/WebSecurityConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/playkuround/playkuroundserver/global/config/WebSecurityConfig.java b/src/main/java/com/playkuround/playkuroundserver/global/config/WebSecurityConfig.java index c874eb20..59794c09 100644 --- a/src/main/java/com/playkuround/playkuroundserver/global/config/WebSecurityConfig.java +++ b/src/main/java/com/playkuround/playkuroundserver/global/config/WebSecurityConfig.java @@ -2,6 +2,7 @@ import com.playkuround.playkuroundserver.domain.auth.token.application.TokenManager; import com.playkuround.playkuroundserver.global.security.JwtAuthenticationFilter; +import com.playkuround.playkuroundserver.global.security.LoggingFilter; import com.playkuround.playkuroundserver.global.security.UserDetailsServiceImpl; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.security.servlet.PathRequest; @@ -56,6 +57,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti ).hasRole("ADMIN") .anyRequest().authenticated() ) + .addFilterBefore(new LoggingFilter(), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(new JwtAuthenticationFilter(tokenManager), UsernamePasswordAuthenticationFilter.class) .userDetailsService(userDetailsService) .build(); From e413f4fd8cf35c3239a387b8ff8ac3853cc34fce Mon Sep 17 00:00:00 2001 From: seungtaekhong Date: Mon, 15 Apr 2024 10:05:05 +0900 Subject: [PATCH 3/5] feat: update android version --- .../playkuround/playkuroundserver/domain/common/AppVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/playkuround/playkuroundserver/domain/common/AppVersion.java b/src/main/java/com/playkuround/playkuroundserver/domain/common/AppVersion.java index e090771c..bd5db1ec 100644 --- a/src/main/java/com/playkuround/playkuroundserver/domain/common/AppVersion.java +++ b/src/main/java/com/playkuround/playkuroundserver/domain/common/AppVersion.java @@ -7,7 +7,7 @@ public enum AppVersion { - ANDROID("2.0.2"), + ANDROID("2.0.3"), IOS("2.0.0"); private static final Map stringToEnum = From 8aa81b22c5055de3bc10d680694d008dc4801b43 Mon Sep 17 00:00:00 2001 From: seungtaekhong Date: Mon, 15 Apr 2024 10:50:23 +0900 Subject: [PATCH 4/5] update logging in prod --- .../domain/auth/token/application/TokenManager.java | 1 - src/main/resources/logback-spring.xml | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/playkuround/playkuroundserver/domain/auth/token/application/TokenManager.java b/src/main/java/com/playkuround/playkuroundserver/domain/auth/token/application/TokenManager.java index 05671741..be250214 100644 --- a/src/main/java/com/playkuround/playkuroundserver/domain/auth/token/application/TokenManager.java +++ b/src/main/java/com/playkuround/playkuroundserver/domain/auth/token/application/TokenManager.java @@ -118,7 +118,6 @@ private Claims parseClaims(String accessToken) { .parseClaimsJws(accessToken) .getBody(); } catch (Exception e) { - log.info("Invalid JWT Token", e); throw new InvalidTokenException(); } } diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 3c78bc92..f6b1aa09 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -86,12 +86,9 @@ - + - - - \ No newline at end of file From a7d6929f2ebee0b3d40086202f4eb5d0eb9f1bc1 Mon Sep 17 00:00:00 2001 From: seungtaekhong Date: Fri, 24 May 2024 22:37:43 +0900 Subject: [PATCH 5/5] feat: add home server code deploy --- .github/workflows/server-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/server-cd.yml b/.github/workflows/server-cd.yml index 718af708..15d946e0 100644 --- a/.github/workflows/server-cd.yml +++ b/.github/workflows/server-cd.yml @@ -19,7 +19,7 @@ jobs: uses: actions/cache@v3 with: path: | - ~/.gradle/caches + ~/.gradle/cachesz ~/.gradle/wrapper key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: |