Skip to content

Commit e427ac2

Browse files
committed
Ensure ethstats plugin handles incorrect server responses
1 parent 9b9a832 commit e427ac2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

trinity/plugins/builtin/ethstats/ethstats_client.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async def recv_handler(self) -> None:
5959
try:
6060
message: EthstatsMessage = self.deserialize_message(json_string)
6161
except EthstatsException as e:
62-
self.logger.info('Cannot parse message from server: %s' % e)
62+
self.logger.warning('Cannot parse message from server: %s' % e)
6363
return
6464

6565
await self.recv_queue.put(message)
@@ -84,6 +84,9 @@ def deserialize_message(self, json_string: str) -> EthstatsMessage:
8484
except json.decoder.JSONDecodeError as e:
8585
raise EthstatsException('Received incorrect JSON: %s' % e)
8686

87+
if isinstance(raw_message, str):
88+
raise EthstatsException(f'Received invalid payload: {raw_message}')
89+
8790
try:
8891
payload = raw_message['emit']
8992
except KeyError:

0 commit comments

Comments
 (0)