Merge branch 'master' into hotfix/1.9.2

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

@@ -4,15 +4,15 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.kafka.common.utils.Bytes;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
 import ru.micord.ervu.converter.SummonsResponseDataConverter;
 import ru.micord.ervu.dto.SubpoenaRequestDto;
 import ru.micord.ervu.dto.SubpoenaResponseDto;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import proto.ervu.rp.summons.SummonsResponseData;
 import ru.micord.ervu.kafka.service.ReplyingKafkaService;
-import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
+import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil;
 
 /**
  * @author gulnaz
@@ -20,7 +20,6 @@ import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
 @RestController
 public class ErvuDataController {
 
-  private final JwtTokenService jwtTokenService;
   private final ReplyingKafkaService<Object, Bytes> replyingKafkaService;
   private final SummonsResponseDataConverter converter;
 
@@ -30,20 +29,23 @@ public class ErvuDataController {
   private String recruitReplyTopic;
 
   public ErvuDataController(
-      JwtTokenService jwtTokenService,
       @Qualifier("recruit") ReplyingKafkaService<Object, Bytes> replyingKafkaService,
       SummonsResponseDataConverter converter) {
-    this.jwtTokenService = jwtTokenService;
     this.replyingKafkaService = replyingKafkaService;
     this.converter = converter;
   }
 
-  @PostMapping(
-      value = "/get-data",
+  @GetMapping(
+      value = "/recruit",
       produces = MediaType.APPLICATION_JSON_VALUE
   )
   public SubpoenaResponseDto getData() {
-    SubpoenaRequestDto subpoenaRequestDto = new SubpoenaRequestDto(jwtTokenService.getErvuId());
+    String ervuId = SecurityUtil.getErvuId();
+
+    if (ervuId == null) {
+      return new SubpoenaResponseDto.Builder().build();
+    }
+    SubpoenaRequestDto subpoenaRequestDto = new SubpoenaRequestDto(ervuId);
     byte[] reply = replyingKafkaService.sendMessageAndGetReply(recruitRequestTopic,
         recruitReplyTopic, subpoenaRequestDto).get();
 

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

@@ -18,7 +18,7 @@ import rtl.pgs.ervu.proto.ExtractRegistry;
 import rtl.pgs.ervu.proto.ResponseData;
 import ru.micord.ervu.dto.ExtractRequestDto;
 import ru.micord.ervu.kafka.service.ReplyingKafkaService;
-import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
+import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil;
 
 /**
  * @author gulnaz
@@ -26,7 +26,6 @@ import ru.micord.ervu.security.webbpm.jwt.service.JwtTokenService;
 @RestController
 public class ExtractController {
 
-  private final JwtTokenService jwtTokenService;
   private final ReplyingKafkaService<Object, Bytes> replyingKafkaService;
 
   @Value("${ervu.kafka.registry.extract.request.topic}")
@@ -34,15 +33,18 @@ public class ExtractController {
   @Value("${ervu.kafka.registry.extract.reply.topic}")
   private String registryExtractReplyTopic;
 
-  public ExtractController(JwtTokenService jwtTokenService,
-      ReplyingKafkaService<Object, Bytes> replyingKafkaService) {
-    this.jwtTokenService = jwtTokenService;
+  public ExtractController(ReplyingKafkaService<Object, Bytes> replyingKafkaService) {
     this.replyingKafkaService = replyingKafkaService;
   }
 
   @GetMapping(value = "/extract/{formatRegistry}")
   public ResponseEntity<Resource> getExtract(@PathVariable String formatRegistry) {
-    ExtractRequestDto request = new ExtractRequestDto(jwtTokenService.getErvuId(), formatRegistry);
+    String ervuId = SecurityUtil.getErvuId();
+
+    if (ervuId == null) {
+      return ResponseEntity.noContent().build();
+    }
+    ExtractRequestDto request = new ExtractRequestDto(ervuId, formatRegistry);
     byte[] reply = replyingKafkaService.sendMessageAndGetReply(registryExtractRequestTopic,
         registryExtractReplyTopic, request).get();
 

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

@@ -11,7 +11,6 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Base64;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -26,6 +25,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.context.SecurityContext;
 import ru.micord.ervu.kafka.model.Document;
+import ru.micord.ervu.kafka.model.ErrorData;
 import ru.micord.ervu.kafka.model.Person;
 import ru.micord.ervu.kafka.model.Response;
 import ru.micord.ervu.kafka.service.ReplyingKafkaService;
@@ -50,6 +50,7 @@ import ru.micord.ervu.security.webbpm.jwt.model.Token;
  */
 @Service
 public class EsiaAuthService {
+
   @Autowired
   private ObjectMapper objectMapper;
 
@@ -220,12 +221,6 @@ public class EsiaAuthService {
       SecurityContextHolder.setContext(context);
       Cookie authMarkerCookie = securityHelper.createAuthMarkerCookie("true", expiry);
       response.addCookie(authMarkerCookie);
-      if (ervuIdResponse.getErrorData() != null) {
-        return new ResponseEntity<>(
-            "Доступ запрещен. " + ervuIdResponse.getErrorData().getName(),
-            HttpStatus.FORBIDDEN
-        );
-      }
       return ResponseEntity.ok("Authentication successful");
     }
     catch (Exception e) {

backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java

@@ -2,12 +2,15 @@ package ru.micord.ervu.security.webbpm.jwt.util;
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.util.WebUtils;
+import ru.micord.ervu.security.webbpm.jwt.JwtAuthentication;
 
 import static org.springframework.web.context.request.RequestAttributes.REFERENCE_REQUEST;
 
@@ -42,4 +45,14 @@ public final class SecurityUtil {
     Cookie cookie = WebUtils.getCookie(httpRequest, AUTH_TOKEN);
     return cookie != null ? cookie.getValue() : null;
   }
+
+  public static String getErvuId() {
+    return Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication())
+        .map(a -> ((JwtAuthentication) a).getUserAccountId())
+        .map(userAccountId -> {
+          String ervuId = userAccountId.split(":")[1];
+          return "null".equals(ervuId) ? null : ervuId;
+        })
+        .orElse(null);
+  }
 }