caldav-adapter 8.0.0 → 8.0.2

package/common/parse-body.js

@@ -9,7 +9,7 @@ module.exports = async function (ctx) {
     });
   } catch (err) {
     // <https://github.com/stream-utils/raw-body/blob/f62e660e7c50891844f5615de075ab145c1f6129/README.md?plain=1#L82-L116>
-    if (ctx?.app?.emit) ctx.app.emit('error', err);
+    if (ctx?.app?.emit) ctx.app.emit('error', err, ctx);
     else throw err;
   }
 
@@ -17,7 +17,7 @@ module.exports = async function (ctx) {
     try {
       ctx.request.xml = new DOMParser().parseFromString(ctx.request.body);
     } catch (err) {
-      if (ctx?.app?.emit) ctx.app.emit('error', err);
+      if (ctx?.app?.emit) ctx.app.emit('error', err, ctx);
       else throw err;
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "caldav-adapter",
   "description": "CalDAV server for Node.js and Koa. Modernized and maintained for Forward Email.",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",

package/routes/calendar/calendar/proppatch.js

@@ -1,12 +1,18 @@
 const _ = require('lodash');
 const xml = require('../../../common/xml');
 const { build, multistatus } = require('../../../common/x-build');
+const { setMissingMethod } = require('../../../common/response');
 const commonTags = require('../../../common/tags');
 
 module.exports = function (options) {
   const tags = commonTags(options);
 
   const exec = async function (ctx, calendar) {
+    if (calendar.readonly) {
+      setMissingMethod(ctx);
+      return;
+    }
+
     const { children } = xml.getWithChildren(
       '/D:propertyupdate/D:set/D:prop',
       ctx.request.xml

package/routes/calendar/calendar/put.js

@@ -18,6 +18,10 @@ module.exports = function (options) {
       typeof ctx.request.body !== 'string'
     ) {
       log.warn('incoming ICS file not present in body');
+      // TODO: we may want to rewrite all this
+      // so that set `setMultistatusResponse` for example only where appropriate
+      // (otherwise it's going to have DAV and XML headers when it doesn't need to)
+      setMissingMethod(ctx);
       ctx.body = notFound(ctx.url); // Make more meaningful
       return;
     }

package/routes/calendar/calendar.js

@@ -1,5 +1,9 @@
 const { notFound } = require('../../common/x-build');
-const { setMultistatusResponse, setOptions } = require('../../common/response');
+const {
+  setMissingMethod,
+  setMultistatusResponse,
+  setOptions
+} = require('../../common/response');
 const winston = require('../../common/winston');
 const routeMkCalendar = require('../principal/mkcalendar');
 const routerUserPropfind = require('./user/propfind');
@@ -21,7 +25,7 @@ module.exports = function (options) {
     propfind: routerCalPropfind(options),
     report: routerCalReport(options),
     get: routerCalGet(options),
-    // proppatch: routerCalProppatch(opts),
+    // proppatch: routerCalProppatch(options),
     put: routerCalPut(options),
     delete: routerCalDelete(options),
     mkcalendar: routeMkCalendar(options)
@@ -30,7 +34,6 @@ module.exports = function (options) {
   return async function (ctx) {
     const method = ctx.method.toLowerCase();
     const { calendarId } = ctx.state.params;
-    setMultistatusResponse(ctx);
 
     if (calendarId) {
       // Check calendar exists & user has access
@@ -50,12 +53,14 @@ module.exports = function (options) {
 
       if (!calendar && method !== 'mkcalendar') {
         log.warn(`calendar not found: ${calendarId}`);
+        setMissingMethod(ctx);
         ctx.body = notFound(ctx.url);
         return;
       }
 
       if (!calMethods[method]) {
         log.warn(`method handler not found: ${method}`);
+        setMissingMethod(ctx);
         ctx.body = notFound(ctx.url);
         return;
       }
@@ -66,6 +71,7 @@ module.exports = function (options) {
         ctx.body = await calMethods[method](ctx, calendar);
       } else {
         log.warn(`method handler not found: ${method}`);
+        setMissingMethod(ctx);
         ctx.body = notFound(ctx.url);
       }
     } else {
@@ -76,16 +82,20 @@ module.exports = function (options) {
 
       if (!userMethods[method]) {
         log.warn(`method handler not found: ${method}`);
+        setMissingMethod(ctx);
         ctx.body = notFound(ctx.url);
         return;
       }
 
       if (typeof userMethods[method].exec === 'function') {
+        setMultistatusResponse(ctx);
         ctx.body = await userMethods[method].exec(ctx);
       } else if (typeof userMethods[method] === 'function') {
+        setMultistatusResponse(ctx);
         ctx.body = await userMethods[method](ctx);
       } else {
         log.warn(`method handler not found: ${method}`);
+        setMissingMethod(ctx);
         ctx.body = notFound(ctx.url);
       }
     }

package/routes/principal/principal.js

@@ -1,5 +1,9 @@
 const { notFound } = require('../../common/x-build');
-const { setMultistatusResponse, setOptions } = require('../../common/response');
+const {
+  setMissingMethod,
+  setMultistatusResponse,
+  setOptions
+} = require('../../common/response');
 const winston = require('../../common/winston');
 const routePropfind = require('./propfind');
 const routeMkCalendar = require('./mkcalendar');
@@ -10,12 +14,16 @@ module.exports = function (options) {
   const methods = {
     propfind: routePropfind(options),
     // report: reportReport(opts)
+    //
+    // TODO: proppatch
+    // NOTE: fennel implements this with 403 forbidden
+    // <https://github.com/LordEidi/fennel.js/blob/abfc371701fcb2581d8f1382426f0ef9e9846554/handler/principal.js#L317-L340>
+    //
     mkcalendar: routeMkCalendar(options)
   };
 
   return async function (ctx) {
     const method = ctx.method.toLowerCase();
-    setMultistatusResponse(ctx);
 
     if (method === 'options') {
       setOptions(ctx, ['OPTIONS', 'PROPFIND']);
@@ -24,10 +32,12 @@ module.exports = function (options) {
 
     if (!methods[method]) {
       log.warn(`method handler not found: ${method}`);
+      setMissingMethod(ctx);
       ctx.body = notFound(ctx.url);
       return;
     }
 
+    setMultistatusResponse(ctx);
     ctx.body = await methods[method](ctx);
   };
 };