#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 {
// 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_params {
- int tag_nesting_level; // not needed, just kept for pretty-printing
+ 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
};
#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, "%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;
}
- // 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")) {
+ // 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, "urn:ietf:params:xml:ns:caldav:comp-filter"))
- || (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:prop-filter"))
- || (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:param-filter"))
- || (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:is-not-defined"))
- || (!strcasecmp(el, "urn:ietf:params:xml:ns:caldav:text-match"))
+ 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, &el[23]); // strip off "urn:ietf:params:xml:ns:caldav:" for our purposes
+ 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);
- syslog(LOG_DEBUG, "%s", newfilter);
}
}
void caldav_xml_end(void *data, const char *el) {
struct cr_params *crp = (struct cr_params *) data;
- --crp->tag_nesting_level;
-
#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);
+ syslog(LOG_DEBUG, "</%s>", 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();
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);
+ syslog(LOG_DEBUG, "%s", app, len);
}
// end logging
#endif
}
-// Called by caldav_apply_filters() to apply ONE filter.
-// Returns 0 if the calendar item does not match the filter.
-// Returns 1 if the calendar item DOES match the filter.
-int caldav_apply_one_filter(void *cal, char *filter) {
- syslog(LOG_DEBUG, "applying filter: %s", filter);
- return(1);
+// 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 *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());
+
+ 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));
+
+ return(0); // 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 index) {
+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<array_len(filters)) && (qual) ) {
+
+ // Tokenize the filter (a future performance hack would be to pre-tokenize instead of storing delimited strings)
+ char this_filter[SIZ];
+ safestrncpy(this_filter, array_get_element_at(filters, f), sizeof(this_filter));
+ char *t[10] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } ;
+ char *ft = this_filter;
+ int num_tokens = 0;
+ while ( (t[num_tokens]=strtok_r(ft, "|", &ft)) && (num_tokens<10) ) {
+ ++num_tokens;
+ }
+ int this_rule_level = atoi(t[0]);
+ syslog(LOG_DEBUG, "caldav_apply_filters() filter=%d, level=%d, <%s>", f, this_rule_level, array_get_element_at(filters, f) );
- // Apply *this* filter.
- if (caldav_apply_one_filter(cal, array_get_element_at(filters, index)) == 0) {
- return(0);
- }
+ // 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)<num_tokens; i+=2) {
+ char *tr_start = NULL;
+ char *tr_end = NULL;
+ if (!strcasecmp(t[i], "start")) {
+ tr_start = t[i+1];
+ }
+ else if (!strcasecmp(t[i], "end")) {
+ tr_end = t[i+1];
+ }
+ if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
+ syslog(LOG_DEBUG, "time range matches");
+ }
+ else {
+ syslog(LOG_DEBUG, "time range does not match -- rejecting");
+ qual = 0;
+ }
+ }
+ }
- // If we get to this point, the current filter has passed, and we move on to the next one.
- if (index < array_len(filters)-1) {
- return(caldav_apply_filters(cal, filters, index+1));
+ ++f;
}
- // If we got this far, every filter passed, and the calendar item qualifies for output.
- return(1);
+ syslog(LOG_DEBUG, "caldav: we reached the end of level %d , returning %d", apply_at_level, qual);
+ return(qual);
}
int qualify = 1;
// If there was a filter stanza, run this calendar item through the filters.
+ syslog(LOG_DEBUG, "Evaluating message \033[33m%ld\033[0m...", m);
qualify = caldav_apply_filters(cal, crp.filters, 0);
- syslog(LOG_DEBUG, "Message %ld does%s qualify", m, (qualify ? "" : " NOT"));
+ syslog(LOG_DEBUG, "Message %ld %s\033[0m qualify", m, (qualify ? "\033[32mDOES" : "\033[31mDOES NOT"));
+ syslog(LOG_DEBUG, "");
// Did this calendar item match the query? If so, output it.
if (qualify) {
projects / citadel.git / blobdiff