From 627420ca43ce7ba993fe2e56b88c530b49dc89d2 Mon Sep 17 00:00:00 2001 From: chrisr3d Date: Tue, 20 Nov 2018 10:43:17 +0100 Subject: [PATCH] fix: Updated rbl module result format - More readable as str than dumped json --- misp_modules/modules/expansion/rbl.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/misp_modules/modules/expansion/rbl.py b/misp_modules/modules/expansion/rbl.py index 6626760..bcdcec3 100644 --- a/misp_modules/modules/expansion/rbl.py +++ b/misp_modules/modules/expansion/rbl.py @@ -89,19 +89,17 @@ def handler(q=False): return misperrors listed = [] info = [] + ipRev = '.'.join(ip.split('.')[::-1]) for rbl in rbls: - ipRev = '.'.join(ip.split('.')[::-1]) query = '{}.{}'.format(ipRev, rbl) try: txt = resolver.query(query,'TXT') listed.append(query) - info.append(str(txt[0])) + info.append([str(t) for t in txt]) except Exception: continue - result = {} - for l, i in zip(listed, info): - result[l] = i - return {'results': [{'types': mispattributes.get('output'), 'values': json.dumps(result)}]} + result = "\n".join(["{}: {}".format(l, " - ".join(i)) for l, i in zip(listed, info)]) + return {'results': [{'types': mispattributes.get('output'), 'values': result}]} def introspection(): return mispattributes