openstack/zaqar
Code Issues Proposed changes

Revert "Support md5 of message body"

Browse Source 
This reverts commit c6bf0333631cd648108b5c3eb71fd12309f55457.

Change-Id: Idf9ada2da132092c579f2aa432b5d128531b2737
This commit is contained in:
Rabi Mishra 2018-01-31 02:15:42 +00:00
parent c6bf033363
commit ea4a0cef40
9 changed files with 9 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zaqar/api/v1_1/response.py
View File

@ -49,10 +49,7 @@ class ResponseSchema(api.Api):
"body": {
"type": "object"
},
"checksum": {
"type": "string",
},
}
},
"required": ["href", "ttl", "age", "body", "id"],
"additionalProperties": False,
@ -331,10 +328,7 @@ class ResponseSchema(api.Api):
"age": age,
"body": {
"type": "object"
},
"checksum": {
"type": "string",
},
}
},
"required": ["href", "ttl", "age", "body", "id"],
"additionalProperties": False,

11
zaqar/api/v2/response.py
View File

@ -49,11 +49,7 @@ class ResponseSchema(api.Api):
"body": {
"type": "object"
},
"checksum": {
"type": "string",
},
}
},
"required": ["href", "ttl", "age", "body", "id"],
"additionalProperties": False,
@ -332,10 +328,7 @@ class ResponseSchema(api.Api):
"age": age,
"body": {
"type": "object"
},
"checksum": {
"type": "string",
},
}
},
"required": ["href", "ttl", "age", "body", "id"],
"additionalProperties": False,

7
zaqar/storage/mongodb/messages.py
View File

@ -35,7 +35,6 @@ from zaqar.i18n import _
from zaqar import storage
from zaqar.storage import errors
from zaqar.storage.mongodb import utils
from zaqar.storage import utils as s_utils
LOG = logging.getLogger(__name__)
@ -138,7 +137,6 @@ class MessageController(storage.Message):
client uuid -> u
transaction -> tx
delay -> d
checksum -> cs
"""
def __init__(self, *args, **kwargs):
@ -659,7 +657,6 @@ class MessageController(storage.Message):
'b': message['body'] if 'body' in message else {},
'k': next_marker + index,
'tx': None,
'cs': s_utils.get_checksum(message.get('body', None))
}
for index, message in enumerate(messages)
@ -839,7 +836,6 @@ class FIFOMessageController(MessageController):
'b': message['body'] if 'body' in message else {},
'k': next_marker + index,
'tx': transaction,
'cs': s_utils.get_checksum(message.get('body', None))
}
for index, message in enumerate(messages)
@ -1013,8 +1009,7 @@ def _basic_message(msg, now):
'ttl': msg['t'],
'claim_count': msg['c'].get('c', 0),
'body': msg['b'],
'claim_id': str(msg['c']['id']) if msg['c']['id'] else None,
'checksum': msg.get('cs', '')
'claim_id': str(msg['c']['id']) if msg['c']['id'] else None
}

4
zaqar/storage/redis/messages.py
View File

@ -25,7 +25,6 @@ from zaqar.storage import errors
from zaqar.storage.redis import models
from zaqar.storage.redis import scripting
from zaqar.storage.redis import utils
from zaqar.storage import utils as s_utils
Message = models.Message
MessageEnvelope = models.MessageEnvelope
@ -99,8 +98,6 @@ class MessageController(storage.Message, scripting.Mixin):
+---------------------+---------+
| delay expiry time | d |
+---------------------+---------+
| body checksum | cs |
+---------------------+---------+
4. Messages rank counter (Redis Hash):
@ -431,7 +428,6 @@ class MessageController(storage.Message, scripting.Mixin):
claim_count=0,
delay_expires=now + msg.get('delay', 0),
body=msg.get('body', {}),
checksum=s_utils.get_checksum(msg.get('body', None))
)
prepared_msg.to_redis(pipe)

6
zaqar/storage/redis/models.py
View File

@ -23,7 +23,7 @@ from oslo_utils import encodeutils
from oslo_utils import uuidutils
MSGENV_FIELD_KEYS = (b'id', b't', b'cr', b'e', b'u', b'c', b'c.e',
b'c.c', b'd', b'cs')
b'c.c', b'd')
SUBENV_FIELD_KEYS = (b'id', b's', b'u', b't', b'e', b'o', b'p', b'c')
@ -51,7 +51,6 @@ class MessageEnvelope(object):
'claim_expires',
'claim_count',
'delay_expires',
'checksum',
]
def __init__(self, **kwargs):
@ -68,7 +67,6 @@ class MessageEnvelope(object):
self.claim_expires = kwargs['claim_expires']
self.claim_count = kwargs.get('claim_count', 0)
self.delay_expires = kwargs.get('delay_expires', 0)
self.checksum = kwargs.get('checksum', '')
@staticmethod
def from_hmap(hmap):
@ -280,7 +278,6 @@ def _hmap_to_msgenv_kwargs(hmap):
'claim_expires': int(hmap[b'c.e']),
'claim_count': int(hmap[b'c.c']),
'delay_expires': int(hmap.get(b'd', 0)),
'checksum': encodeutils.safe_decode(hmap[b'cs']),
}
@ -295,7 +292,6 @@ def _msgenv_to_hmap(msg):
'c.e': msg.claim_expires,
'c.c': msg.claim_count,
'd': msg.delay_expires,
'cs': msg.checksum,
}

6
zaqar/storage/swift/messages.py
View File

@ -24,7 +24,6 @@ from zaqar.common import decorators
from zaqar import storage
from zaqar.storage import errors
from zaqar.storage.swift import utils
from zaqar.storage import utils as s_utils
class MessageController(storage.Message):
@ -54,8 +53,6 @@ class MessageController(storage.Message):
+--------------+-----------------------------------------+
| Expires | Object Delete-After header |
+--------------------------------------------------------+
| Checksum | Object content 'body' checksum |
+--------------------------------------------------------+
"""
def __init__(self, *args, **kwargs):
@ -229,8 +226,7 @@ class MessageController(storage.Message):
contents = jsonutils.dumps(
{'body': msg.get('body', {}), 'claim_id': None,
'ttl': msg['ttl'], 'claim_count': 0,
'delay_expires': now + msg.get('delay', 0),
'checksum': s_utils.get_checksum(msg.get('body', None))})
'delay_expires': now + msg.get('delay', 0)})
utils._put_or_create_container(
self._client,
utils._message_container(queue, project),

29
zaqar/storage/utils.py
View File

@ -13,8 +13,6 @@
# the License.
import copy
import hashlib
import json
from oslo_config import cfg
from oslo_log import log
@ -212,30 +210,3 @@ def can_connect(uri, conf=None):
except Exception as exc:
LOG.debug('Can\'t connect to: %s \n%s', (uri, exc))
return False
def get_checksum(body, algorithm='MD5'):
"""According to the algorithm to get the message body checksum.
:param body: The message body.
:type body: six.text_type
:param algorithm: The algorithm type, default is MD5.
:type algorithm: six.text_type
:returns: The message body checksum.
:rtype: six.text_type
"""
checksum = '%s:' % algorithm
if body is None:
return ''
else:
checksum_body = json.dumps(body).encode('utf-8')
# TODO(yangzhenyu): We may support other algorithms in future
# versions, including SHA1, SHA256, SHA512, and so on.
if algorithm == 'MD5':
md5 = hashlib.md5()
md5.update(checksum_body)
checksum += md5.hexdigest()
return checksum

39
zaqar/tests/unit/storage/base.py
View File

@ -18,8 +18,6 @@ import os
import collections
import datetime
import hashlib
import json
import math
import random
import time
@ -450,7 +448,7 @@ class MessageControllerTest(ControllerBaseTest):
message_out = self.controller.get(queue_name, message_id,
project=self.project)
self.assertEqual({'id', 'body', 'ttl', 'age', 'claim_count',
'claim_id', 'checksum'}, set(message_out))
'claim_id'}, set(message_out))
self.assertEqual(message_id, message_out['id'])
self.assertEqual(message['body'], message_out['body'])
self.assertEqual(message['ttl'], message_out['ttl'])
@ -462,39 +460,6 @@ class MessageControllerTest(ControllerBaseTest):
with testing.expect(errors.DoesNotExist):
self.controller.get(queue_name, message_id, project=self.project)
def test_message_body_checksum(self):
queue_name = self.queue_name
message = {
'ttl': 60,
'body': {
'event': 'BackupStarted',
'backupId': 'c378813c-3f0b-11e2-ad92-7823d2b0f3ce'
}
}
# Test Message Creation
created = list(self.controller.post(queue_name, [message],
project=self.project,
client_uuid=uuid.uuid4()))
self.assertEqual(1, len(created))
message_id = created[0]
# Test Message Get
message_out = self.controller.get(queue_name, message_id,
project=self.project)
self.assertEqual({'id', 'body', 'ttl', 'age', 'claim_count',
'claim_id', 'checksum'}, set(message_out))
algorithm, checksum = message_out['checksum'].split(':')
expected_checksum = ''
if algorithm == 'MD5':
md5 = hashlib.md5()
md5.update(json.dumps(message['body']).encode('utf-8'))
expected_checksum = md5.hexdigest()
self.assertEqual(expected_checksum, checksum)
def test_get_multi(self):
client_uuid = uuid.uuid4()
@ -539,7 +504,7 @@ class MessageControllerTest(ControllerBaseTest):
for idx, message in enumerate(messages_out):
self.assertEqual({'id', 'body', 'ttl', 'age', 'claim_count',
'claim_id', 'checksum'}, set(message))
'claim_id'}, set(message))
self.assertEqual(idx, message['body'])
self.controller.bulk_delete(self.queue_name, ids,

1
zaqar/transport/wsgi/utils.py
View File

@ -241,5 +241,4 @@ def format_message_v1_1(message, base_path, claim_id=None):
'ttl': message['ttl'],
'age': message['age'],
'body': message['body'],
'checksum': message.get('checksum', '')
}