aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

[CHORE] cleanup ip block middle workaround for older fastapi (#1981)

Browse source
This commit is contained in:
dni ⚡ 2023-10-09 07:57:13 +02:00 • committed by GitHub
parent 829e1b8f05
commit 54e0d1aa15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lnbits/middleware.py
View file

@ -2,7 +2,7 @@ from http import HTTPStatus
from typing import Any, List, Tuple, Union from typing import Any, List, Tuple, Union
from urllib.parse import parse_qs from urllib.parse import parse_qs
from fastapi import FastAPI, Request, Response from fastapi import FastAPI, Request
from fastapi.responses import HTMLResponse, JSONResponse from fastapi.responses import HTMLResponse, JSONResponse
from slowapi import _rate_limit_exceeded_handler from slowapi import _rate_limit_exceeded_handler
from slowapi.errors import RateLimitExceeded from slowapi.errors import RateLimitExceeded
@ -233,15 +233,6 @@ def add_ip_block_middleware(app: FastAPI):
status_code=403, # Forbidden status_code=403, # Forbidden
content={"detail": "IP is blocked"}, content={"detail": "IP is blocked"},
) )
# this try: except: block is not needed on latest FastAPI return await call_next(request)
# (await call_next(request) is enough)
# https://stackoverflow.com/questions/71222144/runtimeerror-no-response-returned-in-fastapi-when-refresh-request
# TODO: remove after https://github.com/lnbits/lnbits/pull/1609 is merged
try:
return await call_next(request)
except RuntimeError as exc:
if str(exc) == "No response returned." and await request.is_disconnected():
return Response(status_code=HTTPStatus.NO_CONTENT)
raise # bubble up different exceptions
app.middleware("http")(block_allow_ip_middleware) app.middleware("http")(block_allow_ip_middleware)