From 2d21dfa22931bdb887ccccba4a33e6fa4755e94b Mon Sep 17 00:00:00 2001
From: jesopo
Date: Tue, 26 Nov 2019 13:41:40 +0000
Subject: utils.http.Response.data should always be `bytes` - add .decode and
 .soup

---
 modules/ip_addresses.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'modules/ip_addresses.py')

diff --git a/modules/ip_addresses.py b/modules/ip_addresses.py
index 744900f6..73ec061f 100644
--- a/modules/ip_addresses.py
+++ b/modules/ip_addresses.py
@@ -85,19 +85,17 @@ class Module(ModuleManager.BaseModule):
         :usage: <IP>
         :prefix: GeoIP
         """
-        page = utils.http.request(URL_GEOIP % event["args_split"][0],
-            json=True)
+        page = utils.http.request(URL_GEOIP % event["args_split"][0]).json()
         if page:
-            if page.data["status"] == "success":
-                data  = page.data["query"]
-                data += " | Organisation: %s" % page.data["org"]
-                data += " | City: %s" % page.data["city"]
-                data += " | Region: %s (%s)" % (page.data["regionName"],
-                    page.data["countryCode"])
-                data += " | ISP: %s" % page.data["isp"]
-                data += " | Lon/Lat: %s/%s" % (page.data["lon"],
-                    page.data["lat"])
-                data += " | Timezone: %s" % page.data["timezone"]
+            if page["status"] == "success":
+                data  = page["query"]
+                data += " | Organisation: %s" % page["org"]
+                data += " | City: %s" % page["city"]
+                data += " | Region: %s (%s)" % (
+                    page["regionName"], page["countryCode"])
+                data += " | ISP: %s" % page["isp"]
+                data += " | Lon/Lat: %s/%s" % (page["lon"], page["lat"])
+                data += " | Timezone: %s" % page["timezone"]
                 event["stdout"].write(data)
             else:
                 event["stderr"].write("No geoip data found")
-- 
cgit v1.3.1-10-gc9f91