Skip to content

Fix change to maxmind API 2.6.3 #823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianhelle merged 1 commit into from
Feb 5, 2025
Merged

Fix change to maxmind API 2.6.3 #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions msticpy/context/geoip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,15 @@ def lookup_ip(
geo_match = self._get_geomatch_non_public(ip_type)
elif self._reader:
try:
geo_match = self._reader.city(ip_input).raw # type: ignore
except (AddressNotFoundError, AttributeError, ValueError):
geo_match_object = self._reader.city(ip_input)
if hasattr(geo_match_object, "raw"):
geo_match = geo_match_object.raw # type: ignore
elif hasattr(geo_match_object, "to_dict"):
geo_match = geo_match_object.to_dict()
else:
geo_match = None
except (AddressNotFoundError, AttributeError, ValueError) as err:
logger.warning("Error looking up IP %s - %s", ip_input, err)
continue
if geo_match:
output_raw.append(geo_match)
Expand Down
2 changes: 1 addition & 1 deletion msticpy/context/ip_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def _get_asns_dict() -> dict[str, str]:
asns_soup = BeautifulSoup(asns_resp.content, features="lxml")
asns_dict = {
str(asn.next_element)
.strip(): str(asn.next_element.next_element)
.strip(): str(asn.next_element.next_element if asn.next_element else "")
.strip()
for asn in asns_soup.find_all("a")
}
Expand Down