Skip to content

spring upgrade / csrf changes #50

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.

Sign up for GitHub

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

Open
vlachouli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

spring upgrade / csrf changes #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions .../qlack-util-csrf/src/main/java/com/eurodyn/qlack/util/csrf/filter/CustomCookieFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.eurodyn.qlack.util.csrf.service.TokenService;
import com.eurodyn.qlack.util.jwt.config.AppPropertiesUtilJwt;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.JwtException;
import io.jsonwebtoken.Jwts;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
Expand Down Expand Up @@ -64,7 +65,9 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
String clientToken = extractTokenFromCookie(request);
boolean invalidToken = invalidToken(clientToken);
Date jwtTokenTime = extractTimeFromJwtToken(request, tokenTime);
if (jwtTokenTime.before(new Date(Instant.now().toEpochMilli())) || invalidToken) {
if (Objects.isNull(jwtTokenTime)
|| jwtTokenTime.before(new Date(Instant.now().toEpochMilli()))
|| invalidToken) {
tokenService.removeToken(clientToken);
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Invalid token");
return;
Expand All @@ -75,6 +78,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
boolean createNewToken = false;
synchronized (this) {
Date tokenExpirationTime = getTokens.get(clientToken);
if (Objects.isNull(tokenExpirationTime)) {
tokenService.removeToken(clientToken);
response.sendError(HttpServletResponse.SC_FORBIDDEN, "Invalid token");
return;
}
long tokenTimeDiffSeconds =
(tokenExpirationTime.getTime() - Date.from(Instant.now()).getTime()) / 1000;
tokenService.updateToken(clientToken,
Expand Down Expand Up @@ -115,13 +123,19 @@ private void putNewTokenToCookie(HttpServletResponse response, Date tokenTime) {
private Date extractTimeFromJwtToken(HttpServletRequest request, Date tokenTime) {
String userAuthorizationHeaderJwt = request.getHeader(AUTHORIZATION);
//get remaining time off jwt token
if (Objects.nonNull(userAuthorizationHeaderJwt)) {
if (Objects.nonNull(userAuthorizationHeaderJwt)
&& userAuthorizationHeaderJwt.startsWith("Bearer ")
&& userAuthorizationHeaderJwt.length() > 7) {
String jwt = userAuthorizationHeaderJwt.substring(7);
byte[] apiKeySecretBytes2 = appProperties.getJwtSecret().getBytes();
Claims claims = Jwts.parser()
.setSigningKey(apiKeySecretBytes2)
.parseClaimsJws(jwt).getBody();
tokenTime = claims.getExpiration();
try {
Claims claims = Jwts.parser()
.setSigningKey(apiKeySecretBytes2)
.parseClaimsJws(jwt).getBody();
tokenTime = claims.getExpiration();
} catch (JwtException | IllegalArgumentException ex) {
return null;
}
}
return tokenTime;
}
Expand Down
20 changes: 6 additions & 14 deletions ...-Util/qlack-util-csrf/src/main/java/com/eurodyn/qlack/util/csrf/service/TokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;

import java.time.Instant;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@Component
public class TokenService {

// Maintain a map to store tokens
private final Map<String, Date> tokenMap = new HashMap<>();
private final Map<String, Date> tokenMap = new ConcurrentHashMap<>();

/**
* This method will retrieve the entire map of tokens without altering it
*/
@Cacheable(value = "tokenCache", key = "'allTokens'")
public Map<String, Date> getCachedTokens() {
return Collections.unmodifiableMap(tokenMap);
return Collections.unmodifiableMap(new HashMap<>(tokenMap));
}

/**
Expand All @@ -48,16 +48,8 @@ public Map<String, Date> removeToken(String key) {
*/
@Scheduled(cron = "${qlack.util.csrf.cookie-cache-clean-timer}")
public void cleanTokens() {
Map<String, Date> getAllTokens = getCachedTokens();
if (!CollectionUtils.isEmpty(getAllTokens)) {
Date now = new Date(Instant.now().toEpochMilli());
List<String> removeKeyList = getAllTokens.entrySet().stream()
.filter(entry -> entry.getValue().before(now))
.map(Map.Entry::getKey).toList();
if (!CollectionUtils.isEmpty(removeKeyList)) {
removeKeyList.forEach(this::removeToken);
}
}
Date now = new Date(Instant.now().toEpochMilli());
tokenMap.entrySet().removeIf(entry -> entry.getValue().before(now));
}

}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<lombok.version>1.18.36</lombok.version>
<mapstruct.version>1.6.3</mapstruct.version>
<sensesecure.version>0.6</sensesecure.version>
<spring-boot.version>3.5.14</spring-boot.version>
<spring-boot.version>3.5.15</spring-boot.version>
<squiggly-filter-jackson.version>1.3.18</squiggly-filter-jackson.version>
<query-dsl.version>5.1.0</query-dsl.version>

Expand Down