-// This file contains functions which handle all of the CalDAV "REPORT" queries
-// specified in RFC4791 section 7.
-//
+// This file contains functions which handle all of the CalDAV "REPORT" queries specified in RFC4791 section 7.
// Copyright (c) 2023-2024 by the citadel.org team
-//
-// This program is open source software. Use, duplication, or
-// disclosure is subject to the GNU General Public License v3.
+// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3.
#include "webcit.h"
// Data type for CalDAV Report Parameters.
// As we slog our way through the XML we learn what the client is asking for
// and build up the contents of this data type.
-struct cr_parms {
+struct cr_params {
int tag_nesting_level; // not needed, just kept for pretty-printing
enum cr_type report_type; // which RFC4791 section 7 REPORT are we generating
StrBuf *Chardata; // XML chardata in between tags is built up here
StrBuf *Hrefs; // list of items requested by a `calendar-multiget` REPORT
+ Array *filters; // If the query contains a FILTER stanza, the filter criteria are populated here
};
// XML parser callback
void caldav_xml_start(void *data, const char *el, const char **attr) {
- struct cr_parms *crp = (struct cr_parms *) data;
- int i;
-
- // syslog(LOG_DEBUG, "CALDAV ELEMENT START: <%s> %d", el, crp->tag_nesting_level);
+ struct cr_params *crp = (struct cr_params *) data;
+#ifdef DEBUG_XML_PARSE
+ // logging
+ int i;
+ char indent[256];
+ indent[0] = 0;
+ for (i=0; i<crp->tag_nesting_level; ++i) {
+ strcat(indent, " ");
+ }
+ syslog(LOG_DEBUG, "%s<%s>", indent, el);
+ ++crp->tag_nesting_level;
+ indent[0] = 0;
+ for (i=0; i<crp->tag_nesting_level; ++i) {
+ strcat(indent, " ");
+ }
for (i = 0; attr[i] != NULL; i += 2) {
- syslog(LOG_DEBUG, " Attribute '%s' = '%s'", attr[i], attr[i + 1]);
+ syslog(LOG_DEBUG, "%sAttribute '%s' = '%s'", indent, attr[i], attr[i + 1]);
}
+ // end logging
+#endif
// RFC4791 7.8 "calendar-query" REPORT - Client will send a lot of search criteria.
if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:calendar-query")) {
crp->report_type = cr_freebusy_query;
}
- ++crp->tag_nesting_level;
+ // RFC4791 9.7 create a filter array if this query contains a "CALDAV:filter" stanza
+ else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:filter")) {
+ crp->filters = array_new(SIZ);
+ }
+
+ // RFC4791 9.7.1 CALDAV:comp-filter XML Element
+ else if ( (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:comp-filter"))
+ && (crp->filters)
+ && (attr[0])
+ && (attr[1])
+ ) {
+ char newfilter[SIZ];
+ snprintf(newfilter, SIZ, "comp-filter|%s|%s", attr[0], attr[1]);
+ array_append(crp->filters, newfilter);
+ syslog(LOG_DEBUG, "%s", newfilter);
+ }
+
+ // RFC4791 9.7.2 CALDAV:prop-filter XML Element
+ else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:prop-filter")) {
+ if (crp->filters) {
+ char newfilter[SIZ];
+ snprintf(newfilter, SIZ, "hi there");
+ array_append(crp->filters, newfilter);
+ }
+ }
+
+ // RFC4791 9.7.3 CALDAV:param-filter XML Element
+ else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:param-filter")) {
+ if (crp->filters) {
+ char newfilter[SIZ];
+ snprintf(newfilter, SIZ, "hi there");
+ array_append(crp->filters, newfilter);
+ }
+ }
+
+ // RFC4791 9.7.4 CALDAV:is-not-defined XML Element
+ else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:is-not-defined")) {
+ if (crp->filters) {
+ char newfilter[SIZ];
+ snprintf(newfilter, SIZ, "hi there");
+ array_append(crp->filters, newfilter);
+ }
+ }
+
+ // RFC4791 9.7.5 CALDAV:text-match XML Element
+ else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:text-match")) {
+ if (crp->filters) {
+ char newfilter[SIZ];
+ snprintf(newfilter, SIZ, "hi there");
+ array_append(crp->filters, newfilter);
+ }
+ }
}
// XML parser callback
void caldav_xml_end(void *data, const char *el) {
- struct cr_parms *crp = (struct cr_parms *) data;
+ struct cr_params *crp = (struct cr_params *) data;
+
--crp->tag_nesting_level;
- if (crp->Chardata != NULL) {
- // syslog(LOG_DEBUG, "CALDAV CHARDATA : %s", ChrPtr(crp->Chardata));
+#ifdef DEBUG_XML_PARSE
+ // logging
+ int i;
+ char indent[256];
+ indent[0] = 0;
+ for (i=0; i<crp->tag_nesting_level; ++i) {
+ strcat(indent, " ");
}
- // syslog(LOG_DEBUG, "CALDAV ELEMENT END : <%s> %d", el, crp->tag_nesting_level);
+ syslog(LOG_DEBUG, "%s</%s>", indent, el);
+ // end logging
+#endif
if ((!strcasecmp(el, "DAV::href")) || (!strcasecmp(el, "DAV:href"))) {
if (crp->Hrefs == NULL) { // append crp->Chardata to crp->Hrefs
// XML parser callback
-void caldav_xml_chardata(void *data, const XML_Char * s, int len) {
- struct cr_parms *crp = (struct cr_parms *) data;
+void caldav_xml_chardata(void *data, const XML_Char *s, int len) {
+ struct cr_params *crp = (struct cr_params *) data;
+
+ char *app = malloc(len+1);
+ if (!app) {
+ return;
+ }
+ memcpy(app, s, len);
+ app[len] = 0;
if (crp->Chardata == NULL) {
crp->Chardata = NewStrBuf();
}
- StrBufAppendBufPlain(crp->Chardata, s, len, 0);
+ StrBufAppendBufPlain(crp->Chardata, app, len, 0);
+
+#ifdef DEBUG_XML_PARSE
+ // logging
+ string_trim(app); // remove leading/trailing whitespace. ok to mangle it because we've already appended.
+ if (!IsEmptyStr(app)) {
+ int i;
+ char indent[256];
+ indent[0] = 0;
+ for (i=0; i<crp->tag_nesting_level; ++i) {
+ strcat(indent, " ");
+ }
+ syslog(LOG_DEBUG, "%s%s", indent, app, len);
+ }
+ // end logging
+#endif
+ free(app);
return;
}
}
+void caldav_apply_filter(struct cr_params *crp, char *xml_body, long xml_length) {
+ TRACE;
+}
+
+
// Called by report_the_room_itself() in room_functions.c when a CalDAV REPORT method
// is requested on a calendar room. We fire up an XML Parser to decode the request and
// hopefully produce the correct output.
void caldav_report(struct http_transaction *h, struct ctdlsession *c) {
- struct cr_parms crp;
+ struct cr_params crp;
char buf[1024];
- memset(&crp, 0, sizeof(struct cr_parms));
+ memset(&crp, 0, sizeof(struct cr_params));
XML_Parser xp = XML_ParserCreateNS("UTF-8", ':');
if (xp == NULL) {
StrBuf *one_item = fetch_ical(c, m);
icalcomponent *cal = icalcomponent_new_from_string(ChrPtr(one_item));
- // qualify will be set to nonzero if this calendar item is a match for the QUERY.
- int qualify = 0;
+ // Does this calendar item qualify for output?
+ int qualify = 1;
- // this is a horrible temporary hack to output every item (for now)
- qualify = 1;
+ // FIXME put filters here
+ if (crp.filters) {
+ // apply the filters
+ }
// Did this calendar item match the query? If so, output it.
if (qualify) {
FreeStrBuf(&crp.Hrefs);
crp.Hrefs = NULL;
}
+ if (crp.filters) {
+ array_free(crp.filters);
+ crp.filters = NULL;
+ }
StrBufAppendPrintf(ReportOut, "</D:multistatus>\n"); // End the REPORT.
projects / citadel.git / blobdiff