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

Code cleanup

Browse Source
This commit is contained in:
Ruben van Staveren 2024-05-07 17:12:23 +02:00
parent 878a2b6bbf
commit 4eb906f6d4
Signed by: ruben
GPG Key ID: 886F6BECD477A93F
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/main.py
View File

@ -15,11 +15,13 @@ 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):
'''
@ -30,21 +32,24 @@ 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],
Body(title="The IPAddresses to geolocate")],
async def root_post(ipaddresses: Annotated[
list[IPAddressParam],
Body(title="The IPAddresses to geolocate")],
response: Response
) -> list[GeoLocation]:
) -> list[GeoLocation]:
'''
Return GeoLocation item(s) for a list of IPAddressParam objects
'''
@ -79,10 +84,11 @@ async def root_post(ipaddresses: Annotated[list[IPAddressParam],
@app.get("/{ipaddress}")
async def root_get(ipaddress: Annotated[Union[IPv4Address,IPv6Address],
Path(title="The IPAddress to geolocate")],
async def root_get(ipaddress: Annotated[
Union[IPv4Address, IPv6Address],
Path(title="The IPAddress to geolocate")],
response: Response
) -> GeoLocation:
) -> GeoLocation:
'''
Look up geolocation for ip in path parameter
'''
@ -93,9 +99,10 @@ async def root_get(ipaddress: Annotated[Union[IPv4Address,IPv6Address],
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))