Skip to content

Commit 9d4e746

Browse files
fakerdeftfakerdeft
authored
Merge pull request #9 from YAPP-Github/feature/TNT-28
[TNT-28] feat: Authentication Filter 구현
2 parents 598a775 + 33fb5aa commit 9d4e746

21 files changed

+937
-35
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: MySQL Docker container for tests
4949
run: |
50-
sudo docker run -d -p 3306:3306 --env MYSQL_DATABASE={} --env MYSQL_ROOT_PASSWORD=root mysql:latest
50+
sudo docker run -d -p 3306:3306 --env MYSQL_DATABASE=tnt_dev --env MYSQL_ROOT_PASSWORD=root mysql:latest
5151
5252
- name: Build
5353
env:

‎build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jacocoTestCoverageVerification {
106106
excludes = [
107107
'*.*Application',
108108
'*.*Config',
109-
'*.*.*GlobalExceptionHandler'
109+
'*.error.*'
110110
]
111111
}
112112
}
@@ -126,7 +126,10 @@ dependencies {
126126
implementation 'org.springframework.boot:spring-boot-starter-aop'
127127
implementation 'org.springframework.boot:spring-boot-starter-webflux'
128128

129-
// 애플 로그인을 위한 라이브러리
129+
// TSID
130+
implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.9.0'
131+
132+
// 애플 로그인 관련 라이브러리
130133
implementation 'com.auth0:jwks-rsa:0.22.1'
131134
implementation 'org.json:json:20231013'
132135
implementation 'org.bouncycastle:bcprov-jdk18on:1.79'

‎config/naver-intellij-formatter-custom.xml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<code_scheme name="Naver-coding-convention-v1.2 custom" version="173">
2+
<option name="LINE_SEPARATOR" value="&#10;"/>
3+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5"/>
4+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="3"/>
5+
<option name="IMPORT_LAYOUT_TABLE">
6+
<value>
7+
<package name="" withSubpackages="true" static="false"/>
8+
<emptyLine/>
9+
<package name="javax" withSubpackages="true" static="false"/>
10+
<package name="java" withSubpackages="true" static="false"/>
11+
<emptyLine/>
12+
<package name="" withSubpackages="true" static="true"/>
13+
</value>
14+
</option>
15+
<option name="RIGHT_MARGIN" value="120"/>
16+
<option name="ENABLE_JAVADOC_FORMATTING" value="true"/>
17+
<option name="FORMATTER_TAGS_ENABLED" value="true"/>
18+
<JavaCodeStyleSettings>
19+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99"/>
20+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1"/>
21+
<option name="IMPORT_LAYOUT_TABLE">
22+
<value>
23+
<emptyLine/>
24+
<package name="" withSubpackages="true" static="true"/>
25+
<emptyLine/>
26+
<package name="java" withSubpackages="true" static="false"/>
27+
<emptyLine/>
28+
<package name="javax" withSubpackages="true" static="false"/>
29+
<emptyLine/>
30+
<package name="org" withSubpackages="true" static="false"/>
31+
<emptyLine/>
32+
<package name="net" withSubpackages="true" static="false"/>
33+
<emptyLine/>
34+
<package name="com" withSubpackages="true" static="false"/>
35+
<emptyLine/>
36+
<package name="" withSubpackages="true" static="false"/>
37+
<emptyLine/>
38+
<package name="com.nhncorp" withSubpackages="true" static="false"/>
39+
<emptyLine/>
40+
<package name="com.navercorp" withSubpackages="true" static="false"/>
41+
<emptyLine/>
42+
<package name="com.naver" withSubpackages="true" static="false"/>
43+
<emptyLine/>
44+
</value>
45+
</option>
46+
<option name="ENABLE_JAVADOC_FORMATTING" value="false"/>
47+
</JavaCodeStyleSettings>
48+
<codeStyleSettings language="JAVA">
49+
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false"/>
50+
<option name="LINE_COMMENT_ADD_SPACE" value="true"/>
51+
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false"/>
52+
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
53+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1"/>
54+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
55+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1"/>
56+
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1"/>
57+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
58+
<option name="SPACE_AFTER_TYPE_CAST" value="false"/>
59+
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"/>
60+
<option name="CALL_PARAMETERS_WRAP" value="1"/>
61+
<option name="METHOD_PARAMETERS_WRAP" value="1"/>
62+
<option name="EXTENDS_LIST_WRAP" value="1"/>
63+
<option name="THROWS_LIST_WRAP" value="5"/>
64+
<option name="EXTENDS_KEYWORD_WRAP" value="1"/>
65+
<option name="METHOD_CALL_CHAIN_WRAP" value="5"/>
66+
<option name="BINARY_OPERATION_WRAP" value="1"/>
67+
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
68+
<option name="TERNARY_OPERATION_WRAP" value="1"/>
69+
<option name="ARRAY_INITIALIZER_WRAP" value="1"/>
70+
<indentOptions>
71+
<option name="CONTINUATION_INDENT_SIZE" value="4"/>
72+
<option name="USE_TAB_CHARACTER" value="true"/>
73+
</indentOptions>
74+
</codeStyleSettings>
75+
</code_scheme>

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎src/main/java/com/tnt/application/auth/SessionService.java

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package com.tnt.application.auth;
2+
3+
import static io.micrometer.common.util.StringUtils.*;
4+
import static java.util.Objects.*;
5+
6+
import java.time.LocalDateTime;
7+
import java.util.concurrent.TimeUnit;
8+
9+
import org.springframework.data.redis.core.RedisTemplate;
10+
import org.springframework.stereotype.Service;
11+
12+
import com.tnt.domain.auth.SessionValue;
13+
import com.tnt.global.error.exception.UnauthorizedException;
14+
15+
import jakarta.servlet.http.HttpServletRequest;
16+
import lombok.RequiredArgsConstructor;
17+
import lombok.extern.slf4j.Slf4j;
18+
19+
@Slf4j
20+
@Service
21+
@RequiredArgsConstructor
22+
public class SessionService {
23+
24+
static final long SESSION_DURATION = 2L * 24 * 60 * 60; // 48시간
25+
private static final String AUTHORIZATION_HEADER = "Authorization";
26+
private static final String SESSION_ID_PREFIX = "SESSION-ID ";
27+
private final RedisTemplate<String, SessionValue> redisTemplate;
28+
29+
public String authenticate(HttpServletRequest request) {
30+
String authHeader = request.getHeader(AUTHORIZATION_HEADER);
31+
32+
if (isBlank(authHeader) || !authHeader.startsWith(SESSION_ID_PREFIX)) {
33+
log.error("Authorization 헤더가 존재하지 않거나 올바르지 않은 형식입니다.");
34+
35+
throw new UnauthorizedException("인가 세션이 존재하지 않습니다.");
36+
}
37+
38+
String sessionId = authHeader.substring(SESSION_ID_PREFIX.length());
39+
40+
requireNonNull(redisTemplate.opsForValue().get(sessionId), "세션 스토리지에 세션이 존재하지 않습니다.");
41+
42+
return sessionId;
43+
}
44+
45+
public void createSession(String memberId, HttpServletRequest request) {
46+
SessionValue sessionValue = SessionValue.builder()
47+
.lastAccessTime(LocalDateTime.now())
48+
.userAgent(request.getHeader("User-Agent"))
49+
.clientIp(request.getRemoteAddr())
50+
.build();
51+
52+
redisTemplate.opsForValue().set(
53+
memberId,
54+
sessionValue,
55+
SESSION_DURATION,
56+
TimeUnit.SECONDS
57+
);
58+
}
59+
60+
public void removeSession(String sessionId) {
61+
redisTemplate.delete(sessionId);
62+
}
63+
}

‎src/main/java/com/tnt/domain/auth/SessionValue.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.tnt.domain.auth;
2+
3+
import java.time.LocalDateTime;
4+
5+
import lombok.Builder;
6+
import lombok.Getter;
7+
8+
@Getter
9+
@Builder
10+
public class SessionValue {
11+
12+
private LocalDateTime lastAccessTime;
13+
private String userAgent;
14+
private String clientIp;
15+
}

‎src/main/java/com/tnt/domain/member/Member.java

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package com.tnt.domain.member;
2+
3+
import java.time.LocalDateTime;
4+
5+
import com.tnt.global.entity.BaseTimeEntity;
6+
7+
import io.hypersistence.utils.hibernate.id.Tsid;
8+
import jakarta.persistence.Column;
9+
import jakarta.persistence.Entity;
10+
import jakarta.persistence.EnumType;
11+
import jakarta.persistence.Enumerated;
12+
import jakarta.persistence.Id;
13+
import jakarta.persistence.Table;
14+
import lombok.AccessLevel;
15+
import lombok.Builder;
16+
import lombok.Getter;
17+
import lombok.NoArgsConstructor;
18+
19+
@Entity
20+
@Getter
21+
@Table(name = "member")
22+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
23+
public class Member extends BaseTimeEntity {
24+
25+
@Id
26+
@Tsid
27+
@Column(name = "id", nullable = false, unique = true)
28+
private Long id;
29+
30+
@Column(name = "social_id", nullable = false, unique = true)
31+
private String socialId;
32+
33+
@Column(name = "email", nullable = false, length = 100)
34+
private String email;
35+
36+
@Column(name = "name", nullable = false, length = 50)
37+
private String name;
38+
39+
@Column(name = "age", nullable = false)
40+
private int age;
41+
42+
@Column(name = "profile", nullable = false)
43+
private String profile;
44+
45+
@Column(name = "deleted_at")
46+
private LocalDateTime deletedAt;
47+
48+
@Enumerated(EnumType.STRING)
49+
@Column(name = "social_type", nullable = false)
50+
private SocialType socialType;
51+
52+
@Builder
53+
public Member(Long id, String socialId, String email, String name, int age, SocialType socialType) {
54+
this.id = id;
55+
this.socialId = socialId;
56+
this.email = email;
57+
this.name = name;
58+
this.age = age;
59+
this.profile = "";
60+
this.socialType = socialType;
61+
}
62+
}

‎src/main/java/com/tnt/domain/member/SocialType.java

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.tnt.domain.member;
2+
3+
public enum SocialType {
4+
KAKAO,
5+
GOOGLE,
6+
APPLE
7+
}

‎src/main/java/com/tnt/domain/member/repository/MemberRepository.java

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.tnt.domain.member.repository;
2+
3+
import org.springframework.data.jpa.repository.JpaRepository;
4+
import org.springframework.stereotype.Repository;
5+
6+
import com.tnt.domain.member.Member;
7+
8+
@Repository
9+
public interface MemberRepository extends JpaRepository<Member, Long> {
10+
11+
}

‎src/main/java/com/tnt/global/auth/SessionAuthenticationFilter.java

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
package com.tnt.global.auth;
2+
3+
import java.io.IOException;
4+
import java.util.List;
5+
6+
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
7+
import org.springframework.security.core.Authentication;
8+
import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper;
9+
import org.springframework.security.core.authority.mapping.NullAuthoritiesMapper;
10+
import org.springframework.security.core.context.SecurityContextHolder;
11+
import org.springframework.security.core.userdetails.User;
12+
import org.springframework.security.core.userdetails.UserDetails;
13+
import org.springframework.util.AntPathMatcher;
14+
import org.springframework.web.filter.OncePerRequestFilter;
15+
16+
import com.tnt.application.auth.SessionService;
17+
18+
import jakarta.servlet.FilterChain;
19+
import jakarta.servlet.ServletException;
20+
import jakarta.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletResponse;
22+
import lombok.RequiredArgsConstructor;
23+
import lombok.extern.slf4j.Slf4j;
24+
25+
@Slf4j
26+
@RequiredArgsConstructor
27+
public class SessionAuthenticationFilter extends OncePerRequestFilter {
28+
29+
private final GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
30+
private final AntPathMatcher pathMatcher = new AntPathMatcher();
31+
private final List<String> allowedUris;
32+
private final SessionService sessionService;
33+
34+
@Override
35+
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
36+
FilterChain filterChain) throws ServletException, IOException {
37+
String requestUri = request.getRequestURI();
38+
String queryString = request.getQueryString();
39+
40+
log.info("들어온 요청 - URI: {}, Query: {}, Method: {}", requestUri, queryString != null ? queryString : "쿼리 스트링 없음",
41+
request.getMethod());
42+
43+
if (isAllowedUri(requestUri)) {
44+
log.info("{} 허용 URI. 세션 유효성 검사 스킵.", requestUri);
45+
46+
filterChain.doFilter(request, response);
47+
return;
48+
}
49+
50+
try {
51+
checkSessionAndAuthentication(request);
52+
} catch (RuntimeException e) {
53+
log.error("인증 처리 중 에러 발생: ", e);
54+
55+
handleUnauthorizedException(response, e);
56+
return;
57+
}
58+
59+
filterChain.doFilter(request, response);
60+
}
61+
62+
private boolean isAllowedUri(String requestUri) {
63+
boolean allowed = false;
64+
65+
for (String pattern : allowedUris) {
66+
if (pathMatcher.match(pattern, requestUri)) {
67+
allowed = true;
68+
break;
69+
}
70+
}
71+
72+
log.info("URI {} is {}allowed", requestUri, allowed ? "" : "not ");
73+
74+
return allowed;
75+
}
76+
77+
private void checkSessionAndAuthentication(HttpServletRequest request) {
78+
String sessionId = sessionService.authenticate(request);
79+
80+
saveAuthentication(Long.parseLong(sessionId));
81+
}
82+
83+
private void handleUnauthorizedException(HttpServletResponse response, RuntimeException exception) throws
84+
IOException {
85+
log.error("인증 실패: ", exception);
86+
87+
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
88+
response.setContentType("application/json;charset=UTF-8");
89+
response.getWriter().write(exception.getMessage());
90+
}
91+
92+
private void saveAuthentication(Long sessionId) {
93+
UserDetails userDetails = User.builder()
94+
.username(String.valueOf(sessionId))
95+
.password("")
96+
.roles("USER")
97+
.build();
98+
99+
Authentication authentication = new UsernamePasswordAuthenticationToken(userDetails, null,
100+
authoritiesMapper.mapAuthorities(userDetails.getAuthorities()));
101+
102+
SecurityContextHolder.getContext().setAuthentication(authentication);
103+
104+
log.info("시큐리티 컨텍스트에 인증 정보 저장 완료 - SessionId: {}", sessionId);
105+
}
106+
}

0 commit comments

Comments
 (0)