Compare commits

..

No commits in common. "4eb906f6d48a535efdb8d37c7778febab00d4e54" and "d090e90ee20c1a53028c92963b496d865e498b19" have entirely different histories.

View File

@ -15,13 +15,11 @@ app = FastAPI()
GEOLITE2_ASN_DB = '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb'
GEOLITE2_CITY_DB = '/usr/local/share/GeoIP/GeoLite2-City.mmdb'
class IPAddressParam(BaseModel):
'''
Payload entry as used in POST
'''
ip: Union[IPv6Address, IPv4Address]
ip: Union[IPv6Address,IPv4Address]
class Locality(BaseModel):
'''
@ -32,21 +30,18 @@ class Locality(BaseModel):
continent: Optional[str] = None
is_eu: bool = False
class GeoLocation(BaseModel):
'''
Geolocation data model
'''
ip: Optional[Union[IPv6Address, IPv4Address]] = None
ip: Optional[Union[IPv6Address,IPv4Address]] = None
asn: Optional[int] = None
asn_org: Optional[str] = None
network: Optional[Union[IPv6Network, IPv4Network]] = None
network: Optional[Union[IPv6Network,IPv4Network]] = None
locality: Locality = Locality()
@app.post("/")
async def root_post(ipaddresses: Annotated[
list[IPAddressParam],
async def root_post(ipaddresses: Annotated[list[IPAddressParam],
Body(title="The IPAddresses to geolocate")],
response: Response
) -> list[GeoLocation]:
@ -84,25 +79,23 @@ async def root_post(ipaddresses: Annotated[
@app.get("/{ipaddress}")
async def root_get(ipaddress: Annotated[
Union[IPv4Address, IPv6Address],
async def root_get(ipaddress: Annotated[Union[IPv4Address,IPv6Address],
Path(title="The IPAddress to geolocate")],
response: Response
) -> GeoLocation:
'''
Look up geolocation for ip in path parameter
'''
locations = await root_post([IPAddressParam(ip=ipaddress)], response)
locations = await root_post([IPAddressParam(ip=ipaddress)])
if locations:
response.headers['Cache-Control'] = 'private, max-age=604800'
return locations.pop()
response.status_code = status.HTTP_404_NOT_FOUND
return GeoLocation()
@app.get("/")
def root_redirect(req: Request) -> RedirectResponse:
'''
Redirect empty request using REMOTE_ADDR
'''
return RedirectResponse(url=str(req.url) + str(req.client.host))
return RedirectResponse(url= str(req.url) + str(req.client.host))