robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Added data truncation and length constant (currently independent of actual length)

Browse source
This commit is contained in:
PhilipTrauner 2016-04-03 22:35:00 +02:00
parent 7295bbc079
commit af8cffd5aa
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Shared/ESock.py
View file

@ -4,6 +4,8 @@ import struct
import DataTypes import DataTypes
import Logging import Logging
MAX_ROUTE_LENGTH = 16
class ConvertFailedError(ValueError): class ConvertFailedError(ValueError):
def __init__(self): def __init__(self):
super(ValueError, self).__init__("conversion failed (false data type supplied)") super(ValueError, self).__init__("conversion failed (false data type supplied)")
@ -76,7 +78,10 @@ class ESock:
self._sock.close() self._sock.close()
return None, "" return None, ""
if self.debug: if self.debug:
Logging.info("Received %d-long '%s' on route '%s': %s (%s:%d)" % (len(data), type(data).__name__, route, str(data).replace("\n", " "), self.address, self.port)) data_repr = str(data).replace("\n", " ")
if len(data_repr) > 80:
data_repr = data_repr[:80] + "..."
Logging.info("Received %d-long '%s' on route '%s': %s (%s:%d)" % (len(data), type(data).__name__, route, data_repr, self.address, self.port))
return data, route return data, route
@ -84,7 +89,10 @@ class ESock:
length = len(data) length = len(data)
original_data_type = type(data) original_data_type = type(data)
if self.debug: if self.debug:
Logging.info("Sending %d-long '%s' on route '%s': %s (%s:%d)" % (length, original_data_type.__name__, route, str(data).replace("\n", " "), self.address, self.port)) data_repr = str(data).replace("\n", " ")
if len(data_repr) > 80:
data_repr = data_repr[:80] + "..."
Logging.info("Sending %d-long '%s' on route '%s': %s (%s:%d)" % (length, original_data_type.__name__, route, data_repr, self.address, self.port))
route = route.encode() route = route.encode()
if original_data_type in ESock.DATA_TYPES: if original_data_type in ESock.DATA_TYPES:
data_type = ESock.DATA_TYPES[original_data_type] data_type = ESock.DATA_TYPES[original_data_type]