feat: report collection urls with trailing slash to clients who don't…

… give them, as per spec
sciactive · Aug 11, 2022 · 7528d4c · 7528d4c
1 parent 77544de
commit 7528d4c
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 1 deletion.
diff --git a/packages/nephele/src/Methods/COPY.ts b/packages/nephele/src/Methods/COPY.ts
@@ -41,6 +41,12 @@ export class COPY extends Method {
       response.locals.baseUrl
     );
 
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     if (!destination) {
       throw new BadRequestError('Destination header is required.');
     }

diff --git a/packages/nephele/src/Methods/GET_HEAD.ts b/packages/nephele/src/Methods/GET_HEAD.ts
@@ -25,6 +25,13 @@ export class GET_HEAD extends Method {
       url,
       response.locals.baseUrl
     );
+
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     const properties = await resource.getProperties();
     const etagPromise = resource.getEtag();
     const lastModifiedPromise = properties.get('getlastmodified');

diff --git a/packages/nephele/src/Methods/LOCK.ts b/packages/nephele/src/Methods/LOCK.ts
@@ -48,6 +48,12 @@ export class LOCK extends Method {
       }
     }
 
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     const timeoutRequests = timeoutHeader.split(/,\s+/);
     let timeout = Infinity;
     for (let curTreq of timeoutRequests) {

diff --git a/packages/nephele/src/Methods/MKCOL.ts b/packages/nephele/src/Methods/MKCOL.ts
@@ -5,6 +5,7 @@ import {
   ForbiddenError,
   LockedError,
   MediaTypeNotSupportedError,
+  ResourceExistsError,
   ResourceNotFoundError,
   ResourceTreeNotCompleteError,
 } from '../Errors/index.js';
@@ -22,6 +23,12 @@ export class MKCOL extends Method {
       response.locals.baseUrl
     );
 
+    if (!url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     try {
       const parent = await this.getParentResource(request, response, resource);
       if (!(await parent?.isCollection())) {
@@ -80,7 +87,14 @@ export class MKCOL extends Method {
       Date: new Date().toUTCString(),
     });
 
-    await resource.create(response.locals.user);
+    try {
+      await resource.create(response.locals.user);
+    } catch (e: any) {
+      if (e instanceof ResourceExistsError) {
+        response.removeHeader('Content-Location');
+      }
+      throw e;
+    }
 
     response.status(201); // Created
     response.set({

diff --git a/packages/nephele/src/Methods/MOVE.ts b/packages/nephele/src/Methods/MOVE.ts
@@ -44,6 +44,12 @@ export class MOVE extends Method {
       response.locals.baseUrl
     );
 
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     if (!destination) {
       throw new BadRequestError('Destination header is required.');
     }

diff --git a/packages/nephele/src/Methods/PROPFIND.ts b/packages/nephele/src/Methods/PROPFIND.ts
@@ -29,6 +29,12 @@ export class PROPFIND extends Method {
       response.locals.baseUrl
     );
 
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     if (!['0', '1', 'infinity'].includes(depth)) {
       throw new BadRequestError(
         'Depth header must be one of "0", "1", or "infinity".'

diff --git a/packages/nephele/src/Methods/PROPPATCH.ts b/packages/nephele/src/Methods/PROPPATCH.ts
@@ -35,6 +35,13 @@ export class PROPPATCH extends Method {
       url,
       response.locals.baseUrl
     );
+
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     const props = await resource.getProperties();
 
     const xmlBody = await this.getBodyXML(request, response);

diff --git a/packages/nephele/src/Methods/PUT.ts b/packages/nephele/src/Methods/PUT.ts
@@ -35,6 +35,12 @@ export class PUT extends Method {
       }
     }
 
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     try {
       const parent = await this.getParentResource(request, response, resource);
       if (!(await parent?.isCollection())) {

diff --git a/packages/nephele/src/Methods/UNLOCK.ts b/packages/nephele/src/Methods/UNLOCK.ts
@@ -26,6 +26,12 @@ export class UNLOCK extends Method {
       response.locals.baseUrl
     );
 
+    if ((await resource.isCollection()) && !url.toString().endsWith('/')) {
+      response.set({
+        'Content-Location': `${url}/`,
+      });
+    }
+
     if (lockTokenHeader == null || lockTokenHeader.trim() === '') {
       throw new BadRequestError(
         'UNLOCK method must include a lock token in the Lock-Token header.'