0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Обрабатываются все WebSocket, а не только сжатые

Browse Source
This commit is contained in:
serega6531
2020-04-08 17:24:17 +03:00
parent d668fd4e18
commit 897aa30b9b
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/ru/serega6531/packmate/service/WebSocketsParser.java
View File

@@ -31,8 +31,6 @@ public class WebSocketsParser {
private static final java.util.regex.Pattern WEBSOCKET_ACCEPT_PATTERN = private static final java.util.regex.Pattern WEBSOCKET_ACCEPT_PATTERN =
java.util.regex.Pattern.compile("Sec-WebSocket-Accept: (.+)\\r\\n"); 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_UPGRADE_HEADER = "upgrade: websocket\r\n";
private static final String WEBSOCKET_CONNECTION_HEADER = "connection: upgrade\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); final List<Packet> handshakes = packets.subList(0, httpEnd);
parse(wsPackets, handshakes, draft); parse(wsPackets, handshakes, draft);
parsed = true;
} }
private void parse(final List<Packet> wsPackets, final List<Packet> handshakes, Draft_6455 draft) { private void parse(final List<Packet> wsPackets, final List<Packet> handshakes, Draft_6455 draft) {
@@ -142,6 +139,8 @@ public class WebSocketsParser {
} }
} }
} }
parsed = true;
} }
public List<Packet> getParsedPackets() { public List<Packet> getParsedPackets() {
@@ -190,11 +189,6 @@ public class WebSocketsParser {
return null; return null;
} }
if (!handshake.contains(WEBSOCKET_EXTENSION_HEADER) &&
!handshake.contains(WEBSOCKET_EXTENSIONS_HEADER)) {
return null;
}
return handshake; return handshake;
} }
@@ -212,10 +206,10 @@ public class WebSocketsParser {
String key = matcher.group(1); String key = matcher.group(1);
matcher = WEBSOCKET_EXTENSIONS_PATTERN.matcher(clientHandshake); 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(); HandshakeImpl1Client clientHandshakeImpl = new HandshakeImpl1Client();
@@ -223,7 +217,10 @@ public class WebSocketsParser {
clientHandshakeImpl.put("Connection", "Upgrade"); clientHandshakeImpl.put("Connection", "Upgrade");
clientHandshakeImpl.put("Sec-WebSocket-Version", version); clientHandshakeImpl.put("Sec-WebSocket-Version", version);
clientHandshakeImpl.put("Sec-WebSocket-Key", key); clientHandshakeImpl.put("Sec-WebSocket-Key", key);
clientHandshakeImpl.put("Sec-WebSocket-Extensions", extensions);
if(extensions != null) {
clientHandshakeImpl.put("Sec-WebSocket-Extensions", extensions);
}
return clientHandshakeImpl; return clientHandshakeImpl;
} }
@@ -236,10 +233,10 @@ public class WebSocketsParser {
String accept = matcher.group(1); String accept = matcher.group(1);
matcher = WEBSOCKET_EXTENSIONS_PATTERN.matcher(serverHandshake); 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(); HandshakeImpl1Server serverHandshakeImpl = new HandshakeImpl1Server();