diff --git a/misp_modules/modules/expansion/xforceexchange.py b/misp_modules/modules/expansion/xforceexchange.py index 5d1a24a..8a01e77 100644 --- a/misp_modules/modules/expansion/xforceexchange.py +++ b/misp_modules/modules/expansion/xforceexchange.py @@ -1,6 +1,4 @@ -#!/usr/bin/python - -import urllib2 +import requests import json import sys @@ -71,19 +69,17 @@ def handler(q=False): return r def apicall(indicator_type, indicator, key=False): - try: + #try: myURL = BASEurl + (extensions[str(indicator_type)])%indicator - request = urllib2.Request(myURL, None, MyHeader(key)) - data = urllib2.urlopen(request) - jsondata = json.loads(data.read()) - except: - return None - return jsondata + jsondata = requests.get(myURL, headers=MyHeader(key)).json() + #except: + #return None + return jsondata def introspection(): - return mispattributes + return mispattributes def version(): - moduleinfo['config'] = moduleconfig - return moduleinfo \ No newline at end of file + moduleinfo['config'] = moduleconfig + return moduleinfo \ No newline at end of file