append.c: add username and accountId to annotator dlist

cyrusimap · Sep 18, 2024 · bb39157 · bb39157
1 parent c75865d
commit bb39157
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/imap/append.c b/imap/append.c
@@ -595,6 +595,8 @@ static int callout_run_executable(const char *callout,
  */
 static void callout_encode_args(struct buf *args,
                                 const char *fname,
+                                const char *username,
+                                const char *accountid,
                                 const struct body *body,
                                 struct entryattlist *annotations,
                                 strarray_t *flags)
@@ -607,6 +609,12 @@ static void callout_encode_args(struct buf *args,
     buf_printf(args, "FILENAME ");
     message_write_nstring(args, fname);
 
+    buf_printf(args, " USERNAME ");
+    message_write_nstring(args, username);
+
+    buf_printf(args, " ACCOUNTID ");
+    message_write_nstring(args, accountid);
+
     buf_printf(args, " ANNOTATIONS (");
     for (ee = annotations ; ee ; ee = ee->next) {
         struct attvaluelist *av;
@@ -742,6 +750,8 @@ static void callout_decode_results(const char *callout,
 }
 
 static int callout_run(const char *fname,
+                       const char *username,
+                       const char *accountid,
                        const struct body *body,
                        struct entryattlist **user_annots,
                        struct entryattlist **system_annots,
@@ -757,7 +767,8 @@ static int callout_run(const char *fname,
     assert(callout);
     assert(flags);
 
-    callout_encode_args(&args, fname, body, *user_annots, flags);
+    callout_encode_args(&args, fname, username, accountid,
+                        body, *user_annots, flags);
 
     if (stat(callout, &sb) < 0) {
         syslog(LOG_ERR, "cannot stat annotation_callout %s: %m", callout);
@@ -1108,11 +1119,16 @@ EXPORTED int append_fromstage_full(struct appendstate *as, struct body **body,
     }
 
     if (config_getstring(IMAPOPT_ANNOTATION_CALLOUT)) {
+        char *owner = mboxname_to_userid(mailbox_name(as->mailbox));
+        const char *userid = as->userid;
+
         if (flags)
             newflags = strarray_dup(flags);
         else
             newflags = strarray_new();
-        r = callout_run(fname, *body, &user_annots, &system_annots, newflags);
+        r = callout_run(fname, userid, owner,
+                        *body, &user_annots, &system_annots, newflags);
+        free(owner);
         if (r) {
             syslog(LOG_ERR, "Annotation callout failed, ignoring");
             r = 0;
@@ -1374,7 +1390,11 @@ HIDDEN int append_run_annotator(struct appendstate *as,
     fclose(f);
     f = NULL;
 
-    r = callout_run(fname, body, &user_annots, &system_annots, flags);
+    char *owner = mboxname_to_userid(mailbox_name(as->mailbox));
+    const char *userid = as->userid;
+    r = callout_run(fname, userid, owner,
+                    body, &user_annots, &system_annots, flags);
+    free(owner);
     if (r) goto out;
 
     /* Reset system flags */