0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Сообщения переведены на английский, исправлена грамматика

Browse Source
This commit is contained in:
serega6531
2020-03-16 23:52:16 +03:00
parent bcbe983704
commit 573142deeb
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/serega6531/packmate/PcapWorker.java
View File

@@ -140,7 +140,7 @@ public class PcapWorker implements PacketListener {
UnfinishedStream stream = addNewPacket(sourceIp, destIp, time, sourcePort, destPort, ttl, content, Protocol.TCP);
if (log.isDebugEnabled()) {
log.debug("tcp {} {}:{} -> {}:{}, номер пакета {}",
log.debug("tcp {} {}:{} -> {}:{}, packet number {}",
serviceOptional.get(), sourceIpString, sourcePort, destIpString, destPort,
unfinishedTcpStreams.get(stream).size());
}
@@ -179,7 +179,7 @@ public class PcapWorker implements PacketListener {
UnfinishedStream stream = addNewPacket(sourceIp, destIp, time, sourcePort, destPort, ttl, content, Protocol.UDP);
if (log.isDebugEnabled()) {
log.debug("udp {} {}:{} -> {}:{}, номер пакета {}",
log.debug("udp {} {}:{} -> {}:{}, packet number {}",
serviceOptional.get(), sourceIpString, sourcePort, destIpString, destPort,
unfinishedUdpStreams.get(stream).size());
}
@@ -207,7 +207,7 @@ public class PcapWorker implements PacketListener {
final var streams = (protocol == Protocol.TCP) ? this.unfinishedTcpStreams : this.unfinishedUdpStreams;
if (!streams.containsKey(stream)) {
log.debug("Начат новый стрим");
log.debug("New stream started");
}
streams.put(stream, packet);

4
src/main/java/ru/serega6531/packmate/TimeoutStreamsSaver.java
View File

@@ -30,12 +30,12 @@ public class TimeoutStreamsSaver {
public void saveStreams() {
int streamsClosed = pcapWorker.closeTimeoutStreams(Protocol.UDP, udpStreamTimeoutMillis);
if (streamsClosed > 0) {
log.info("Закрыто {} udp стримов", streamsClosed);
log.info("{} udp streams closed", streamsClosed);
}
streamsClosed = pcapWorker.closeTimeoutStreams(Protocol.TCP, tcpStreamTimeoutMillis);
if (streamsClosed > 0) {
log.info("Закрыто {} tcp стримов", streamsClosed);
log.info("{} tcp streams closed", streamsClosed);
}
}

4
src/main/java/ru/serega6531/packmate/service/PatternService.java
View File

@@ -57,7 +57,7 @@ public class PatternService {
final Optional<Pattern> optional = repository.findById(id);
if (optional.isPresent()) {
final Pattern pattern = optional.get();
log.info("Удален паттерн {} со значением {}", pattern.getName(), pattern.getValue());
log.info("Removed pattern {} with value {}", pattern.getName(), pattern.getValue());
for (Stream stream : pattern.getMatchedStreams()) {
stream.getFoundPatterns().remove(pattern);
@@ -83,7 +83,7 @@ public class PatternService {
final Pattern saved = repository.save(pattern);
patterns.put(saved.getId(), saved);
log.info("Добавлен новый паттерн {} со значением {}", pattern.getName(), pattern.getValue());
log.info("Added new pattern {} with value {}", pattern.getName(), pattern.getValue());
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_PATTERN, saved));
return saved;
}

4
src/main/java/ru/serega6531/packmate/service/ServicesService.java
View File

@@ -59,14 +59,14 @@ public class ServicesService {
}
public void deleteByPort(int port) {
log.info("Удален сервис на порту {}", port);
log.info("Removed service at port {}", port);
services.remove(port);
repository.deleteById(port);
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DELETE_SERVICE, port));
}
public CtfService save(CtfService service) {
log.info("Добавлен или изменен сервис {} на порту {}", service.getName(), service.getPort());
log.info("Added or edited service {} at port {}", service.getName(), service.getPort());
final CtfService saved = repository.save(service);
services.put(saved.getPort(), saved);
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_SERVICE, saved));

4
src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java
View File

@@ -209,7 +209,7 @@ public class StreamOptimizer {
IOUtils.copy(gzipStream, out);
byte[] newContent = ArrayUtils.addAll(httpHeader, out.toByteArray());
log.debug("Разархивирован gzip: {} -> {} байт", gzipBytes.length, out.size());
log.debug("GZIP decompressed: {} -> {} bytes", gzipBytes.length, out.size());
return Packet.builder()
.incoming(false)
@@ -218,7 +218,7 @@ public class StreamOptimizer {
.content(newContent)
.build();
} catch (ZipException e) {
log.warn("Не удалось разархивировать gzip, оставляем как есть", e);
log.warn("Failed to decompress gzip, leaving as it is", e);
} catch (IOException e) {
log.error("decompress gzip", e);
}

6
src/main/java/ru/serega6531/packmate/service/StreamService.java
View File

@@ -62,7 +62,7 @@ public class StreamService {
);
if (serviceOptional.isEmpty()) {
log.warn("Не удалось сохранить стрим: сервиса на порту {} или {} не существует",
log.warn("Failed to save the stream: service at port {} or {} does not exist",
unfinishedStream.getFirstPort(), unfinishedStream.getSecondPort());
return false;
}
@@ -72,7 +72,7 @@ public class StreamService {
packets.removeIf(packet -> packet.getContent().length == 0);
if (packets.isEmpty()) {
log.debug("Стрим состоит только из пустых пакетов и не будет сохранен");
log.debug("Stream consists only of empty packets and will not be saved");
return false;
}
}
@@ -149,7 +149,7 @@ public class StreamService {
Stream saved;
if (stream.getId() == null) {
saved = repository.save(stream);
log.debug("Создан стрим с id {}", saved.getId());
log.debug("Saved stream with id {}", saved.getId());
} else {
saved = repository.save(stream);
}

4
src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
View File

@@ -31,12 +31,12 @@ public class StreamSubscriptionService {
public void addSubscriber(WebSocketSession session) {
subscribers.add(session);
log.info("Подписан пользователь {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
log.info("User subscribed: {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
}
public void removeSubscriber(WebSocketSession session) {
subscribers.remove(session);
log.info("Отписан пользователь {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
log.info("User unsubscribed {}", Objects.requireNonNull(session.getRemoteAddress()).getHostName());
}
void broadcast(SubscriptionMessage message) {