WIP: iTIP with URL (percent) encoded addresses

imap/calsched_support.c

@@ -158,7 +158,9 @@ EXPORTED void get_schedule_addresses(const char *mboxname,
         for (i = 0; i < strarray_size(&caluseraddr.uris); i++) {
             const char *item = strarray_nth(&caluseraddr.uris, i);
             if (!strncasecmp(item, "mailto:", 7)) item += 7;
-            strarray_add(addresses, item);
+
+            char *addr = xmlURIUnescapeString(item, strlen(item), NULL);
+            strarray_addm(addresses, addr);
         }
     }
     else if (strchr(userid, '@')) {

imap/ical_support.c

@@ -46,6 +46,7 @@
 #include <string.h>
 #include <sysexits.h>
 #include <syslog.h>
+#include <libxml/uri.h>
 
 #include "assert.h"
 #include "bsearch.h"
@@ -1184,6 +1185,19 @@ EXPORTED const char *icalproperty_get_invitee(icalproperty *prop)
     return recip;
 }
 
+EXPORTED char *icalproperty_get_decoded_participant(icalproperty *prop)
+{
+    const char *addr;
+
+    if (icalproperty_isa(prop) == ICAL_ORGANIZER_PROPERTY)
+        addr = icalproperty_get_organizer(prop);
+    else
+        addr = icalproperty_get_attendee(prop);
+
+    if (!strncasecmp(addr, "mailto:", 7)) addr += 7;
+
+    return xmlURIUnescapeString(addr, strlen(addr), NULL);
+}
 
 EXPORTED icaltimetype
 icalcomponent_get_recurrenceid_with_zone(icalcomponent *comp)

imap/ical_support.h

@@ -175,6 +175,7 @@ extern void icalcomponent_remove_invitee(icalcomponent *comp,
 extern icalproperty *icalcomponent_get_first_invitee(icalcomponent *comp);
 extern icalproperty *icalcomponent_get_next_invitee(icalcomponent *comp);
 extern const char *icalproperty_get_invitee(icalproperty *prop);
+extern char *icalproperty_get_decoded_participant(icalproperty *prop);
 
 extern icaltimetype icalcomponent_get_recurrenceid_with_zone(icalcomponent *c);
 

imap/jmap_calendar.c

@@ -4148,9 +4148,8 @@ static int setcalendarevents_schedule(const char *sched_userid,
         icalcomponent_get_first_property(comp, ICAL_ORGANIZER_PROPERTY);
     if (!prop) goto done;
 
-    const char *organizer = icalproperty_get_organizer(prop);
+    char *organizer = icalproperty_get_decoded_participant(prop);
     if (!organizer) goto done;
-    if (!strncasecmp(organizer, "mailto:", 7)) organizer += 7;
     if (organizer &&
             /* XXX Hack for Outlook */ icalcomponent_get_first_invitee(comp)) {
 
@@ -4182,6 +4181,7 @@ static int setcalendarevents_schedule(const char *sched_userid,
                             oldical, newical, SCHED_MECH_JMAP_SET);
         }
     }
+    free(organizer);
 
 done:
     if (oldical) icalcomponent_free(oldical);

lib/strarray.c

@@ -172,9 +172,15 @@ EXPORTED void strarray_cat(strarray_t *dest, const strarray_t *src)
 }
 
 EXPORTED int strarray_add(strarray_t *sa, const char *s)
+{
+    return strarray_addm(sa, xstrdupnull(s));
+}
+
+EXPORTED int strarray_addm(strarray_t *sa, char *s)
 {
     int pos = strarray_find(sa, s, 0);
-    if (pos < 0) pos = strarray_append(sa, s);
+    if (pos < 0) pos = strarray_appendm(sa, s);
+    else free(s);
     return pos;
 }
 

lib/strarray.h

@@ -69,6 +69,7 @@ void strarray_free(strarray_t *);
 
 int strarray_append(strarray_t *, const char *);
 int strarray_add(strarray_t *, const char *);
+int strarray_addm(strarray_t *sa, char *s);
 int strarray_add_case(strarray_t *, const char *);
 int strarray_appendm(strarray_t *, char *);
 void strarray_set(strarray_t *, int idx, const char *);