ruben/ismijnipverweg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add post method and let the get method reuse that code

Browse Source
This commit is contained in:
Ruben van Staveren 2023-12-12 14:46:14 +01:00
parent 49e16b106f
commit 734ac03c65
Signed by: ruben
GPG Key ID: 886F6BECD477A93F
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/main.py
View File

@ -5,7 +5,7 @@ from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network
from typing import Annotated, Optional, Union from typing import Annotated, Optional, Union
import geoip2.database import geoip2.database
from fastapi import FastAPI, Path from fastapi import FastAPI, Path, Body
from pydantic import BaseModel from pydantic import BaseModel
app = FastAPI() app = FastAPI()
@ -13,6 +13,9 @@ app = FastAPI()
GEOLITE2_ASN_DB = '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb' GEOLITE2_ASN_DB = '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb'
GEOLITE2_CITY_DB = '/usr/local/share/GeoIP/GeoLite2-City.mmdb' GEOLITE2_CITY_DB = '/usr/local/share/GeoIP/GeoLite2-City.mmdb'
class IPAddressParam(BaseModel):
ip: Union[IPv6Address,IPv4Address]
class Locality(BaseModel): class Locality(BaseModel):
''' '''
Locality data Locality data
@ -32,20 +35,18 @@ class GeoLocation(BaseModel):
network: Union[IPv6Network,IPv4Network,None] network: Union[IPv6Network,IPv4Network,None]
locality: Locality locality: Locality
@app.get("/{ipaddress}") @app.post("/")
async def root(ipaddress: Annotated[Union[IPv4Address,IPv6Address], async def root_post(ipaddresses: Annotated[list[IPAddressParam],
Path(title="The IPAddress to geolocate")] Body(title="The IPAddresses to geolocate")]
) -> GeoLocation: ) -> list[GeoLocation]:
''' geolocations = []
Look up geolocation for ip in path parameter
'''
with (geoip2.database.Reader(GEOLITE2_ASN_DB) as reader_asn, with (geoip2.database.Reader(GEOLITE2_ASN_DB) as reader_asn,
geoip2.database.Reader(GEOLITE2_CITY_DB) as reader_city): geoip2.database.Reader(GEOLITE2_CITY_DB) as reader_city):
asn_data = reader_asn.asn(ipaddress) for ipaddress in ipaddresses:
city_data = reader_city.city(ipaddress) asn_data = reader_asn.asn(ipaddress.ip)
city_data = reader_city.city(ipaddress.ip)
return GeoLocation( geolocations.append(GeoLocation(
ip=ipaddress, ip=ipaddress.ip,
asn=asn_data.autonomous_system_number, asn=asn_data.autonomous_system_number,
asn_org=asn_data.autonomous_system_organization, asn_org=asn_data.autonomous_system_organization,
network=asn_data.network, network=asn_data.network,
@ -55,4 +56,15 @@ async def root(ipaddress: Annotated[Union[IPv4Address,IPv6Address],
continent=city_data.continent.code, continent=city_data.continent.code,
is_eu=city_data.country.is_in_european_union is_eu=city_data.country.is_in_european_union
) )
) ))
return geolocations
@app.get("/{ipaddress}")
async def root_get(ipaddress: Annotated[Union[IPv4Address,IPv6Address],
Path(title="The IPAddress to geolocate")]
) -> GeoLocation:
'''
Look up geolocation for ip in path parameter
'''
return (await root_post([IPAddressParam(ip=ipaddress)])).pop()