a3x/transpub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Try to prevent transwhat from crashing on malformed protobuf

Browse source
This commit is contained in:
moyamo 2015-09-21 21:45:18 +02:00
parent 7f1c9cd0db
commit f4e85f7689
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Spectrum2/backend.py
View file

@ -4,6 +4,7 @@ import struct
import sys import sys
import os import os
import logging
import google.protobuf import google.protobuf
def WRAP(MESSAGE, TYPE): def WRAP(MESSAGE, TYPE):
@ -24,6 +25,7 @@ class SpectrumBackend:
self.m_pingReceived = False self.m_pingReceived = False
self.m_data = "" self.m_data = ""
self.m_init_res = 0 self.m_init_res = 0
self.logger = logging.getLogger(self.__class__.__name__)
def handleMessage(self, user, legacyName, msg, nickname = "", xhtml = "", timestamp = ""): def handleMessage(self, user, legacyName, msg, nickname = "", xhtml = "", timestamp = ""):
m = protocol_pb2.ConversationMessage() m = protocol_pb2.ConversationMessage()
@ -349,8 +351,15 @@ class SpectrumBackend:
wrapper = protocol_pb2.WrapperMessage() wrapper = protocol_pb2.WrapperMessage()
if (wrapper.ParseFromString(self.m_data[4:]) == False): try:
parseFromString = wrapper.ParseFromString(self.m_data[4:])
except:
parseFromString = True
self.logger.error("Parse from String exception")
if parseFromString == False:
self.m_data = self.m_data[expected_size+4:] self.m_data = self.m_data[expected_size+4:]
self.logger.error("Parse from String exception")
return return
self.m_data = self.m_data[4+expected_size:] self.m_data = self.m_data[4+expected_size:]

2
session.py
View file

@ -458,7 +458,7 @@ class Session(YowsupApp):
else: else:
room = sender room = sender
try: try:
group = self.groups[room] group = self.groups[self._lengthenGroupId(room)]
self.logger.info("Group Message from %s to %s Groups: %s", self.logger.info("Group Message from %s to %s Groups: %s",
group.nick , group , self.groups) group.nick , group , self.groups)
self.backend.handleMessage( self.backend.handleMessage(