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-04-07 15:57:18 +03:00
parent b8967f5486
commit d35046b2a6
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/ru/serega6531/packmate/model/Stream.java
View File

@@ -35,6 +35,7 @@ public class Stream {
@OneToMany(mappedBy = "stream", cascade = CascadeType.ALL) @OneToMany(mappedBy = "stream", cascade = CascadeType.ALL)
@JsonIgnore @JsonIgnore
@OrderBy("id")
private List<Packet> packets; private List<Packet> packets;
private long startTimestamp; private long startTimestamp;

1
src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java
View File

@@ -42,6 +42,7 @@ public class FilePcapWorker extends AbstractPcapWorker {
@SneakyThrows @SneakyThrows
@Override @Override
public void start() { public void start() {
log.info("Using file " + file.getAbsolutePath());
pcap = Pcaps.openOffline(file.getAbsolutePath()); pcap = Pcaps.openOffline(file.getAbsolutePath());
loopExecutorService.execute(this::runScan); loopExecutorService.execute(this::runScan);
} }

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

@@ -83,7 +83,7 @@ public class PatternService {
final Pattern saved = repository.save(pattern); final Pattern saved = repository.save(pattern);
patterns.put(saved.getId(), saved); patterns.put(saved.getId(), saved);
log.info("Added new pattern {} with value {}", pattern.getName(), pattern.getValue()); log.info("Added new pattern '{}' with value '{}'", pattern.getName(), pattern.getValue());
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_PATTERN, saved)); subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_PATTERN, saved));
return saved; return saved;
} }

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

@@ -66,7 +66,7 @@ public class ServicesService {
} }
public CtfService save(CtfService service) { public CtfService save(CtfService service) {
log.info("Added or edited service {} at port {}", service.getName(), service.getPort()); log.info("Added or edited service '{}' at port {}", service.getName(), service.getPort());
final CtfService saved = repository.save(service); final CtfService saved = repository.save(service);
services.put(saved.getPort(), saved); services.put(saved.getPort(), saved);
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_SERVICE, saved)); subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_SERVICE, saved));

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

@@ -122,8 +122,12 @@ public class StreamOptimizer {
} }
if (httpStarted) { if (httpStarted) {
content = URLDecoder.decode(content, StandardCharsets.UTF_8.toString()); try {
packet.setContent(content.getBytes()); content = URLDecoder.decode(content, StandardCharsets.UTF_8.toString());
packet.setContent(content.getBytes());
} catch (IllegalArgumentException e) {
log.warn("urldecode", e);
}
} }
} else { } else {
httpStarted = false; httpStarted = false;