From 1970ea26573048e948c2d4d31a31ab584cdda908 Mon Sep 17 00:00:00 2001 From: Spencer McIntyre Date: Wed, 10 Oct 2018 13:09:27 -0700 Subject: [PATCH] Fix #326, catch a geoip2 database error in GraphQL --- king_phisher/server/graphql/types/misc.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/king_phisher/server/graphql/types/misc.py b/king_phisher/server/graphql/types/misc.py index d4134497..e7114404 100644 --- a/king_phisher/server/graphql/types/misc.py +++ b/king_phisher/server/graphql/types/misc.py @@ -37,6 +37,7 @@ import king_phisher.geoip as geoip import king_phisher.ipaddress as ipaddress +import geoip2.errors import graphene.types.utils import graphql.language.ast @@ -110,7 +111,10 @@ def from_ip_address(cls, ip_address): ip_address = ipaddress.ip_address(ip_address) if ip_address.is_private: return - result = geoip.lookup(ip_address) + try: + result = geoip.lookup(ip_address) + except geoip2.errors.AddressNotFoundError: + result = None if result is None: return return cls(**result)