external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(python): handle RuntimeErrors raised through routes

Browse source 
This gets raised when a client closes a connection before receiving
a valid response; this is not controllable from our side.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2022-01-07 18:21:23 -08:00
parent bf371c447f
commit 9e7ae5904f
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
3 changed files with 58 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
aurweb/asgi.py
View file

@ -1,4 +1,3 @@
import asyncio
import http
import os
import re
@ -21,7 +20,7 @@ import aurweb.config
import aurweb.logging
import aurweb.pkgbase.util as pkgbaseutil
from aurweb import prometheus, util
from aurweb import logging, prometheus, util
from aurweb.auth import BasicAuthBackend
from aurweb.db import get_engine, query
from aurweb.models import AcceptedTerm, Term
@ -30,6 +29,8 @@ from aurweb.prometheus import instrumentator
from aurweb.routers import APP_ROUTES
from aurweb.templates import make_context, render_template
logger = logging.get_logger(__name__)
# Setup the FastAPI app.
app = FastAPI()
@ -132,9 +133,7 @@ async def add_security_headers(request: Request, call_next: typing.Callable):
RP: Referrer-Policy
XFO: X-Frame-Options
"""
response = asyncio.create_task(call_next(request))
await asyncio.wait({response}, return_when=asyncio.FIRST_COMPLETED)
response = response.result()
response = await util.error_or_result(call_next, request)
# Add CSP header.
nonce = request.user.nonce
@ -174,9 +173,7 @@ async def check_terms_of_service(request: Request, call_next: typing.Callable):
return RedirectResponse(
"/tos", status_code=int(http.HTTPStatus.SEE_OTHER))
task = asyncio.create_task(call_next(request))
await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
return task.result()
return await util.error_or_result(call_next, request)
@app.middleware("http")
@ -194,6 +191,4 @@ async def id_redirect_middleware(request: Request, call_next: typing.Callable):
path = request.url.path.rstrip('/')
return RedirectResponse(f"{path}/{id}{qs}")
task = asyncio.create_task(call_next(request))
await asyncio.wait({task}, return_when=asyncio.FIRST_COMPLETED)
return task.result()
return await util.error_or_result(call_next, request)