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
2019-04-29 19:58:39 +03:00
parent 2b33f7aef4
commit 9c9b7cc942
5 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import ru.serega6531.packmate.model.CtfService;
import ru.serega6531.packmate.model.Stream;
import ru.serega6531.packmate.model.UnfinishedStream;
import ru.serega6531.packmate.service.PacketService;
import ru.serega6531.packmate.service.PatternService;
@@ -145,13 +146,7 @@ public class PcapWorker {
}
if(sourceIpString != null && sourcePort != -1) {
Optional<CtfService> serviceOptional = Optional.empty();
if(sourceIpString.equals(localIp)) {
serviceOptional = servicesService.findByPort(sourcePort);
} else if(destIpString.equals(localIp)) {
serviceOptional = servicesService.findByPort(destPort);
}
final Optional<CtfService> serviceOptional = findService(sourceIpString, sourcePort, destIpString, destPort);
if(serviceOptional.isPresent()) {
String sourceIpAndPort = sourceIpString + ":" + sourcePort;
@@ -174,7 +169,7 @@ public class PcapWorker {
}
log.info("{} {} {}:{} -> {}:{}, номер пакета {}",
packet.getTempId(), serviceOptional.get(), sourceIpString, sourcePort, destIpString, destPort,
protocol.name().toLowerCase(), serviceOptional.get(), sourceIpString, sourcePort, destIpString, destPort,
unfinishedStreams.get(stream).size());
if(protocol == Protocol.TCP) {
@@ -198,11 +193,46 @@ public class PcapWorker {
}
if(rst || (acksForStream.contains(sourceIpAndPort) && acksForStream.contains(destIpAndPort))) {
final Stream finishedStream = saveStream(stream);
log.info("Конец стрима");
//TODO
//TODO send to ws
}
}
}
}
}
private Stream saveStream(UnfinishedStream unfinishedStream) {
final List<ru.serega6531.packmate.model.Packet> packets = unfinishedStreams.get(unfinishedStream);
Stream stream = new Stream();
stream.setProtocol(unfinishedStream.getProtocol());
stream.setStartTimestamp(packets.get(0).getTimestamp());
stream.setEndTimestamp(packets.get(packets.size() - 1).getTimestamp());
stream.setService(findService(
unfinishedStream.getFirstIp().getHostAddress(),
unfinishedStream.getFirstPort(),
unfinishedStream.getSecondIp().getHostAddress(),
unfinishedStream.getSecondPort()
).get());
final Stream saved = streamService.save(stream);
for (ru.serega6531.packmate.model.Packet packet : packets) {
packet.setStream(saved);
packetService.save(packet);
}
return saved;
}
private Optional<CtfService> findService(String firstIp, int firstPort, String secondIp, int secondPort) {
if(firstIp.equals(localIp)) {
return servicesService.findByPort(firstPort);
} else if(secondIp.equals(localIp)) {
return servicesService.findByPort(secondPort);
}
return Optional.empty();
}
}