Skip to content

Commit e279f88

Browse files
essaysiressaysir
committed
feat : 최신 앱 버전 API 구현을 위한 security 변경
1 parent 019d79b commit e279f88

File tree

2 files changed

+77
-73
lines changed

2 files changed

+77
-73
lines changed

‎src/main/java/umc/th/juinjang/api/appVersion/controller/AppVersionController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import lombok.RequiredArgsConstructor;
88
import umc.th.juinjang.api.appVersion.controller.response.AppVersionResponse;
9-
import umc.th.juinjang.api.dto.ApiResponse;
9+
import umc.th.juinjang.apiPayload.ApiResponse;
1010
import umc.th.juinjang.config.AppVersionProperties;
1111

1212
@RestController

‎src/main/java/umc/th/juinjang/config/SecurityConfig.java‎

Lines changed: 76 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package umc.th.juinjang.config;
22

3-
import lombok.RequiredArgsConstructor;
3+
import java.util.Arrays;
4+
45
import org.springframework.context.annotation.Bean;
56
import org.springframework.context.annotation.Configuration;
67
import org.springframework.core.annotation.Order;
@@ -16,85 +17,88 @@
1617
import org.springframework.security.config.http.SessionCreationPolicy;
1718
import org.springframework.security.web.SecurityFilterChain;
1819
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
20+
21+
import lombok.RequiredArgsConstructor;
1922
import umc.th.juinjang.jwt.JwtAuthenticationFilter;
2023
import umc.th.juinjang.jwt.JwtExceptionFilter;
2124
import umc.th.juinjang.service.auth.JwtService;
2225

23-
import java.util.Arrays;
24-
2526
@Configuration
2627
@EnableWebSecurity
2728
@RequiredArgsConstructor
2829
public class SecurityConfig {
29-
private final AuthenticationConfiguration authenticationConfiguration;
30-
31-
private final JwtService jwtService;
32-
33-
private final JwtExceptionFilter jwtExceptionFilter;
34-
35-
private final Environment environment;
36-
@Bean
37-
@Order(0)
38-
public WebSecurityCustomizer webSecurityCustomizer(){
39-
String[] activeProfiles = environment.getActiveProfiles();
40-
boolean isProd = Arrays.asList(activeProfiles).contains("prod");
41-
42-
//prod아닐때
43-
if (!isProd) {
44-
return web -> web.ignoring()
45-
.requestMatchers("/swagger-ui/**", "/swagger/**", "/swagger-resources/**", "/swagger-ui.html", "/test",
46-
"/configuration/ui", "/v3/api-docs/**", "/h2-console/**", "/api/auth/regenerate-token",
47-
"/api/auth/kakao/**", "/api/auth/apple/**", "/actuator/prometheus",
48-
"/api/auth/v2/apple/**", "/api/auth/v2/kakao/**");
49-
}
50-
else {
51-
return web -> web.ignoring()
52-
.requestMatchers("/h2-console/**", "/api/auth/regenerate-token",
53-
"/api/auth/kakao/**", "/api/auth/apple/**", "/actuator/prometheus",
54-
"/api/auth/v2/apple/**", "/api/auth/v2/kakao/**");
55-
}
56-
57-
}
58-
59-
//선언 방식이 3.x에서 바뀜
60-
@Bean AuthenticationManager authenticationManager(AuthenticationConfiguration authConfiguration) throws Exception
61-
{ return authConfiguration.getAuthenticationManager(); }
62-
63-
@Bean
64-
protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
65-
66-
http
67-
.csrf(AbstractHttpConfigurer::disable)
68-
.formLogin(Customizer.withDefaults())
69-
.sessionManagement((sessionManagement) ->
70-
sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
71-
// 세션을 사용하지 않는다고 설정함
72-
)
73-
.addFilter(new JwtAuthenticationFilter(authenticationManager(authenticationConfiguration),jwtService))
74-
// JwtAuthenticationFilter를 필터에 넣음
75-
.authorizeHttpRequests((authorizeRequests) ->
76-
authorizeRequests
77-
.requestMatchers(
78-
AntPathRequestMatcher.antMatcher("/api/auth/**")
79-
).authenticated()
80-
.requestMatchers(
81-
AntPathRequestMatcher.antMatcher("/h2-console/**")
82-
).permitAll()
83-
84-
.anyRequest().authenticated()
85-
86-
)
87-
.headers(
88-
headersConfigurer ->
89-
headersConfigurer
90-
.frameOptions(
91-
HeadersConfigurer.FrameOptionsConfig::sameOrigin
92-
)
93-
)
94-
.addFilterBefore(jwtExceptionFilter, JwtAuthenticationFilter.class);
95-
96-
return http.build();
97-
}
30+
private final AuthenticationConfiguration authenticationConfiguration;
31+
32+
private final JwtService jwtService;
33+
34+
private final JwtExceptionFilter jwtExceptionFilter;
35+
36+
private final Environment environment;
37+
38+
@Bean
39+
@Order(0)
40+
public WebSecurityCustomizer webSecurityCustomizer() {
41+
String[] activeProfiles = environment.getActiveProfiles();
42+
boolean isProd = Arrays.asList(activeProfiles).contains("prod");
43+
44+
//prod아닐때
45+
if (!isProd) {
46+
return web -> web.ignoring()
47+
.requestMatchers("/swagger-ui/**", "/swagger/**", "/swagger-resources/**", "/swagger-ui.html", "/test",
48+
"/configuration/ui", "/v3/api-docs/**", "/h2-console/**", "/api/auth/regenerate-token",
49+
"/api/auth/kakao/**", "/api/auth/apple/**", "/actuator/prometheus",
50+
"/api/auth/v2/apple/**", "/api/auth/v2/kakao/**");
51+
} else {
52+
return web -> web.ignoring()
53+
.requestMatchers("/h2-console/**", "/api/auth/regenerate-token",
54+
"/api/auth/kakao/**", "/api/auth/apple/**", "/actuator/prometheus",
55+
"/api/auth/v2/apple/**", "/api/auth/v2/kakao/**", "/api/app/version/ios");
56+
}
57+
58+
}
59+
60+
//선언 방식이 3.x에서 바뀜
61+
@Bean
62+
AuthenticationManager authenticationManager(AuthenticationConfiguration authConfiguration) throws Exception {
63+
return authConfiguration.getAuthenticationManager();
64+
}
65+
66+
@Bean
67+
protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
68+
69+
http
70+
.csrf(AbstractHttpConfigurer::disable)
71+
.formLogin(Customizer.withDefaults())
72+
.sessionManagement((sessionManagement) ->
73+
sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
74+
// 세션을 사용하지 않는다고 설정함
75+
)
76+
.addFilter(new JwtAuthenticationFilter(authenticationManager(authenticationConfiguration), jwtService))
77+
// JwtAuthenticationFilter를 필터에 넣음
78+
.authorizeHttpRequests((authorizeRequests) ->
79+
authorizeRequests
80+
.requestMatchers(
81+
AntPathRequestMatcher.antMatcher("/api/auth/**")
82+
).authenticated()
83+
.requestMatchers(
84+
AntPathRequestMatcher.antMatcher("/h2-console/**"),
85+
AntPathRequestMatcher.antMatcher("/api/app/version/ios")
86+
).permitAll()
87+
88+
.anyRequest().authenticated()
89+
90+
)
91+
.headers(
92+
headersConfigurer ->
93+
headersConfigurer
94+
.frameOptions(
95+
HeadersConfigurer.FrameOptionsConfig::sameOrigin
96+
)
97+
)
98+
.addFilterBefore(jwtExceptionFilter, JwtAuthenticationFilter.class);
99+
100+
return http.build();
101+
}
98102

99103
}
100104

0 commit comments

Comments
 (0)