gru/ip-geo-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dane w headerach i inne funkcje

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2025-10-09 16:54:54 +02:00
parent 73279cc5f6
commit 941937354c
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/api.py
View File

@@ -159,21 +159,24 @@ def get_client_ip(request: Request) -> str:
return "0.0.0.0" return "0.0.0.0"
@router.get("/ip") @router.api_route('/ip', methods=["GET", "HEAD"])
async def my_ip(request: Request, geo=Depends(get_geo)): async def my_ip(request: Request, geo=Depends(get_geo)):
ip = get_client_ip(request) ip = get_client_ip(request) # pobieranie IP:contentReference[oaicite:0]{index=0}
data = geo.lookup(ip) data = geo.lookup(ip) # geo lookup:contentReference[oaicite:1]{index=1}:contentReference[oaicite:2]{index=2}
return Response( headers = _geo_headers(data)
content=data.__str__(), media_type="application/json", headers=geo_headers(data) if request.method == "HEAD":
) return Response(status_code=200, headers=headers)
body = json.dumps(data, ensure_ascii=False) + "\n"
return Response(content=body, media_type="application/json", headers=headers)
@router.api_route('/ip/{ip_address}', methods=["GET", "HEAD"])
@router.get("/ip/{ip_address}")
async def ip_lookup(ip_address: str, geo=Depends(get_geo)): async def ip_lookup(ip_address: str, geo=Depends(get_geo)):
data = geo.lookup(ip_address) data = geo.lookup(ip_address)
return Response( headers = _geo_headers(data)
content=data.__str__(), media_type="application/json", headers=geo_headers(data) if request.method == "HEAD":
) return Response(status_code=200, headers=headers)
body = json.dumps(data, ensure_ascii=False) + "\n"
return Response(content=body, media_type="application/json", headers=headers)
@router.post("/reload") @router.post("/reload")

2
app/main.py
View File

@@ -41,7 +41,7 @@ async def favicon():
@app.get("/") @app.get("/")
async def root(request: Request): async def root(request: Request):
ua = request.headers.get("user-agent", "").lower() ua = request.headers.get("user-agent", "").lower()
ip = get_client_ip(request) ip = get_client_ip(request).strip()
if any(x in ua for x in ["mozilla", "chrome", "safari", "edge", "firefox"]): if any(x in ua for x in ["mozilla", "chrome", "safari", "edge", "firefox"]):
return Response(status_code=404) return Response(status_code=404)