leo/CoAP
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix token handling

Browse source 
Token was encoded as utf-8 string. However, token is a byte string
that is not required to be utf-8 encodable. This patch changes
token type in the Message class to string of bytes instead of string
of characters.

Signed-off-by: Hubert Miś <hubert.mis@gmail.com>
This commit is contained in:
Hubert Miś 2020-12-22 13:12:41 +01:00
parent 89d51737a9
commit 297404ce33
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
coapthon/messages/message.py
View file

@ -115,15 +115,15 @@ class Message(object):
""" """
Set the Token of the message. Set the Token of the message.
:type value: String :type value: Bytes
:param value: the Token :param value: the Token
:raise AttributeError: if value is longer than 256 :raise AttributeError: if value is longer than 256
""" """
if value is None: if value is None:
self._token = value self._token = value
return return
if not isinstance(value, str): if not isinstance(value, bytes):
value = str(value) value = bytes(value)
if len(value) > 256: if len(value) > 256:
raise AttributeError raise AttributeError
self._token = value self._token = value

11
coapthon/serializer.py
View file

@ -51,10 +51,7 @@ class Serializer(object):
message.type = message_type message.type = message_type
message.mid = mid message.mid = mid
if token_length > 0: if token_length > 0:
fmt = "%ss" % token_length message.token = datagram[pos:pos+token_length]
s = struct.Struct(fmt)
token_value = s.unpack_from(datagram[pos:])[0]
message.token = token_value.decode("utf-8")
else: else:
message.token = None message.token = None
@ -152,10 +149,8 @@ class Serializer(object):
values = [tmp, message.code, message.mid] values = [tmp, message.code, message.mid]
if message.token is not None and tkl > 0: if message.token is not None and tkl > 0:
fmt += "%ss" % tkl
for b in str(message.token): values.append(message.token)
fmt += "c"
values.append(bytes(b, "utf-8"))
options = Serializer.as_sorted_list(message.options) # already sorted options = Serializer.as_sorted_list(message.options) # already sorted
lastoptionnumber = 0 lastoptionnumber = 0