X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fserver%2Fcaldav_reports.c;h=22c90fea62ba981fffdc9b4e54b077e952db0e74;hb=a88a550cf8b88924645686b5c2fea78c4e0bcb66;hp=e2a4e081f214390f872a81283d02c3d70010f529;hpb=8a7c7e5bd5d65ec34b665579b1577be51fdde285;p=citadel.git diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index e2a4e081f..22c90fea6 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -4,6 +4,8 @@ #include "webcit.h" +#define CAL "urn:ietf:params:xml:ns:caldav:" // Shorthand for the XML namespace of CalDAV +#define CALLEN sizeof(CAL)-1 // And the length of that string // A CalDAV REPORT can only be one type. This is stored in the report_type member. enum cr_type { @@ -16,70 +18,94 @@ enum cr_type { // 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 { - int tag_nesting_level; // not needed, just kept for pretty-printing +struct cr_params { + int comp_filter_nesting_level; 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 + int filter_nest; // tag nesting level where a FILTER stanza begins }; // XML parser callback void caldav_xml_start(void *data, const char *el, const char **attr) { - struct cr_parms *crp = (struct cr_parms *) data; + struct cr_params *crp = (struct cr_params *) data; #ifdef DEBUG_XML_PARSE // logging - int i; - char indent[256]; - indent[0] = 0; - for (i=0; itag_nesting_level; ++i) { - strcat(indent, "··"); - } - syslog(LOG_DEBUG, "%s<%s>", indent, el); - for (i = 0; attr[i] != NULL; i += 2) { - syslog(LOG_DEBUG, "%sAttribute '%s' = '%s'", indent, attr[i], attr[i + 1]); + syslog(LOG_DEBUG, "<%s>", el); + for (int i = 0; attr[i] != NULL; i += 2) { + syslog(LOG_DEBUG, "Attribute '%s' = '%s'", 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")) { + if (!strcasecmp(el, CAL"calendar-query")) { crp->report_type = cr_calendar_query; } // RFC4791 7.9 "calendar-multiget" REPORT - Client will supply a list of specific hrefs. - else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:calendar-multiget")) { + else if (!strcasecmp(el, CAL"calendar-multiget")) { crp->report_type = cr_calendar_multiget; } // RFC4791 7.10 "free-busy-query" REPORT - else if (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:free-busy-query")) { + else if (!strcasecmp(el, CAL"free-busy-query")) { crp->report_type = cr_freebusy_query; } - ++crp->tag_nesting_level; + // RFC4791 9.7 create a filter array if this query contains a "filter" stanza + else if (!strcasecmp(el, CAL"filter")) { + crp->filters = array_new(SIZ); + crp->filter_nest = crp->comp_filter_nesting_level; + } + + // Handle the filters defined in RFC4791 9.7.1 through 9.7.5 + else if ( ( (!strcasecmp(el, CAL"comp-filter")) + || (!strcasecmp(el, CAL"prop-filter")) + || (!strcasecmp(el, CAL"param-filter")) + || (!strcasecmp(el, CAL"is-not-defined")) + || (!strcasecmp(el, CAL"text-match")) + || (!strcasecmp(el, CAL"time-range")) + ) + && (crp->filters) // Make sure we actually allocated an array + ) { + + if (!strcasecmp(el, CAL"comp-filter")) { + ++crp->comp_filter_nesting_level; + } + + char newfilter[SIZ]; + int a = 0; + int len = snprintf(newfilter, SIZ, "%d|", crp->comp_filter_nesting_level - crp->filter_nest - 1); + len += snprintf(&newfilter[len], SIZ-len, "%s", &el[CALLEN]); // filter name without the namespace + while (attr[a]) { + len += snprintf(&newfilter[len], SIZ-len, "|%s", attr[a++]); // now save the attributes + } + 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; - - --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; itag_nesting_level; ++i) { - strcat(indent, "··"); - } - syslog(LOG_DEBUG, "%s", indent, el); + syslog(LOG_DEBUG, "", el); // end logging #endif + if (!strcasecmp(el, CAL"comp-filter")) { + --crp->comp_filter_nesting_level; + } + + if ((!strcasecmp(el, "DAV::href")) || (!strcasecmp(el, "DAV:href"))) { if (crp->Hrefs == NULL) { // append crp->Chardata to crp->Hrefs crp->Hrefs = NewStrBuf(); @@ -99,7 +125,7 @@ void caldav_xml_end(void *data, const char *el) { // XML parser callback void caldav_xml_chardata(void *data, const XML_Char *s, int len) { - struct cr_parms *crp = (struct cr_parms *) data; + struct cr_params *crp = (struct cr_params *) data; char *app = malloc(len+1); if (!app) { @@ -108,27 +134,23 @@ void caldav_xml_chardata(void *data, const XML_Char *s, int len) { memcpy(app, s, len); app[len] = 0; + if (crp->Chardata == NULL) { + crp->Chardata = NewStrBuf(); + } + + StrBufAppendBufPlain(crp->Chardata, app, len, 0); + #ifdef DEBUG_XML_PARSE // logging - int i; - char indent[256]; - indent[0] = 0; - for (i=0; itag_nesting_level; ++i) { - strcat(indent, "··"); + string_trim(app); // remove leading/trailing whitespace. ok to mangle it because we've already appended. + if (!IsEmptyStr(app)) { + int i; + syslog(LOG_DEBUG, "%s", app, len); } - syslog(LOG_DEBUG, "%s%s", indent, app); // end logging #endif - - if (crp->Chardata == NULL) { - crp->Chardata = NewStrBuf(); - } - - //StrBufAppendBufPlain(crp->Chardata, s, len, 0); - StrBufAppendBufPlain(crp->Chardata, app, len, 0); free(app); - return; } @@ -235,14 +257,188 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S } +// Compare function for "time-range" tests (RFC4791 section 9.9) +// Returns nonzero if the supplied icalcomponent occurs within the specified time range +int caldav_time_range_filter_matches(icalcomponent *supplied_cal, char *start_str, char *end_str) { + + struct icaltimetype start = (start_str ? icaltime_from_string(start_str) : icaltime_null_time()); + struct icaltimetype end = (end_str ? icaltime_from_string(end_str) : icaltime_null_time()); + + // make a local copy of the component because we are going to modify it by converting times to UTC + icalcomponent *cal = icalcomponent_new_clone(supplied_cal); + ical_dezonify(cal); + + syslog(LOG_DEBUG, "\033[7mcaldav_time_range_filter_matches()\033[0m : Does this %s fall between %s and %s ?", + icalcomponent_kind_to_string(icalcomponent_isa(cal)), + start_str, + end_str + ); + + syslog(LOG_DEBUG, "Well, here it is:"); + syslog(LOG_DEBUG, "\033[35m%s\033[0m", icalcomponent_as_ical_string_r(cal)); + + icaltimetype dts = icalcomponent_get_dtstart(cal); + syslog(LOG_DEBUG, "component start: \033[36m%s\033[0m", icaltime_as_ical_string_r(dts)); + + icaltimetype dte = icalcomponent_get_dtend(cal); + syslog(LOG_DEBUG, "component end: \033[36m%s\033[0m", icaltime_as_ical_string_r(dte)); + + icalcomponent_free(cal); + return(0); // FIXME reject everything for now +} + + +// Recursive function to apply CalDAV FILTERS to a calendar item. +// Returns zero if the calendar item was disqualified by a filter, nonzero if the calendar item still qualifies. +int caldav_apply_filters(void *cal, Array *filters, int apply_at_level) { + + int f = 0; // filter number iterator + int qual = 1; // 0 for disqualify, 1 for qualify + int previous_level = -1; + int disregard_further_comp_filters = 0; + + while ( (f", f, this_rule_level, array_get_element_at(filters, f) ); + + // Handle the individual filters defined in RFC4791 9.7.1 through 9.7.5 + + if (apply_at_level < previous_level) { + syslog(LOG_DEBUG, "caldav: walking back down"); + return(qual); + } + + else if (this_rule_level != apply_at_level) { + syslog(LOG_DEBUG, "caldav: apply_at_level=%d, this_rule_level=%d, skipping this rule", apply_at_level, this_rule_level); + } + + else if ( (!strcasecmp(t[1], "comp-filter")) // RFC4791 9.7.1 - filter by component + && (!disregard_further_comp_filters) // one is enough to succeed + ) { + syslog(LOG_DEBUG, "component filter at level %d", this_rule_level); + + // comp-filter requires exactly one parameter (name="VXXXX") + if (num_tokens < 4) { + syslog(LOG_DEBUG, "caldav: comp-filter has no parameters - rejecting"); + return(0); + } + + // Root element is NOT a component, but the root filter is "comp-filter" -- reject! + if ( (!icalcomponent_isa_component(cal)) && (this_rule_level == 0) ) { + syslog(LOG_DEBUG, "caldav: root element is not a component, rejecting"); + return(0); + } + + // Current element is a component and the filter is "comp-filter" -- see if it matches the requested type + if ( (icalcomponent_isa_component(cal)) + && (!strcasecmp(t[2], "name")) + ) { + if (icalcomponent_isa(cal) == icalcomponent_string_to_kind(t[3]) ) { + syslog(LOG_DEBUG, "caldav: component at level %d is <%s>, looking for <%s>, recursing...", + apply_at_level, + icalcomponent_kind_to_string(icalcomponent_isa(cal)), t[3] + ); + + // We have a match. Drill down into the subcomponents. + + icalcomponent *c = NULL; + int number_of_subcomponents = 0; + int number_of_matches = 0; + for ( c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); + (c != 0); + c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT) + ) { + ++number_of_subcomponents; + if (caldav_apply_filters(c, filters, apply_at_level+1)) { + syslog(LOG_DEBUG, "Subcomponent %d might match", number_of_subcomponents); + ++number_of_matches; + } + } + if (number_of_matches > 0) { // something matched + qual = 1; + disregard_further_comp_filters = 1; + + } + else if (number_of_subcomponents > 0) { // nothing matched + return(0); // but only fail if there *were* subcomponents. + } + + } + else { + syslog(LOG_DEBUG, "caldav: component at level %d is <%s>, looking for <%s>, rejecting", + apply_at_level, + icalcomponent_kind_to_string(icalcomponent_isa(cal)), + t[3] + ); + return(0); + } + } + + } + + else if (!strcasecmp(t[1], "prop-filter")) { // RFC4791 9.7.2 - filter by property + syslog(LOG_DEBUG, "property filter at level %d FIXME not implemented yet", this_rule_level); + } + + else if (!strcasecmp(t[1], "param-filter")) { // RFC4791 9.7.3 - filter by parameter + syslog(LOG_DEBUG, "parameter filter at level %d FIXME not implemented yet", this_rule_level); + } + + else if (!strcasecmp(t[1], "is-not-defined")) { // RFC4791 9.7.4 + syslog(LOG_DEBUG, "is-not-defined filter at level %d FIXME not implemented yet", this_rule_level); + } + + else if (!strcasecmp(t[1], "text-match")) { // RFC4791 9.7.5 + syslog(LOG_DEBUG, "text match filter at level %d FIXME not implemented yet", this_rule_level); + } + + else if (!strcasecmp(t[1], "time-range")) { // RFC4791 9.9 + syslog(LOG_DEBUG, "time range filter at level %d FIXME not implemented yet", this_rule_level); + for (int i=2; (i+1)\n"); // End the REPORT.