nex/ipserv
Archived
1
0
Fork 0
Code Issues Pull requests Packages Activity Actions

Disable IPv6
All checks were successful
Build and Publish ipserv / build_and_publish (push) Successful in 1m15s
Details

Browse source
This commit is contained in:
Nexus 2024-04-23 20:52:34 +01:00
parent 10df69722d
commit bc13c0dcc2
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ipserv.py
View file

@ -4,6 +4,7 @@ import time
import os import os
import aiohttp import aiohttp
import random import random
import ipaddress
from fastapi import FastAPI, Header, Request, Query, HTTPException from fastapi import FastAPI, Header, Request, Query, HTTPException
from fastapi.responses import JSONResponse, PlainTextResponse from fastapi.responses import JSONResponse, PlainTextResponse
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
@ -94,6 +95,13 @@ async def ip(
ip = X_Forwarded_For ip = X_Forwarded_For
else: else:
ip = request.client.host ip = request.client.host
try:
_ip = ip_address.ip_address(ip)
if isinstance(_ip, ipaddress.IPv6Address):
raise HTTPException(400, detail="IPv6 is not supported at this time.")
except ValueError:
raise HTTPException(400, detail="%r does not appear to be a valid IP address" % ip)
logging.info("looking up IP info for %s", ip) logging.info("looking up IP info for %s", ip)
data = await make_request( data = await make_request(
@ -119,6 +127,13 @@ async def lookup(ip: str = Query(...), User_Agent: str = Header("Mozilla/5.0")):
logging.info("cache hit for %s", ip) logging.info("cache hit for %s", ip)
return JSONResponse(data) return JSONResponse(data)
logging.info("cache expired for %s", ip) logging.info("cache expired for %s", ip)
try:
_ip = ip_address.ip_address(ip)
if isinstance(_ip, ipaddress.IPv6Address):
raise HTTPException(400, detail="IPv6 is not supported at this time.")
except ValueError:
raise HTTPException(400, detail="%r does not appear to be a valid IP address" % ip)
logging.info("looking up IP info for %s", ip) logging.info("looking up IP info for %s", ip)
data = await make_request( data = await make_request(
@ -139,8 +154,13 @@ async def lookup(ip: str = Query(...), User_Agent: str = Header("Mozilla/5.0")):
@app.get("/imfeelinglucky") @app.get("/imfeelinglucky")
async def im_feeling_lucky(req: Request): async def im_feeling_lucky(req: Request):
host = req.client.host host = req.client.host
if host.count(".") != 3:
raise HTTPException(400, "IPv4 only endpoint.") try:
_ip = ip_address.ip_address(host)
if isinstance(_ip, ipaddress.IPv6Address):
raise HTTPException(400, detail="IPv6 is not supported at this time.")
except ValueError:
raise HTTPException(400, detail="%r does not appear to be a valid IP address" % host)
data = await make_request(host, {"User-Agent": "Mozilla/5.0 Nex/19.04.2024"}) data = await make_request(host, {"User-Agent": "Mozilla/5.0 Nex/19.04.2024"})
if not isinstance(data, dict): if not isinstance(data, dict):