Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Python 2/3 compat for MD5 of SQS attributes

Browse Source
This commit is contained in:
Jack Danger Canty 2017-05-11 09:28:19 -07:00
parent daba699147
commit 6679def702
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moto/sqs/models.py
View File

@ -3,6 +3,7 @@ from __future__ import unicode_literals
import base64 import base64
import hashlib import hashlib
import re import re
import six
import struct import struct
from xml.sax.saxutils import escape from xml.sax.saxutils import escape
@ -53,24 +54,29 @@ class Message(BaseModel):
Not yet implemented: Not yet implemented:
List types (https://github.com/aws/aws-sdk-java/blob/7844c64cf248aed889811bf2e871ad6b276a89ca/aws-java-sdk-sqs/src/main/java/com/amazonaws/services/sqs/MessageMD5ChecksumHandler.java#L58k) List types (https://github.com/aws/aws-sdk-java/blob/7844c64cf248aed889811bf2e871ad6b276a89ca/aws-java-sdk-sqs/src/main/java/com/amazonaws/services/sqs/MessageMD5ChecksumHandler.java#L58k)
""" """
def utf8(str):
if isinstance(str, six.string_types):
return str.encode('utf-8')
return str
md5 = hashlib.md5() md5 = hashlib.md5()
for name in sorted(self.message_attributes.keys()): for name in sorted(self.message_attributes.keys()):
attr = self.message_attributes[name] attr = self.message_attributes[name]
data_type = attr['data_type'] data_type = attr['data_type']
encoded = ''.encode('utf-8') encoded = utf8('')
# Each part of each attribute is encoded right after it's # Each part of each attribute is encoded right after it's
# own length is packed into a 4-byte integer # own length is packed into a 4-byte integer
# 'timestamp' -> b'\x00\x00\x00\t' # 'timestamp' -> b'\x00\x00\x00\t'
encoded += struct.pack("!I", len(name.encode('utf-8'))) + name.encode('utf-8') encoded += struct.pack("!I", len(utf8(name))) + utf8(name)
# The datatype is additionally given a final byte # The datatype is additionally given a final byte
# representing which type it is # representing which type it is
encoded += struct.pack("!I", len(data_type)).encode('utf-8') + data_type.encode('utf-8') encoded += struct.pack("!I", len(data_type)) + utf8(data_type)
encoded += TRANSPORT_TYPE_ENCODINGS[data_type] encoded += TRANSPORT_TYPE_ENCODINGS[data_type]
if data_type == 'String' or data_type == 'Number': if data_type == 'String' or data_type == 'Number':
value = attr['string_value'] value = attr['string_value']
elif data_type == 'Binary': elif data_type == 'Binary':
print(data_type, attr['binary_value'], type(attr['binary_value']))
value = base64.b64decode(attr['binary_value']) value = base64.b64decode(attr['binary_value'])
else: else:
print("Moto hasn't implemented MD5 hashing for {} attributes".format(data_type)) print("Moto hasn't implemented MD5 hashing for {} attributes".format(data_type))
@ -80,7 +86,7 @@ class Message(BaseModel):
# MD5 so as not to break client softwre # MD5 so as not to break client softwre
return('deadbeefdeadbeefdeadbeefdeadbeef') return('deadbeefdeadbeefdeadbeefdeadbeef')
encoded += struct.pack("!I", len(value.encode('utf-8'))) + value.encode('utf-8') encoded += struct.pack("!I", len(utf8(value))) + utf8(value)
md5.update(encoded) md5.update(encoded)
return md5.hexdigest() return md5.hexdigest()

3
tests/test_sqs/test_sqs.py
View File

@ -232,9 +232,10 @@ def test_send_message_with_attributes():
body = 'this is a test message' body = 'this is a test message'
message = queue.new_message(body) message = queue.new_message(body)
BASE64_BINARY = base64.b64encode(b'binary value').decode('utf-8')
message_attributes = { message_attributes = {
'test.attribute_name': {'data_type': 'String', 'string_value': 'attribute value'}, 'test.attribute_name': {'data_type': 'String', 'string_value': 'attribute value'},
'test.binary_attribute': {'data_type': 'Binary', 'binary_value': base64.b64encode('binary value')}, 'test.binary_attribute': {'data_type': 'Binary', 'binary_value': BASE64_BINARY},
'test.number_attribute': {'data_type': 'Number', 'string_value': 'string value'} 'test.number_attribute': {'data_type': 'Number', 'string_value': 'string value'}
} }
message.message_attributes = message_attributes message.message_attributes = message_attributes