이진용 sprint9#196
Open
alpha-lens wants to merge 42 commits into
Hidden character warning
The head ref may contain hidden characters: "\uc774\uc9c4\uc6a9-sprint9"
Open
Conversation
Collaborator
Author
|
conflict 나는건 .. 해결해보겠습니다... base 코드로 가면서 그런가.. |
# Conflicts: # .gitignore # discodeit/HELP.md # discodeit/build.gradle # discodeit/gradle/wrapper/gradle-wrapper.properties # discodeit/gradlew # discodeit/gradlew.bat # discodeit/src/main/java/com/sprint/mission/discodeit/controller/AuthController.java # discodeit/src/main/java/com/sprint/mission/discodeit/controller/BinaryContentController.java # discodeit/src/main/java/com/sprint/mission/discodeit/controller/ChannelController.java # discodeit/src/main/java/com/sprint/mission/discodeit/controller/MessageController.java # discodeit/src/main/java/com/sprint/mission/discodeit/controller/ReadStatusController.java # discodeit/src/main/java/com/sprint/mission/discodeit/controller/UserController.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/data/UserDto.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/data/UserStatusDto.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/BinaryContentCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/LoginRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/MessageCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/MessageUpdateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/PrivateChannelCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/PublicChannelCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/PublicChannelUpdateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/ReadStatusCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/ReadStatusUpdateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/UserCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/UserStatusCreateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/UserStatusUpdateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/request/UserUpdateRequest.java # discodeit/src/main/java/com/sprint/mission/discodeit/dto/response/PageResponse.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/Channel.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/Message.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/ReadStatus.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/User.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/UserStatus.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/base/BaseEntity.java # discodeit/src/main/java/com/sprint/mission/discodeit/entity/base/BaseUpdatableEntity.java # discodeit/src/main/java/com/sprint/mission/discodeit/mapper/ChannelMapper.java # discodeit/src/main/java/com/sprint/mission/discodeit/mapper/MessageMapper.java # discodeit/src/main/java/com/sprint/mission/discodeit/mapper/PageResponseMapper.java # discodeit/src/main/java/com/sprint/mission/discodeit/mapper/ReadStatusMapper.java # discodeit/src/main/java/com/sprint/mission/discodeit/mapper/UserMapper.java # discodeit/src/main/java/com/sprint/mission/discodeit/mapper/UserStatusMapper.java # discodeit/src/main/java/com/sprint/mission/discodeit/repository/BinaryContentRepository.java # discodeit/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java # discodeit/src/main/java/com/sprint/mission/discodeit/repository/MessageRepository.java # discodeit/src/main/java/com/sprint/mission/discodeit/repository/ReadStatusRepository.java # discodeit/src/main/java/com/sprint/mission/discodeit/repository/UserRepository.java # discodeit/src/main/java/com/sprint/mission/discodeit/repository/UserStatusRepository.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/MessageService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicAuthService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicReadStatusService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java # discodeit/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java # discodeit/src/main/java/com/sprint/mission/discodeit/storage/BinaryContentStorage.java # discodeit/src/main/java/com/sprint/mission/discodeit/storage/local/LocalBinaryContentStorage.java # discodeit/src/main/resources/schema.sql # discodeit/src/main/resources/static/index.html
- UserDto -> username
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
요구사항
기본
Spring Security 환경설정
com.sprint.mission.discodeit.configSecurityConfigSecurityFilterChainBean을 선언하세요.SecurityFilterChain을 등록하고, 이때 등록되는 필터 목록을 디버깅해보세요. 필터 목록은 PR에 첨부하세요.trace로 설정하세요.CSRF 보호 설정하기
디스코드잇은 CSR 방식이기 때문에 CSRF 토큰은 다음과 같이 처리합니다.
Set-Cookie)를 통해 쿠키에 저장X-XSRF-TOKEN)에 포함X-XSRF-TOKEN,Cookie)을 비교해 유효성 검증CsrfTokenRepository구현체를CookieCsrfTokenRepository로 설정하세요.HttpSessionCsrfTokenRepository입니다.false로 설정합니다.CsrfTokenRequestHandler컴포넌트를 대체하세요.XorCsrfTokenRequestAttributeHandler입니다.}
```
CSRF 토큰을 발급하는 API를 구현하세요.
GET /api/auth/csrf-token203 VoidCsrfToken파라미터를 메서드 인자로 선언하면,HandlerMethodArgumentResolver를 통해 자동으로 주입됩니다. ([공식문서](https://docs.spring.io/spring-security/reference/servlet/integrations/mvc.html#mvc-csrf-resolver))회원가입
POST /api/usersBody UserCreateRequest, MultipartFile200 UserDtoPasswordEncoder를 통해 해시로 저장하세요.PasswordEncoder의 구현체는BCryptPasswordEncoder를 활용하세요.인증 - 로그인
formLogin을 기본값으로 활성화하고, 추가된 필터를 확인해보세요.Spring Security의 formLogin 인증 흐름은 그대로 유지하면서 필요한 부분만 대체합니다.

UserDetailsUserDetailsServicePasswordEncoder: 이전에 정의한BCryptPasswordEncoder로 대체됩니다.AuthenticationSuccessHandlerAuthenticationFailureHandler로그인을 처리할 url을
/api/auth/login로 설정하세요.UserDetailsService컴포넌트를 대체하세요.InMemoryUserDetailsManager입니다.DiscodeitUserDetailsService를 정의하세요.UserDetails객체를 생성합니다.UserDetails컴포넌트를 대체하세요.org.springframework.security.core.userdetails.User입니다.DiscodeitUserDetails를 정의하세요.Principal)에 담을 수 있는 정보를 자유롭게 확장할 수 있습니다.UserDto와 비밀번호 정보를 저장하세요.DiscodeitUserDetailsService에서DiscodeitUserDetails를 생성 후 반환하세요.AuthenticationSuccessHandler컴포넌트를 대체하세요.SavedRequestAwareAuthenticationSuccessHandler입니다.LoginSuccessHandler를 정의하고 대체하세요.200 UserDto로 응답합니다.AuthenticiationFailureHandler컴포넌트를 대체하세요.SimpleUrlAuthenticationFailureHandler입니다.LoginFailureHandler를 정의하고 대체하세요.401 ErrorResponse로 응답합니다.이제 로그인 처리는 SecurityFilterChain에서 모두 처리되기 때문에 기존에 구현했던 로그인 관련 코드는 제거하세요.
AuthApi.login,AuthController.loginAuthService.loginLoginRequest인증 - 세션을 활용한 현재 사용자 정보 조회
UserDto)를 가져올 수 있도록 API를 정의하세요.GET /api/auth/meHeader(자동 포함) Cookie: JSESSIONID=…200 UserDtoSecurityFilterChain의 필터를 통해 인증에 성공하면Controller에서@AuthenticationPrincipal를 통해 인증 정보에 접근할 수 있습니다.인증 - 로그아웃
LogoutSuccessHandler/api/auth/logout로 설정하세요.LogoutSuccessHandler컴포넌트를 대체하세요.SimpleUrlLogoutSuccessHandler입니다.HttpStatusReturningLogoutSuccessHandler로 대체하세요.204 Void응답을 반환하세요.인가 - 권한 정의
- 관리자:
ADMIN- 채널 매니저:
CHANNEL_MANAGER- 일반 사용자:
USER```sql
CREATE TABLE users
(
...
role varchar(20) NOT NULL
);
USER권한을 기본 권한으로 설정하세요.- API 스펙
PUT /api/auth/roleBody UserRoleUpdateRequest200 UserDtoADMIN권한을 가진 어드민 계정이 초기화되도록 구현하세요.- 어드민 계정이 없는 경우에만 초기화하세요.
DiscodietUserDetails.getAuthorities를 수정하세요.인가 - 권한 적용
authorizeHttpRequests를 활성화하고, 모든 요청을 인증하도록 설정하세요.http .authorizeHttpRequests(auth -> auth .anyRequest().authenticated() )http .authorizeHttpRequests(auth -> auth ... .requestMatchers(...).permitAll() )- Csrf Token 발급
- 회원가입
- 로그인
- 로그아웃
- API가 아닌 요청(Swagger, Actuator 등)
... @EnableMethodSecurity public class SecurityConfig {...}- 퍼블릭 채널 생성, 수정, 삭제는
CHANNEL_MANAGER권한을 가져야합니다.- 사용자 권한 수정은
ADMIN권한을 가져야합니다.-
SecurityFilterChain,GlobalExceptionHandlerRoleHierarchy를 활용해 권한의 계층 구조를 정의하세요.- 관리자 > 채널 매니저 > 일반 사용자
```java
@bean
public RoleHierarchy roleHierarchy() {...}
심화
세션 관리 고도화
sessionConcurrency설정을 활용하세요.DiscodeitUserDetails의equals(),hashcode()메소드를 오버라이딩하세요.sessionRegistry를 활용하세요.httpSessionEventPublisher: HttpSession이 만료된 경우 이벤트를 통해 SessionRegistry의 SessionInformation도 자동으로 만료하기 위해 필요한 Bean입니다.- UserStatus 엔티티와 관련된 코드는 모두 삭제하세요.
- (로그아웃처럼)
HttpSession만료 시SessionRegistry의SessionInformation도 자동으로 만료 처리할 수 있도록HttpSessionEventPublisher를 Bean으로 등록합니다.java @Bean public HttpSessionEventPublisher httpSessionEventPublisher() { return new HttpSessionEventPublisher(); }로그인 고도화 - RememberMe
remember-me)가true인 경우 세션이 무효화되어도 자동으로 다시 로그인되도록 하세요.remember-me파라미터가true로 설정되어 요청합니다.remeberMe설정을 활용하세요.JESSIONID쿠키를 삭제 후 새로고침했을 때 인증 상태가 유지 되는지 확인해보세요.권한 적용 고도화
SpEL을 활용해 Method Security 기반 리소스 보호 정책을 강화해보세요.주요 변경사항
스크린샷
멘토에게