-
Notifications
You must be signed in to change notification settings - Fork 36
#98 URL을 통해 비밀번호가 걸려있는 방 접근을 막기 위한 jwt 토큰 로직 추가 #100
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
60 changes: 60 additions & 0 deletions
60
springboot-backend/src/main/java/webChat/security/jwt/JwtRoomProvider.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package webChat.security.jwt; | ||
|
|
||
| import io.jsonwebtoken.Claims; | ||
| import io.jsonwebtoken.Jwts; | ||
| import io.jsonwebtoken.SignatureAlgorithm; | ||
| import io.jsonwebtoken.io.Decoders; | ||
| import io.jsonwebtoken.security.Keys; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.stereotype.Component; | ||
| import webChat.controller.ExceptionController; | ||
| import webChat.security.jwt.core.JwtCoreProvider; | ||
| import webChat.utils.StringUtil; | ||
|
|
||
| import java.nio.charset.StandardCharsets; | ||
| import java.security.Key; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| @Component | ||
| public class JwtRoomProvider { | ||
| private final long EXPIRE_MS; | ||
| private final JwtCoreProvider jwtCore; | ||
|
|
||
| public JwtRoomProvider( | ||
| @Qualifier("roomJwtKey") Key key, | ||
| @Value("${jwt.room.expire-ms:1800000}") long expireMs | ||
| ) { | ||
| this.jwtCore = new JwtCoreProvider(key); | ||
| this.EXPIRE_MS = expireMs; | ||
| } | ||
|
|
||
| public String create(String roomId, String userId) { | ||
| Map<String, Object> claims = new HashMap<>(); | ||
| claims.put("roomId", roomId); | ||
| claims.put("type", JwtTokenType.ROOM_ACCESS); | ||
|
|
||
| return jwtCore.create(userId, claims, EXPIRE_MS); | ||
| } | ||
|
|
||
| public void validate(String token, String roomId) throws ExceptionController.InvalidRoomAccessException { | ||
| try { | ||
| if (StringUtil.isNullOrEmpty(token)) { | ||
| throw new ExceptionController.InvalidRoomAccessException("Invalid access"); | ||
| } | ||
| Claims claims = jwtCore.parse(token); | ||
|
|
||
| if (!JwtTokenType.ROOM_ACCESS.name().equals(claims.get("type"))) { | ||
| throw new ExceptionController.InvalidRoomAccessException("Invalid room access info"); | ||
| } | ||
|
|
||
| String tokenRoomId = claims.get("roomId", String.class); | ||
| if (!roomId.equals(tokenRoomId)) { | ||
| throw new ExceptionController.InvalidRoomAccessException("Invalid room access info"); | ||
| } | ||
| } catch (Exception e) { | ||
| throw new ExceptionController.InvalidRoomAccessException("Invalid access"); | ||
| } | ||
| } | ||
| } |
5 changes: 5 additions & 0 deletions
5
springboot-backend/src/main/java/webChat/security/jwt/JwtTokenType.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package webChat.security.jwt; | ||
|
|
||
| public enum JwtTokenType { | ||
| ROOM_ACCESS | ||
| } |
23 changes: 23 additions & 0 deletions
23
springboot-backend/src/main/java/webChat/security/jwt/config/JwtKeyConfig.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package webChat.security.jwt.config; | ||
|
|
||
| import io.jsonwebtoken.io.Decoders; | ||
| import io.jsonwebtoken.security.Keys; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import java.security.Key; | ||
|
|
||
| @Configuration | ||
| public class JwtKeyConfig { | ||
|
|
||
| @Bean | ||
| @Qualifier("roomJwtKey") | ||
| public Key roomJwtKey( | ||
| @Value("${jwt.room.secret}") String secret | ||
kidonge marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ) { | ||
| return Keys.hmacShaKeyFor( | ||
| Decoders.BASE64.decode(secret) | ||
| ); | ||
| } | ||
| } | ||
39 changes: 39 additions & 0 deletions
39
springboot-backend/src/main/java/webChat/security/jwt/core/JwtCoreProvider.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package webChat.security.jwt.core; | ||
|
|
||
| import io.jsonwebtoken.Claims; | ||
| import io.jsonwebtoken.Jwts; | ||
| import io.jsonwebtoken.SignatureAlgorithm; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import java.security.Key; | ||
| import java.util.Date; | ||
| import java.util.Map; | ||
|
|
||
| @Component | ||
| public class JwtCoreProvider { | ||
|
|
||
| private final Key key; | ||
|
|
||
| public JwtCoreProvider(Key key) { | ||
| this.key = key; | ||
| } | ||
|
|
||
| public String create(String subject, Map<String, Object> claims, long expireMs) { | ||
| return Jwts.builder() | ||
| .setSubject(subject) | ||
| .addClaims(claims) | ||
| .setIssuedAt(new Date()) | ||
| .setExpiration(new Date(System.currentTimeMillis() + expireMs)) | ||
| .signWith(key, SignatureAlgorithm.HS256) | ||
| .compact(); | ||
| } | ||
|
|
||
| public Claims parse(String token) { | ||
| return Jwts.parser() | ||
| .setSigningKey(key) | ||
| .build() | ||
| .parseClaimsJws(token) | ||
sourcery-ai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .getBody(); | ||
| } | ||
| } | ||
|
|
||
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
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.
Uh oh!
There was an error while loading. Please reload this page.