ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Prevent WSMessage deserialization failure from closing websocket

Browse Source 
As messages that are serialized and deserialized are purely option and
can vary between source and destination, simply catch deserialization
failure to prevent OkHttp from closing websocket.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2019-02-03 00:42:11 +01:00
parent a0a86a9f78
commit e4828a597c
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-client/src/main/java/net/runelite/client/ws/WSClient.java
View File

@@ -25,6 +25,7 @@
package net.runelite.client.ws;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Objects;
@@ -154,7 +155,18 @@ public class WSClient extends WebSocketListener implements AutoCloseable
@Override
public void onMessage(WebSocket webSocket, String text)
{
final WebsocketMessage message = gson.fromJson(text, WebsocketMessage.class);
final WebsocketMessage message;
try
{
message = gson.fromJson(text, WebsocketMessage.class);
}
catch (JsonParseException e)
{
log.debug("Failed to deserialize message", e);
return;
}
if (message.isParty() && !(message instanceof PartyMessage))
{
// spoofed message?