sirtimbly/bewcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly fix empty body on GET/HEAD for CardDav/CalDav

Browse Source 
Related to 47f443c300
This commit is contained in:
Bruno Bernardino
2025-08-28 17:48:10 +01:00
parent 47f443c300
commit f14c40d05d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -1,6 +1,6 @@
services: services:
website: website:
image: ghcr.io/bewcloud/bewcloud:v2.4.6 image: ghcr.io/bewcloud/bewcloud:v2.4.7
restart: always restart: always
ports: ports:
- 127.0.0.1:8000:8000 - 127.0.0.1:8000:8000

4
routes/caldav.tsx
View File

@@ -31,14 +31,14 @@ export const handler: Handler<Data, FreshContextState> = async (request, context
const requestBodyText = await request.clone().text(); const requestBodyText = await request.clone().text();
// Remove the `/caldav/` prefix from the hrefs in the request // Remove the `/caldav/` prefix from the hrefs in the request
let parsedRequestBodyText = requestBodyText.replaceAll('<href>/caldav/', `<href>/`).replaceAll( let parsedRequestBodyText: string | undefined = requestBodyText.replaceAll('<href>/caldav/', `<href>/`).replaceAll(
':href>/caldav/', ':href>/caldav/',
`:href>/`, `:href>/`,
); );
// The spec doesn't allow a body for GET or HEAD requests (and Deno fails if you try) // The spec doesn't allow a body for GET or HEAD requests (and Deno fails if you try)
if (request.method === 'GET' || request.method === 'HEAD') { if (request.method === 'GET' || request.method === 'HEAD') {
parsedRequestBodyText = ''; parsedRequestBodyText = undefined;
} }
const response = await fetch(`${calendarConfig.calDavUrl}/${path}`, { const response = await fetch(`${calendarConfig.calDavUrl}/${path}`, {

4
routes/carddav.tsx
View File

@@ -31,14 +31,14 @@ export const handler: Handler<Data, FreshContextState> = async (request, context
const requestBodyText = await request.clone().text(); const requestBodyText = await request.clone().text();
// Remove the `/carddav/` prefix from the hrefs in the request // Remove the `/carddav/` prefix from the hrefs in the request
let parsedRequestBodyText = requestBodyText.replaceAll('<href>/carddav/', `<href>/`).replaceAll( let parsedRequestBodyText: string | undefined = requestBodyText.replaceAll('<href>/carddav/', `<href>/`).replaceAll(
':href>/carddav/', ':href>/carddav/',
`:href>/`, `:href>/`,
); );
// The spec doesn't allow a body for GET or HEAD requests (and Deno fails if you try) // The spec doesn't allow a body for GET or HEAD requests (and Deno fails if you try)
if (request.method === 'GET' || request.method === 'HEAD') { if (request.method === 'GET' || request.method === 'HEAD') {
parsedRequestBodyText = ''; parsedRequestBodyText = undefined;
} }
const response = await fetch(`${contactsConfig.cardDavUrl}/${path}`, { const response = await fetch(`${contactsConfig.cardDavUrl}/${path}`, {