From ab6393e36ff39835cbf6f13e2a53dfed35442974 Mon Sep 17 00:00:00 2001 From: Ifat Afek Date: Wed, 8 Aug 2018 14:23:27 +0000 Subject: [PATCH] Bug fix: calculate md5 on non-unicode strings 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 --- vitrage/common/utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vitrage/common/utils.py b/vitrage/common/utils.py index 565c9a137..648c55095 100644 --- a/vitrage/common/utils.py +++ b/vitrage/common/utils.py @@ -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))