caldav-adapter 9.3.1 → 9.3.3

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": "9.3.1",
+  "version": "9.3.3",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",

package/routes/calendar/calendar/calendar-query.js

@@ -17,12 +17,13 @@ module.exports = function (options) {
       ctx.request.xml
     );
 
-    const filters = veventFilters || vtodoFilters;
-    const componentType = veventFilters
-      ? 'VEVENT'
-      : vtodoFilters
-        ? 'VTODO'
-        : null;
+    const filters = veventFilters.length > 0 ? veventFilters : vtodoFilters;
+    const componentType =
+      veventFilters.length > 0
+        ? 'VEVENT'
+        : vtodoFilters.length > 0
+          ? 'VTODO'
+          : null;
     const { children } = xml.getWithChildren(
       '/CAL:calendar-query/D:prop',
       ctx.request.xml

package/routes/calendar/calendar/put.js

@@ -1,4 +1,4 @@
-const { notFound, preconditionFail } = require('../../../common/x-build');
+const { preconditionFail } = require('../../../common/x-build');
 const { setMissingMethod } = require('../../../common/response');
 const winston = require('../../../common/winston');
 
@@ -23,11 +23,19 @@ 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
+      //
+      // RFC 4791 Section 5.3.2: PUT requires Content-Type: text/calendar
+      // Return 415 Unsupported Media Type instead of misleading 404
+      //
+      ctx.status = 415;
+      ctx.set('Content-Type', 'application/xml; charset="utf-8"');
+      ctx.body = [
+        '<?xml version="1.0" encoding="utf-8"?>',
+        '<D:error xmlns:D="DAV:">',
+        '  <D:supported-calendar-data/>',
+        '  <D:description>PUT requires Content-Type: text/calendar</D:description>',
+        '</D:error>'
+      ].join('\n');
       return;
     }
 

package/routes/principal/mkcalendar.js

@@ -6,7 +6,8 @@ const xml = require('../../common/xml');
 function parseSupportedComponents(node) {
   const comps = [];
   if (!node.childNodes) return comps;
-  for (const comp of node.childNodes) {
+  for (let i = 0; i < node.childNodes.length; i++) {
+    const comp = node.childNodes[i];
     if (comp.localName !== 'comp') continue;
     const name = comp.getAttribute ? comp.getAttribute('name') : null;
     if (name) comps.push(name.toUpperCase());