From 942f5260162bcf4ab9977d68eb6a65fd537f9c29 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Fri, 4 May 2018 02:11:16 +0300 Subject: [PATCH] Missing parens on IP resolver lookup Also adds a generic catch in case this happens again; we should *never* fail --- util/ipresolver/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/ipresolver/__init__.py b/util/ipresolver/__init__.py index 2adebbef5..270f59ff7 100644 --- a/util/ipresolver/__init__.py +++ b/util/ipresolver/__init__.py @@ -78,13 +78,15 @@ class IPResolver(IPResolverInterface): logger.debug('Got non-200 response for IP %s: %s', ip_address, r.status_code) return False - logger.debug('Got IP data for IP %s: %s => %s', ip_address, r.status_code, r.json) - threat_data = r.json.get('threat', {}) + logger.debug('Got IP data for IP %s: %s => %s', ip_address, r.status_code, r.json()) + threat_data = r.json().get('threat', {}) return threat_data.get('is_threat', False) or threat_data.get('is_bogon', False) except requests.RequestException: logger.exception('Got exception when trying to lookup IP Address') except ValueError: logger.exception('Got exception when trying to lookup IP Address') + except Exception: + logger.exception('Got exception when trying to lookup IP Address') return False