Merge branch 'feature/SUPPORT-8942_fix' into develop

backend/src/main/java/ru/micord/ervu/controller/ExtractController.java

@@ -28,7 +28,7 @@ import ru.micord.ervu.kafka.dto.FullExtract;
 import ru.micord.ervu.kafka.service.ReplyingKafkaService;
 import ru.micord.ervu.security.esia.model.PersonModel;
 import ru.micord.ervu.security.esia.service.PersonalDataService;
-import ru.micord.ervu.security.esia.token.EsiaTokensStore;
+import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
 import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
 import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil;
 
@@ -81,7 +81,7 @@ public class ExtractController {
     }
     else {
       String esiaUserId = userIdsPair.getEsiaUserId(); // esiaUserId is not null here
-      String esiaAccessToken = EsiaTokensStore.getAccessToken(esiaUserId);
+      String esiaAccessToken = EsiaAuthInfoStore.getAccessToken(esiaUserId);
       PersonModel personModel = personalDataService.getPersonModel(esiaAccessToken);
 
       ExtractEmptyRequestDto emptyRequest = new ExtractEmptyRequestDto(

backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java

@@ -1,4 +1,4 @@
-package ru.micord.ervu.security.esia.token;
+package ru.micord.ervu.security.esia;
 
 import java.lang.invoke.MethodHandles;
 import java.util.Map;
@@ -6,14 +6,17 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import ru.micord.ervu.security.esia.model.ExpiringState;
+import ru.micord.ervu.security.esia.model.ExpiringToken;
 
 /**
  * @author Eduard Tihomirov
  */
-public class EsiaTokensStore {
+public class EsiaAuthInfoStore {
   private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final Map<String, ExpiringToken> ACCESS_TOKENS_MAP = new ConcurrentHashMap<>();
   private static final Map<String, ExpiringToken> REFRESH_TOKENS_MAP = new ConcurrentHashMap<>();
+  private static final Map<String, ExpiringState> PRNS_UUID_STATE_MAP = new ConcurrentHashMap<>();
 
   public static void addAccessToken(String prnOid, String token, long expiresIn) {
     if (token != null) {
@@ -75,4 +78,26 @@ public class EsiaTokensStore {
   public static void removeRefreshToken(String prnOid) {
     REFRESH_TOKENS_MAP.remove(prnOid);
   }
+
+  public static void addState(String prnsUUID, String state, long expiresIn) {
+    long expiryTime = System.currentTimeMillis() + expiresIn * 1000L;
+    PRNS_UUID_STATE_MAP.put(prnsUUID, new ExpiringState(state, expiryTime));
+  }
+
+  public static String getState(String prnsUUID) {
+    return PRNS_UUID_STATE_MAP.get(prnsUUID).getState();
+  }
+
+  public static void removeState(String prnsUUID) {
+    PRNS_UUID_STATE_MAP.remove(prnsUUID);
+  }
+
+  public static void removeExpiredState() {
+    for (String key : PRNS_UUID_STATE_MAP.keySet()) {
+      ExpiringState state = PRNS_UUID_STATE_MAP.get(key);
+      if (state != null && state.isExpired()) {
+        PRNS_UUID_STATE_MAP.remove(key);
+      }
+    }
+  }
 }

backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java

@@ -53,6 +53,13 @@ public class EsiaConfig {
   @Value("${esia.issuer.url}")
   private String esiaIssuerUrl;
 
+  @Value("${esia.marker.ver}")
+  private String esiaMarkerVer;
+
+  @Value("${esia.state.cookie.life.time:300}")
+  private long esiaStateCookieLifeTime;
+
+
   public String getEsiaScopes() {
     String[] scopeItems = esiaScopes.split(",");
     return String.join(" ", Arrays.stream(scopeItems).map(String::trim).toArray(String[]::new));
@@ -107,4 +114,13 @@ public class EsiaConfig {
   public String getEsiaIssuerUrl() {
     return esiaIssuerUrl;
   }
+
+  public String getEsiaMarkerVer() {
+    return esiaMarkerVer;
+  }
+
+
+  public long getEsiaStateCookieLifeTime() {
+    return esiaStateCookieLifeTime;
+  }
 }

backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java

@@ -5,10 +5,8 @@ import java.text.SimpleDateFormat;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import ru.micord.ervu.security.esia.model.PersonDataModel;
@@ -34,15 +32,15 @@ public class EsiaController {
   private JwtTokenService jwtTokenService;
 
   @RequestMapping(value = "/esia/url")
-  public String getEsiaUrl() {
+  public String getEsiaUrl(HttpServletResponse response) {
-    return esiaAuthService.generateAuthCodeUrl();
+    return esiaAuthService.generateAuthCodeUrl(response);
   }
 
   @GetMapping(value = "/esia/auth")
-  public void esiaAuth(@RequestParam(value = "code", required = false) String code,
+  public void esiaAuth(@RequestParam String code,
-      @RequestParam(value = "error", required = false) String error, HttpServletRequest request,
+      @RequestParam String state,
-      HttpServletResponse response) {
+      HttpServletResponse response, HttpServletRequest request) {
-    esiaAuthService.authEsiaTokensByCode(code, error, request, response);
+    esiaAuthService.authEsiaTokensByCode(code, state, response, request);
   }
 
   @RequestMapping(value = "/esia/refresh")

backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringState.java

@@ -0,0 +1,34 @@
+package ru.micord.ervu.security.esia.model;
+
+/**
+ * @author Eduard Tihomirov
+ */
+public class ExpiringState {
+  private String state;
+  private long expiryTime;
+
+  public ExpiringState(String state, long expiryTime) {
+    this.state = state;
+    this.expiryTime = expiryTime;
+  }
+
+  public String getState() {
+    return state;
+  }
+
+  public void setState(String state) {
+    this.state = state;
+  }
+
+  public long getExpiryTime() {
+    return expiryTime;
+  }
+
+  public void setExpiryTime(long expiryTime) {
+    this.expiryTime = expiryTime;
+  }
+
+  public boolean isExpired() {
+    return System.currentTimeMillis() > expiryTime;
+  }
+}

backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringToken.java

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

backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthInfoClearShedulerService.java

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

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

@@ -9,12 +9,15 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.UUID;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -25,7 +28,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.support.MessageSourceAccessor;
+import org.springframework.http.ResponseCookie;
 import org.springframework.security.core.context.SecurityContext;
+import org.springframework.web.util.WebUtils;
 import ru.micord.ervu.audit.constants.AuditConstants;
 import ru.micord.ervu.audit.service.AuditService;
 import ru.micord.ervu.kafka.model.Document;
@@ -38,7 +43,7 @@ import ru.micord.ervu.security.esia.model.EsiaHeader;
 import ru.micord.ervu.security.esia.model.EsiaTokenResponse;
 import ru.micord.ervu.security.esia.model.FormUrlencoded;
 import ru.micord.ervu.security.esia.model.PersonModel;
-import ru.micord.ervu.security.esia.token.EsiaTokensStore;
+import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
 import ru.micord.ervu.security.esia.config.EsiaConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -63,6 +68,7 @@ public class EsiaAuthService {
   private static final Logger LOGGER = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final MessageSourceAccessor MESSAGE_SOURCE = MessageBundleUtils.createAccessor(
       "messages/common_errors_messages");
+  private static final String PRNS_UUID = "prns_uuid";
   @Autowired
   private ObjectMapper objectMapper;
 
@@ -91,13 +97,14 @@ public class EsiaAuthService {
   @Value("${ervu.kafka.request.topic}")
   private String requestTopic;
 
-  public String generateAuthCodeUrl() {
+  public String generateAuthCodeUrl(HttpServletResponse response) {
     try {
       String clientId = esiaConfig.getClientId();
       DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx");
       ZonedDateTime dt = ZonedDateTime.now();
       String timestamp = dt.format(formatter);
       String state = UUID.randomUUID().toString();
+      String prnsUUID = UUID.randomUUID().toString();
       String redirectUrl = esiaConfig.getRedirectUrl();
       String redirectUrlEncoded = redirectUrl.replaceAll(":", "%3A")
           .replaceAll("/", "%2F");
@@ -111,6 +118,11 @@ public class EsiaAuthService {
       parameters.put("redirect_uri", esiaConfig.getRedirectUrl());
 
       String clientSecret = signMap(parameters);
+      EsiaAuthInfoStore.addState(prnsUUID, state, esiaConfig.getEsiaStateCookieLifeTime());
+      ResponseCookie prnsCookie = securityHelper.createCookie(PRNS_UUID, prnsUUID, "/")
+          .maxAge(esiaConfig.getEsiaStateCookieLifeTime())
+          .build();
+      securityHelper.addResponseCookie(response, prnsCookie);
 
       String responseType = "code";
 
@@ -159,21 +171,21 @@ public class EsiaAuthService {
     return uriBuilder.toString();
   }
 
-  public void authEsiaTokensByCode(String esiaAuthCode, String error,
+  public void authEsiaTokensByCode(String esiaAuthCode, String state, HttpServletResponse response, HttpServletRequest request) {
-      HttpServletRequest request, HttpServletResponse response) {
-    if (error != null && !error.equals("null")) {
-      throw new EsiaException(error);
-    }
     String esiaAccessTokenStr = null;
     String prnOid = null;
     Long expiresIn = null;
     long signSecret = 0, requestAccessToken = 0, verifySecret = 0;
+    String verifyStateResult = verifyStateFromCookie(request, state, response);
+    if (verifyStateResult != null) {
+      throw new EsiaException(verifyStateResult);
+    }
     try {
       String clientId = esiaConfig.getClientId();
       DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss xx");
       ZonedDateTime dt = ZonedDateTime.now();
       String timestamp = dt.format(formatter);
-      String state = UUID.randomUUID().toString();
+      String newState = UUID.randomUUID().toString();
       String redirectUrl = esiaConfig.getRedirectUrl();
       String scope = esiaConfig.getEsiaScopes();
 
@@ -181,7 +193,7 @@ public class EsiaAuthService {
       parameters.put("client_id", clientId);
       parameters.put("scope", scope);
       parameters.put("timestamp", timestamp);
-      parameters.put("state", state);
+      parameters.put("state", newState);
       parameters.put("redirect_uri", redirectUrl);
       parameters.put("code", esiaAuthCode);
 
@@ -194,7 +206,7 @@ public class EsiaAuthService {
           .setParameter("code", esiaAuthCode)
           .setParameter("grant_type", "authorization_code")
           .setParameter("client_secret", clientSecret)
-          .setParameter("state", state)
+          .setParameter("state", newState)
           .setParameter("redirect_uri", redirectUrl)
           .setParameter("scope", scope)
           .setParameter("timestamp", timestamp)
@@ -222,6 +234,9 @@ public class EsiaAuthService {
             tokenResponse != null ? tokenResponse.getErrorDescription() : "response is empty";
         throw new IllegalStateException("Esia response error. " + errMsg);
       }
+      if (!tokenResponse.getState().equals(newState)) {
+        throw new EsiaException("Token invalid. State from request not equals with state from response.");
+      }
       esiaAccessTokenStr = tokenResponse.getAccessToken();
       startTime = System.currentTimeMillis();
       String verifyResult = verifyToken(esiaAccessTokenStr);
@@ -233,8 +248,8 @@ public class EsiaAuthService {
       EsiaAccessToken esiaAccessToken = personalDataService.readToken(esiaAccessTokenStr);
       prnOid = esiaAccessToken.getSbjId();
       expiresIn = tokenResponse.getExpiresIn();
-      EsiaTokensStore.addAccessToken(prnOid, esiaAccessTokenStr, expiresIn);
+      EsiaAuthInfoStore.addAccessToken(prnOid, esiaAccessTokenStr, expiresIn);
-      EsiaTokensStore.addRefreshToken(prnOid, esiaRefreshTokenStr, expiresIn);
+      EsiaAuthInfoStore.addRefreshToken(prnOid, esiaRefreshTokenStr, expiresIn);
     }
     catch (Exception e) {
       throw new EsiaException(e);
@@ -324,8 +339,8 @@ public class EsiaAuthService {
       EsiaAccessToken esiaAccessToken = personalDataService.readToken(esiaAccessTokenStr);
       String prnOid = esiaAccessToken.getSbjId();
       Long expiresIn = tokenResponse.getExpiresIn();
-      EsiaTokensStore.addAccessToken(prnOid, esiaAccessTokenStr, expiresIn);
+      EsiaAuthInfoStore.addAccessToken(prnOid, esiaAccessTokenStr, expiresIn);
-      EsiaTokensStore.addRefreshToken(prnOid, esiaNewRefreshTokenStr, expiresIn);
+      EsiaAuthInfoStore.addRefreshToken(prnOid, esiaNewRefreshTokenStr, expiresIn);
       PersonModel personModel = personalDataService.getPersonModel(esiaAccessTokenStr);
       Response ervuIdResponse = getErvuIdResponse(personModel);
       createTokenAndAddCookie(response, esiaAccessToken.getSbjId(), ervuIdResponse.getErvuId(), expiresIn);
@@ -372,11 +387,11 @@ public class EsiaAuthService {
     PersonModel personModel = null;
     try {
       String userId = jwtTokenService.getUserAccountId(request);
-      String accessToken = EsiaTokensStore.getAccessToken(userId);
+      String accessToken = EsiaAuthInfoStore.getAccessToken(userId);
       personModel = personalDataService.getPersonModel(accessToken);
       securityHelper.clearAccessCookies(response);
-      EsiaTokensStore.removeAccessToken(userId);
+      EsiaAuthInfoStore.removeAccessToken(userId);
-      EsiaTokensStore.removeRefreshToken(userId);
+      EsiaAuthInfoStore.removeRefreshToken(userId);
       String logoutUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaLogoutUrl();
       String redirectUrl = esiaConfig.getLogoutRedirectUrl();
       URL url = new URL(logoutUrl);
@@ -422,13 +437,6 @@ public class EsiaAuthService {
     return person;
   }
 
-  private String getMessageId(Exception exception) {
-    return Integer.toUnsignedString(Objects
-        .hashCode(getCurrentUserEsiaId()), 36)
-           + "-"
-           + Integer.toUnsignedString(exception.hashCode(), 36);
-  }
-
   private void createTokenAndAddCookie(HttpServletResponse response, String userId, String ervuId,
       Long expiresIn) {
     Token token = jwtTokenService.createAccessToken(userId, expiresIn, ervuId);
@@ -448,6 +456,9 @@ public class EsiaAuthService {
     if (!esiaHeader.getSbt().equals("access")) {
       return "Token invalid. Token sbt: " + esiaHeader.getSbt() + " invalid";
     }
+    if (!esiaHeader.getVer().equals(esiaConfig.getEsiaMarkerVer())) {
+      return "Token invalid. Token ver: " + esiaHeader.getVer() + " invalid";
+    }
     if (!esiaHeader.getTyp().equals("JWT")) {
       return "Token invalid. Token type: " + esiaHeader.getTyp() + " invalid";
     }
@@ -457,17 +468,16 @@ public class EsiaAuthService {
     if (!esiaAccessToken.getIss().equals(esiaConfig.getEsiaIssuerUrl())) {
       return "Token invalid. Token issuer:" + esiaAccessToken.getIss() + " invalid";
     }
-    //TODO SUPPORT-8750
+    LocalDateTime iatTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getIat()),
-//    LocalDateTime iatTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getIat()),
+        ZoneId.systemDefault()
-//        ZoneId.systemDefault()
+    );
-//    );
+    LocalDateTime expTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getExp()),
-//    LocalDateTime expTime = LocalDateTime.ofInstant(Instant.ofEpochSecond(esiaAccessToken.getExp()),
+        ZoneId.systemDefault()
-//        ZoneId.systemDefault()
+    );
-//    );
+    LocalDateTime currentTime = LocalDateTime.now();
-//    LocalDateTime currentTime = LocalDateTime.now();
+    if (!currentTime.isAfter(iatTime) || !expTime.isAfter(iatTime)) {
-//    if (!currentTime.isAfter(iatTime) || !expTime.isAfter(iatTime)) {
+      return "Token invalid. Token expired";
-//      return "Token invalid. Token expired";
+    }
-//    }
     HttpResponse<String> response = signVerify(accessToken);
     if (response.statusCode() != 200) {
       if (response.statusCode() == 401) {
@@ -495,4 +505,19 @@ public class EsiaAuthService {
       throw new EsiaException(e);
     }
   }
+
+  private String verifyStateFromCookie(HttpServletRequest request, String state, HttpServletResponse response) {
+    Cookie cookie = WebUtils.getCookie(request, PRNS_UUID);
+    if (cookie == null) {
+      return "State invalid. Cookie not found";
+    }
+    String prnsUUID = cookie.getValue();
+    String oldState = EsiaAuthInfoStore.getState(prnsUUID);
+    if (oldState == null || !oldState.equals(state)) {
+      return "State invalid. State from ESIA not equals with state before";
+    }
+    EsiaAuthInfoStore.removeState(prnsUUID);
+    securityHelper.clearCookie(response, PRNS_UUID, "/");
+    return null;
+  }
 }

backend/src/main/java/ru/micord/ervu/security/esia/token/TokensClearShedulerService.java

@@ -1,20 +0,0 @@
-package ru.micord.ervu.security.esia.token;
-
-import net.javacrumbs.shedlock.core.SchedulerLock;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Eduard Tihomirov
- */
-@Service
-public class TokensClearShedulerService {
-  @Scheduled(cron = "${esia.token.clear.cron:0 0 */1 * * *}")
-  @SchedulerLock(name = "clearToken")
-  @Transactional
-  public void load() {
-    EsiaTokensStore.removeExpiredRefreshToken();
-    EsiaTokensStore.removeExpiredAccessToken();
-  }
-}

backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/helper/SecurityHelper.java

@@ -48,7 +48,13 @@ public final class SecurityHelper {
     addResponseCookie(response, emptyAuthMarker);
   }
 
-  private void addResponseCookie(HttpServletResponse response, ResponseCookie cookie) {
+  public void clearCookie(HttpServletResponse response, String name, String path) {
+    ResponseCookie emptyCookie = createCookie(name, null, path)
+        .maxAge(0).build();
+    addResponseCookie(response, emptyCookie);
+  }
+
+  public void addResponseCookie(HttpServletResponse response, ResponseCookie cookie) {
     response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString());
   }
 

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

@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import ru.micord.ervu.security.esia.token.EsiaTokensStore;
+import ru.micord.ervu.security.esia.EsiaAuthInfoStore;
 import ru.micord.ervu.security.exception.UnauthorizedException;
 import ru.micord.ervu.security.webbpm.jwt.UserIdsPair;
 import ru.micord.ervu.security.webbpm.jwt.model.Token;
@@ -68,7 +68,7 @@ public class JwtTokenService {
       return false;
     }
     String esiaUserId = new UserIdsPair(token.getUserAccountId()).getEsiaUserId();
-    return EsiaTokensStore.validateAccessToken(esiaUserId);
+    return EsiaAuthInfoStore.validateAccessToken(esiaUserId);
   }
 
   public Token getToken(String token) {
@@ -81,11 +81,11 @@ public class JwtTokenService {
   }
 
   public String getAccessToken(HttpServletRequest request) {
-    return EsiaTokensStore.getAccessToken(getUserAccountId(request));
+    return EsiaAuthInfoStore.getAccessToken(getUserAccountId(request));
   }
 
   public String getRefreshToken(HttpServletRequest request) {
-    return EsiaTokensStore.getRefreshToken(getUserAccountId(request));
+    return EsiaAuthInfoStore.getRefreshToken(getUserAccountId(request));
   }
 
   public String getUserAccountId(HttpServletRequest request) {

config/local.env

@@ -35,5 +35,5 @@ ERVU_KAFKA_REGISTRY_EXTRACT_REPLY_TOPIC=ervu.extract.info.response
 ERVU_KAFKA_EXTRACT_HEADER_CLASS=request@urn://rostelekom.ru/ERVU-extractFromRegistryTR/1.0.3
 ERVU_KAFKA_DOC_LOGIN_MODULE=org.apache.kafka.common.security.plain.PlainLoginModule
 
-ESIA_TOKEN_CLEAR_CRON=0 0 */1 * * *
+ESIA_AUTH_INFO_CLEAR_CRON=0 0 */1 * * *
 COOKIE_PATH=/fl

config/micord.env

@@ -46,5 +46,5 @@ AUDIT_KAFKA_PASSWORD=
 AUDIT_KAFKA_SASL_MECHANISM=
 AUDIT_KAFKA_ENABLED=false
 
-ESIA_TOKEN_CLEAR_CRON=0 0 */1 * * *
+ESIA_AUTH_INFO_CLEAR_CRON=0 0 */1 * * *
 COOKIE_PATH=/fl

config/standalone/dev/standalone.xml

@@ -80,7 +80,7 @@
         <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.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 * * *"/>
         <property name="sign.verify.url" value="https://ervu-sign-dev.k8s.micord.ru/verify"/>
         <property name="audit.kafka.bootstrap.servers" value="localhost:9092"/>
         <property name="audit.kafka.authorization.topic" value="ervu.lkrp.auth.events"/>

frontend/src/ts/modules/security/guard/auth.guard.ts

@@ -25,30 +25,15 @@ export abstract class AuthGuard implements CanActivate {
       let url = new URL(window.location.href);
       let params = new URLSearchParams(url.search);
       let code = params.get('code');
+      let state = params.get('state');
       let error = params.get('error');
       let errorDescription = params.get('error_description');
       if (isAccess) {
         return true;
       }
-      if (code || error) {
-        const params = new HttpParams().set('code', code).set('error', error);
-        this.httpClient.get("esia/auth",
-                            {
-                              params: params, responseType: 'text', observe: 'response', headers: {
-                                "Error-intercept-skip": "true"
-                              }
-                            })
-            .toPromise()
-            .then(
-                (response) => {
-                  window.open(url.origin + url.pathname, "_self");
-                })
-            .catch((reason) => {
-              let errorMessage = reason.error.messages != null
-                                 ? reason.error.messages
-                                 : reason.error.replaceAll('\\', '');
       if (error) {
-                errorMessage = 'Произошла неизвестная ошибка. Обратитесь к системному администратору';
+        let errorMessage =
+            'Произошла неизвестная ошибка. Обратитесь к системному администратору';
         let errorCode = this.extractCode(errorDescription);
         if (errorCode) {
           errorMessage = EsiaErrorDetail.getDescription(errorCode);
@@ -57,10 +42,18 @@ export abstract class AuthGuard implements CanActivate {
         this.messageService.error(errorMessage);
         console.error(consoleError);
       }
-              else {
+      if (code && state) {
-                this.messageService.error(errorMessage);
+        const params = new HttpParams().set('code', code).set('state', state);
-                console.error(reason);
+        this.httpClient.get("esia/auth",
-              }
+                            {
+                              params: params,
+                              responseType: 'text',
+                              observe: 'response',
+                            })
+            .toPromise()
+            .then(
+                () => {
+                  window.open(url.origin + url.pathname, "_self");
                 });
         return false;
       }