Merge branch 'normal-websockets' into 'master'

Parse non-deflated websockets

See merge request packmate/Packmate!5

src/main/java/ru/serega6531/packmate/model/CtfService.java

@@ -22,6 +22,6 @@ public class CtfService {
 
     private boolean mergeAdjacentPackets;
 
-    private boolean inflateWebSockets;
+    private boolean parseWebSockets;
 
 }

src/main/java/ru/serega6531/packmate/model/Packet.java

@@ -52,7 +52,7 @@ public class Packet {
 
     private boolean ungzipped;
 
-    private boolean webSocketInflated;
+    private boolean webSocketParsed;
 
     private byte[] content;
 

src/main/java/ru/serega6531/packmate/service/StreamOptimizer.java

@@ -36,8 +36,8 @@ public class StreamOptimizer {
             unpackGzip();
         }
 
-        if (service.isInflateWebSockets()) {
+        if (service.isParseWebSockets()) {
-            inflateWebSocket();
+            parseWebSockets();
         }
 
         if (service.isUrldecodeHttpRequests()) {
@@ -89,7 +89,7 @@ public class StreamOptimizer {
         final List<Packet> cut = packets.subList(start, end);
         final long timestamp = cut.get(0).getTimestamp();
         final boolean ungzipped = cut.stream().anyMatch(Packet::isUngzipped);
-        final boolean webSocketInflated = cut.stream().anyMatch(Packet::isWebSocketInflated);
+        final boolean webSocketParsed = cut.stream().anyMatch(Packet::isWebSocketParsed);
         boolean incoming = cut.get(0).isIncoming();
         //noinspection OptionalGetWithoutIsPresent
         final byte[] content = cut.stream()
@@ -102,7 +102,7 @@ public class StreamOptimizer {
                 .incoming(incoming)
                 .timestamp(timestamp)
                 .ungzipped(ungzipped)
-                .webSocketInflated(webSocketInflated)
+                .webSocketParsed(webSocketParsed)
                 .content(content)
                 .build());
     }
@@ -223,7 +223,7 @@ public class StreamOptimizer {
                     .incoming(false)
                     .timestamp(cut.get(0).getTimestamp())
                     .ungzipped(true)
-                    .webSocketInflated(false)
+                    .webSocketParsed(false)
                     .content(newContent)
                     .build();
         } catch (ZipException e) {
@@ -235,7 +235,7 @@ public class StreamOptimizer {
         return null;
     }
 
-    private void inflateWebSocket() {
+    private void parseWebSockets() {
         if (!packets.get(0).getContentString().contains("HTTP/")) {
             return;
         }

src/main/java/ru/serega6531/packmate/service/WebSocketsParser.java

@@ -31,8 +31,6 @@ public class WebSocketsParser {
     private static final java.util.regex.Pattern WEBSOCKET_ACCEPT_PATTERN =
             java.util.regex.Pattern.compile("Sec-WebSocket-Accept: (.+)\\r\\n");
 
-    private static final String WEBSOCKET_EXTENSION_HEADER = "Sec-WebSocket-Extension: permessage-deflate";
-    private static final String WEBSOCKET_EXTENSIONS_HEADER = "Sec-WebSocket-Extensions: permessage-deflate";
     private static final String WEBSOCKET_UPGRADE_HEADER = "upgrade: websocket\r\n";
     private static final String WEBSOCKET_CONNECTION_HEADER = "connection: upgrade\r\n";
 
@@ -103,7 +101,6 @@ public class WebSocketsParser {
         final List<Packet> handshakes = packets.subList(0, httpEnd);
 
         parse(wsPackets, handshakes, draft);
-        parsed = true;
     }
 
     private void parse(final List<Packet> wsPackets, final List<Packet> handshakes, Draft_6455 draft) {
@@ -136,12 +133,14 @@ public class WebSocketsParser {
                             .timestamp(lastPacket.getTimestamp())
                             .ttl(lastPacket.getTtl())
                             .ungzipped(lastPacket.isUngzipped())
-                            .webSocketInflated(true)
+                            .webSocketParsed(true)
                             .build()
                     );
                 }
             }
         }
+
+        parsed = true;
     }
 
     public List<Packet> getParsedPackets() {
@@ -190,11 +189,6 @@ public class WebSocketsParser {
             return null;
         }
 
-        if (!handshake.contains(WEBSOCKET_EXTENSION_HEADER) &&
-                !handshake.contains(WEBSOCKET_EXTENSIONS_HEADER)) {
-            return null;
-        }
-
         return handshake;
     }
 
@@ -212,10 +206,10 @@ public class WebSocketsParser {
         String key = matcher.group(1);
 
         matcher = WEBSOCKET_EXTENSIONS_PATTERN.matcher(clientHandshake);
-        if (!matcher.find()) {
+        String extensions = null;
-            return null;
+        if (matcher.find()) {
+            extensions = matcher.group(1);
         }
-        String extensions = matcher.group(1);
 
         HandshakeImpl1Client clientHandshakeImpl = new HandshakeImpl1Client();
 
@@ -223,7 +217,10 @@ public class WebSocketsParser {
         clientHandshakeImpl.put("Connection", "Upgrade");
         clientHandshakeImpl.put("Sec-WebSocket-Version", version);
         clientHandshakeImpl.put("Sec-WebSocket-Key", key);
+
+        if(extensions != null) {
             clientHandshakeImpl.put("Sec-WebSocket-Extensions", extensions);
+        }
 
         return clientHandshakeImpl;
     }
@@ -236,10 +233,10 @@ public class WebSocketsParser {
         String accept = matcher.group(1);
 
         matcher = WEBSOCKET_EXTENSIONS_PATTERN.matcher(serverHandshake);
-        if (!matcher.find()) {
+        String extensions = null;
-            return null;
+        if (matcher.find()) {
+            extensions = matcher.group(1);
         }
-        String extensions = matcher.group(1);
 
         HandshakeImpl1Server serverHandshakeImpl = new HandshakeImpl1Server();