Багфиксы
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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));
|
||||||
|
|||||||
@@ -122,8 +122,12 @@ public class StreamOptimizer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (httpStarted) {
|
if (httpStarted) {
|
||||||
|
try {
|
||||||
content = URLDecoder.decode(content, StandardCharsets.UTF_8.toString());
|
content = URLDecoder.decode(content, StandardCharsets.UTF_8.toString());
|
||||||
packet.setContent(content.getBytes());
|
packet.setContent(content.getBytes());
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
log.warn("urldecode", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
httpStarted = false;
|
httpStarted = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user