From 54e0d1aa15749f8b1916c454d1daea5a0e0f4bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Mon, 9 Oct 2023 07:57:13 +0200 Subject: [PATCH] [CHORE] cleanup ip block middle workaround for older fastapi (#1981) --- lnbits/middleware.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/lnbits/middleware.py b/lnbits/middleware.py index 65ca7698..6a03399d 100644 --- a/lnbits/middleware.py +++ b/lnbits/middleware.py @@ -2,7 +2,7 @@ from http import HTTPStatus from typing import Any, List, Tuple, Union from urllib.parse import parse_qs -from fastapi import FastAPI, Request, Response +from fastapi import FastAPI, Request from fastapi.responses import HTMLResponse, JSONResponse from slowapi import _rate_limit_exceeded_handler from slowapi.errors import RateLimitExceeded @@ -233,15 +233,6 @@ def add_ip_block_middleware(app: FastAPI): status_code=403, # Forbidden content={"detail": "IP is blocked"}, ) - # this try: except: block is not needed on latest FastAPI - # (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 + return await call_next(request) app.middleware("http")(block_allow_ip_middleware)