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

SUPPORT-8942: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2025-02-26 12:44:07 +03:00
parent c2c022d261
commit f7c234bd50
8 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/main/java/ru/micord/ervu/controller/ExtractController.java
View file

@ -24,7 +24,7 @@ import ru.micord.ervu.kafka.dto.FullExtract;
import ru.micord.ervu.kafka.service.ReplyingKafkaService; import ru.micord.ervu.kafka.service.ReplyingKafkaService;
import ru.micord.ervu.security.esia.model.PersonModel; import ru.micord.ervu.security.esia.model.PersonModel;
import ru.micord.ervu.security.esia.service.PersonalDataService; import ru.micord.ervu.security.esia.service.PersonalDataService;
import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
import ru.micord.ervu.security.webbpm.jwt.UserIdsPair; import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil; import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil;

4
backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoStore.java → backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java
View file

@ -1,4 +1,4 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.util.Map; import java.util.Map;
@ -6,6 +6,8 @@ import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ru.micord.ervu.security.esia.model.ExpiringState;
import ru.micord.ervu.security.esia.model.ExpiringToken;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov

4
backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringState.java → backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringState.java
View file

@ -1,4 +1,4 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia.model;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov
@ -28,7 +28,7 @@ public class ExpiringState {
this.expiryTime = expiryTime; this.expiryTime = expiryTime;
} }
boolean isExpired() { public boolean isExpired() {
return System.currentTimeMillis() > expiryTime; return System.currentTimeMillis() > expiryTime;
} }
} }

4
backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringToken.java → backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringToken.java
View file

@ -1,4 +1,4 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia.model;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov
@ -28,7 +28,7 @@ public class ExpiringToken {
this.expiryTime = expiryTime; this.expiryTime = expiryTime;
} }
boolean isExpired() { public boolean isExpired() {
return System.currentTimeMillis() > expiryTime; return System.currentTimeMillis() > expiryTime;
} }
} }

7
backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoClearShedulerService.java → backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthInfoClearShedulerService.java
View file

@ -1,17 +1,18 @@
package ru.micord.ervu.security.esia.token; package ru.micord.ervu.security.esia.service;
import net.javacrumbs.shedlock.core.SchedulerLock; import net.javacrumbs.shedlock.core.SchedulerLock;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
/** /**
* @author Eduard Tihomirov * @author Eduard Tihomirov
*/ */
@Service @Service
public class EsiaAuthInfoClearShedulerService { public class EsiaAuthInfoClearShedulerService {
@Scheduled(cron = "${esia.token.clear.cron:0 0 */1 * * *}") @Scheduled(cron = "${esia.auth.info.clear.cron:0 0 */1 * * *}")
@SchedulerLock(name = "clearToken") @SchedulerLock(name = "clearAuthInfo")
@Transactional @Transactional
public void run() { public void run() {
EsiaAuthInfoStore.removeExpiredRefreshToken(); EsiaAuthInfoStore.removeExpiredRefreshToken();

2
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -41,7 +41,7 @@ import ru.micord.ervu.security.esia.model.EsiaHeader;
import ru.micord.ervu.security.esia.model.EsiaTokenResponse; import ru.micord.ervu.security.esia.model.EsiaTokenResponse;
import ru.micord.ervu.security.esia.model.FormUrlencoded; import ru.micord.ervu.security.esia.model.FormUrlencoded;
import ru.micord.ervu.security.esia.model.PersonModel; import ru.micord.ervu.security.esia.model.PersonModel;
import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
import ru.micord.ervu.security.esia.config.EsiaConfig; import ru.micord.ervu.security.esia.config.EsiaConfig;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;

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

@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
import ru.micord.ervu.security.webbpm.jwt.UserIdsPair; import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
import ru.micord.ervu.security.webbpm.jwt.model.Token; import ru.micord.ervu.security.webbpm.jwt.model.Token;

2
config/standalone/dev/standalone.xml
View file

@ -79,7 +79,7 @@
<property name="ervu.kafka.registry.extract.request.topic" value="ervu.extract.info.request"/> <property name="ervu.kafka.registry.extract.request.topic" value="ervu.extract.info.request"/>
<property name="ervu.kafka.registry.extract.reply.topic" value="ervu.extract.info.response"/> <property name="ervu.kafka.registry.extract.reply.topic" value="ervu.extract.info.response"/>
<property name="ervu.kafka.extract.header.class" value="request@urn://rostelekom.ru/ERVU-extractFromRegistryTR/1.0.3"/> <property name="ervu.kafka.extract.header.class" value="request@urn://rostelekom.ru/ERVU-extractFromRegistryTR/1.0.3"/>
<property name="esia.token.clear.cron" value="0 0 */1 * * *"/> <property name="esia.auth.info.clear.cron" value="0 0 */1 * * *"/>
</system-properties> </system-properties>
<management> <management>
<audit-log> <audit-log>