From d35046b2a6dd407528fdd3ed11ad04c1c79cff4f Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Tue, 7 Apr 2020 15:57:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/ru/serega6531/packmate/model/Stream.java    | 1 +
 .../java/ru/serega6531/packmate/pcap/FilePcapWorker.java  | 1 +
 .../ru/serega6531/packmate/service/PatternService.java    | 2 +-
 .../ru/serega6531/packmate/service/ServicesService.java   | 2 +-
 .../ru/serega6531/packmate/service/StreamOptimizer.java   | 8 ++++++--
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/model/Stream.java b/src/main/java/ru/serega6531/packmate/model/Stream.java
index 2524d97..3023d2f 100644
--- a/src/main/java/ru/serega6531/packmate/model/Stream.java
+++ b/src/main/java/ru/serega6531/packmate/model/Stream.java
@@ -35,6 +35,7 @@ public class Stream {
 
     @OneToMany(mappedBy = "stream", cascade = CascadeType.ALL)
     @JsonIgnore
+    @OrderBy("id")
     private List<Packet> packets;
 
     private long startTimestamp;
diff --git a/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java b/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java
index 6276cb0..8bc28a7 100644
--- a/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java
+++ b/src/main/java/ru/serega6531/packmate/pcap/FilePcapWorker.java
@@ -42,6 +42,7 @@ public class FilePcapWorker extends AbstractPcapWorker {
     @SneakyThrows
     @Override
     public void start() {
+        log.info("Using file " + file.getAbsolutePath());
         pcap = Pcaps.openOffline(file.getAbsolutePath());
         loopExecutorService.execute(this::runScan);
     }
diff --git a/src/main/java/ru/serega6531/packmate/service/PatternService.java b/src/main/java/ru/serega6531/packmate/service/PatternService.java
index 46974b9..dc5579e 100644
--- a/src/main/java/ru/serega6531/packmate/service/PatternService.java
+++ b/src/main/java/ru/serega6531/packmate/service/PatternService.java
@@ -83,7 +83,7 @@ public class PatternService {
 
         final Pattern saved = repository.save(pattern);
         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));
         return saved;
     }
diff --git a/src/main/java/ru/serega6531/packmate/service/ServicesService.java b/src/main/java/ru/serega6531/packmate/service/ServicesService.java
index 66f8142..4eed16d 100644
--- a/src/main/java/ru/serega6531/packmate/service/ServicesService.java
+++ b/src/main/java/ru/serega6531/packmate/service/ServicesService.java
@@ -66,7 +66,7 @@ public class ServicesService {
     }
 
     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);
         services.put(saved.getPort(), saved);
         subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_SERVICE, saved));
diff --git a/src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java b/src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java
index 7050fc8..21eb5e6 100644
--- a/src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java
+++ b/src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java
@@ -122,8 +122,12 @@ public class StreamOptimizer {
                 }
 
                 if (httpStarted) {
-                    content = URLDecoder.decode(content, StandardCharsets.UTF_8.toString());
-                    packet.setContent(content.getBytes());
+                    try {
+                        content = URLDecoder.decode(content, StandardCharsets.UTF_8.toString());
+                        packet.setContent(content.getBytes());
+                    } catch (IllegalArgumentException e) {
+                        log.warn("urldecode", e);
+                    }
                 }
             } else {
                 httpStarted = false;