openstack/vitrage
Code Issues Proposed changes

Bug fix: calculate md5 on non-unicode strings

Browse Source 
The md5 is used for calculating a hash for
the active actions. The problem is that their
targets sometime have unicode vitrage_id and
sometimes string vitrage_id, so the md5 is
different.

The solution: convert to str before calculating.

Change-Id: I4f6de84dba7f1041a56ce2bc1ac25a5826e164a9
This commit is contained in:
Ifat Afek 2018-08-08 14:23:27 +00:00
parent 08c95a9d8b
commit ab6393e36f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vitrage/common/utils.py
View File

@ -93,9 +93,13 @@ def spawn(target, *args, **kwargs):
def md5(obj):
if isinstance(obj, tuple):
obj = str(obj)
obj = str([str(o) for o in obj])
if isinstance(obj, six.string_types):
return hashlib.md5(six.b(obj)).hexdigest()
if six.PY2:
return hashlib.md5(obj).hexdigest()
else:
return hashlib.md5(obj.encode('utf-8')).hexdigest()
raise Exception('Unknown object for md5 %s', str(obj))