diff --git a/build.gradle b/build.gradle index 253b43d..94c809f 100644 --- a/build.gradle +++ b/build.gradle @@ -54,9 +54,4 @@ dependencies { tasks.named('test') { useJUnitPlatform() -} - -def querydslDir = 'build/generated/sources/annotationProcessor/java/main' -sourceSets { - main.java.srcDirs += [querydslDir] -} +} \ No newline at end of file diff --git a/src/main/java/com/smartlogis/userservice/config/SecurityConfig.java b/src/main/java/com/smartlogis/userservice/config/SecurityConfig.java new file mode 100644 index 0000000..ff1565b --- /dev/null +++ b/src/main/java/com/smartlogis/userservice/config/SecurityConfig.java @@ -0,0 +1,46 @@ +package com.smartlogis.userservice.config; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import com.smartlogis.common.infrastructure.security.HeaderAuthenticationFilter; +import com.smartlogis.common.infrastructure.security.RestAccessDeniedHandler; +import com.smartlogis.common.infrastructure.security.RestAuthenticationEntryPoint; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Configuration +@EnableMethodSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final HeaderAuthenticationFilter headerAuthenticationFilter; + private final RestAuthenticationEntryPoint restAuthenticationEntryPoint; + private final RestAccessDeniedHandler restAccessDeniedHandler; + + @Bean + @ConditionalOnMissingBean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + return http.csrf(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .logout(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .addFilterBefore(headerAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) + .sessionManagement(c -> c.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .exceptionHandling(c -> { + c.authenticationEntryPoint(restAuthenticationEntryPoint); + c.accessDeniedHandler(restAccessDeniedHandler); + }) + .build(); + } + +} diff --git a/src/main/java/com/smartlogis/userservice/domain/UserId.java b/src/main/java/com/smartlogis/userservice/domain/UserId.java index 32f5a26..bf89cc9 100644 --- a/src/main/java/com/smartlogis/userservice/domain/UserId.java +++ b/src/main/java/com/smartlogis/userservice/domain/UserId.java @@ -15,7 +15,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class UserId { - @Column(name = "user_id") + @Column private UUID id; protected UserId(UUID id) { this.id = id;} diff --git a/src/main/java/com/smartlogis/userservice/presentation/UserController.java b/src/main/java/com/smartlogis/userservice/presentation/UserController.java index f60b8f2..438239c 100644 --- a/src/main/java/com/smartlogis/userservice/presentation/UserController.java +++ b/src/main/java/com/smartlogis/userservice/presentation/UserController.java @@ -76,6 +76,7 @@ public ResponseEntity> signup(@Valid @RequestBody UserRegister } @Operation(summary = "로그인한 회원정보 조회") + @PreAuthorize("isAuthenticated()") @GetMapping public ResponseEntity> getUser(@AuthenticationPrincipal AuthenticatedUser authentication) { UserInfoResponse user = userService.getUserById(UUID.fromString(authentication.getId())); @@ -138,6 +139,7 @@ public ResponseEntity> updateUserRole( } @Operation(summary = "회원 탈퇴") + @PreAuthorize("isAuthenticated()") @DeleteMapping("/delete") public ResponseEntity> delete( @AuthenticationPrincipal AuthenticatedUser authentication diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 73354b3..3068062 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %logger{36} - %msg%n