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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Халтобин Евгений 2025-07-23 14:30:06 +03:00
commit 4f3bc896ef
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
backend/src/main/java/ru/micord/ervu/audit/service/impl/BaseAuditService.java
View file

@ -1,8 +1,5 @@
package ru.micord.ervu.audit.service.impl; package ru.micord.ervu.audit.service.impl;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
@ -32,8 +29,6 @@ import ru.micord.ervu.util.NetworkUtils;
@Conditional(AuditEnabledCondition.class) @Conditional(AuditEnabledCondition.class)
public class BaseAuditService implements AuditService { public class BaseAuditService implements AuditService {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseAuditService.class); private static final Logger LOGGER = LoggerFactory.getLogger(BaseAuditService.class);
private static final List<String> IP_HEADERS =
Arrays.asList("X-Forwarded-For", "WL-Proxy-Client-IP", "HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR");
private final AuditKafkaPublisher auditPublisher; private final AuditKafkaPublisher auditPublisher;
@ -89,12 +84,6 @@ public class BaseAuditService implements AuditService {
LOGGER.info("Thread {} - server host name {} got in {} ms", Thread.currentThread().getId(), serverHostName, LOGGER.info("Thread {} - server host name {} got in {} ms", Thread.currentThread().getId(), serverHostName,
System.currentTimeMillis() - startTime); System.currentTimeMillis() - startTime);
startTime = System.currentTimeMillis();
String clientHostName = NetworkUtils.getHostName(clientIp);
LOGGER.info("Thread {} - client host name {} got in {} ms", Thread.currentThread().getId(), clientHostName,
System.currentTimeMillis() - startTime);
startTime = System.currentTimeMillis();
AuditAuthorizationEvent event = new AuditAuthorizationEvent( AuditAuthorizationEvent event = new AuditAuthorizationEvent(
personModel.getPrnsId(), personModel.getPrnsId(),
DateUtils.getClientTimeFromRequest(request), DateUtils.getClientTimeFromRequest(request),
@ -107,14 +96,12 @@ public class BaseAuditService implements AuditService {
serverIp, serverIp,
serverHostName, serverHostName,
clientIp, clientIp,
clientHostName clientIp
); );
String message = convertToMessage(event); String message = convertToMessage(event);
auditPublisher.publishEvent(authorizationTopic, message); auditPublisher.publishEvent(authorizationTopic, message);
LOGGER.info("Thread {} - event published in {} ms", Thread.currentThread().getId(), LOGGER.info("Thread {} - event published in {} ms", Thread.currentThread().getId(),
System.currentTimeMillis() - startTime); System.currentTimeMillis() - startTime);
IP_HEADERS.forEach(header -> LOGGER.info("Data from header: {} - {}", header, request.getHeader(header)));
} }
@Override @Override