micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8755: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2024-12-24 20:11:53 +03:00
parent 65872ef7da
commit f86a8afd2f
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend/src/main/java/ru/micord/ervu/security/esia/token/TokensStore.java
View file

@ -3,6 +3,8 @@ package ru.micord.ervu.security.esia.token;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.springframework.security.authentication.CredentialsExpiredException;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov
*/ */
@ -18,7 +20,14 @@ public class TokensStore {
} }
public static String getAccessToken(String prnOid) { public static String getAccessToken(String prnOid) {
return accessTokensMap.get(prnOid).getAccessToken(); ExpiringToken token = accessTokensMap.get(prnOid);
if (token == null) {
throw new CredentialsExpiredException("No access token for prnOid: " + prnOid);
}
else if (token.isExpired()) {
throw new CredentialsExpiredException("Access token expired for prnOid: " + prnOid);
}
return token.getAccessToken();
} }
public static void removeExpiredAccessToken() { public static void removeExpiredAccessToken() {

2
backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/filter/JwtAuthenticationFilter.java
View file

@ -16,6 +16,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher;
import ru.micord.ervu.security.esia.token.TokensStore;
import ru.micord.ervu.security.webbpm.jwt.JwtAuthentication; import ru.micord.ervu.security.webbpm.jwt.JwtAuthentication;
import ru.micord.ervu.security.webbpm.jwt.helper.SecurityHelper; import ru.micord.ervu.security.webbpm.jwt.helper.SecurityHelper;
import ru.micord.ervu.security.webbpm.jwt.model.Token; import ru.micord.ervu.security.webbpm.jwt.model.Token;
@ -64,6 +65,7 @@ public class JwtAuthenticationFilter extends AbstractAuthenticationProcessingFil
if (ids.length != 2) { if (ids.length != 2) {
throw new CredentialsExpiredException("Invalid token. User has no ervuId"); throw new CredentialsExpiredException("Invalid token. User has no ervuId");
} }
TokensStore.getAccessToken(token.getUserAccountId());
} }
} }
catch (CredentialsExpiredException e) { catch (CredentialsExpiredException e) {

8
backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
View file

@ -34,9 +34,6 @@ public class JwtTokenService {
ResourceMetadataUtils.PROJECT_GROUP_ID + "." + ResourceMetadataUtils.PROJECT_ARTIFACT_ID; ResourceMetadataUtils.PROJECT_GROUP_ID + "." + ResourceMetadataUtils.PROJECT_ARTIFACT_ID;
private final SecretKey SIGNING_KEY; private final SecretKey SIGNING_KEY;
@Autowired
private HttpServletRequest request;
@Autowired @Autowired
public JwtTokenService(@Value("${webbpm.security.token.secret.key:ZjE5ZjMxNmYtODViZC00ZTQ5LWIxZmYtOGEzYzE3Yjc1MDVk}") public JwtTokenService(@Value("${webbpm.security.token.secret.key:ZjE5ZjMxNmYtODViZC00ZTQ5LWIxZmYtOGEzYzE3Yjc1MDVk}")
String secretKey) { String secretKey) {
@ -79,11 +76,6 @@ public class JwtTokenService {
return new Token(claims.getSubject(), claims.getIssuer(), claims.getExpiration(), token); return new Token(claims.getSubject(), claims.getIssuer(), claims.getExpiration(), token);
} }
public String getErvuId() {
String extractAuthToken = extractAuthToken(request);
return getToken(extractAuthToken).getUserAccountId().split(":")[1];
}
public String getAccessToken(HttpServletRequest request) { public String getAccessToken(HttpServletRequest request) {
return TokensStore.getAccessToken(getUserAccountId(request)); return TokensStore.getAccessToken(getUserAccountId(request));
} }