tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc fixes: cors + disable buffering for uploads (#2395)

Browse Source 
- ensure pages endpoint support CORS for local dev
- disable proxy request buffering to support large uploads
This commit is contained in:
Ilya Kreymer 2025-02-13 19:38:20 -08:00 committed by GitHub
parent 7f1af9bb31
commit 4516268a70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/btrixcloud/pages.py
View File

@ -1159,6 +1159,11 @@ def init_pages_api(
response.headers["Access-Control-Allow-Headers"] = "*" response.headers["Access-Control-Allow-Headers"] = "*"
return paginated_format(pages, total, page, pageSize) return paginated_format(pages, total, page, pageSize)
@app.options(
"/orgs/{oid}/collections/{coll_id}/pages",
tags=["pages", "collections"],
response_model=EmptyResponse,
)
@app.options( @app.options(
"/orgs/{oid}/collections/{coll_id}/public/pages", "/orgs/{oid}/collections/{coll_id}/public/pages",
tags=["pages", "collections"], tags=["pages", "collections"],
@ -1177,6 +1182,7 @@ def init_pages_api(
) )
async def get_collection_pages_list( async def get_collection_pages_list(
coll_id: UUID, coll_id: UUID,
response: Response,
org: Organization = Depends(org_viewer_dep), org: Organization = Depends(org_viewer_dep),
search: Optional[str] = None, search: Optional[str] = None,
url: Optional[str] = None, url: Optional[str] = None,
@ -1204,6 +1210,8 @@ def init_pages_api(
sort_by=sortBy, sort_by=sortBy,
sort_direction=sortDirection, sort_direction=sortDirection,
) )
response.headers["Access-Control-Allow-Origin"] = "*"
response.headers["Access-Control-Allow-Headers"] = "*"
return paginated_format(pages, total, page, pageSize) return paginated_format(pages, total, page, pageSize)
@app.get( @app.get(

2
frontend/frontend.conf.template
View File

@ -28,6 +28,7 @@ server {
error_page 500 501 502 503 504 /50x.html; error_page 500 501 502 503 504 /50x.html;
client_max_body_size 0; client_max_body_size 0;
proxy_request_buffering off;
merge_slashes off; merge_slashes off;
location = /50x.html { location = /50x.html {
@ -83,7 +84,6 @@ server {
# for larger uploads to not timeout # for larger uploads to not timeout
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_read_timeout 300; proxy_read_timeout 300;
proxy_request_buffering off;
} }
location ~* /watch/([^/]+)/([^/]+)/([^/]+)/ws { location ~* /watch/([^/]+)/([^/]+)/([^/]+)/ws {