From 79f93acf79a15a6a5f8472129372d8a8a53128dd Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 27 Sep 2005 04:18:46 +0000 Subject: [PATCH] * Auto-add *recipient* addresses to Contacts. This is done asynchronously because we do have to scan the address book to make sure we don't already have the address recorded. --- citadel/ChangeLog | 6 ++ citadel/msgbase.c | 81 ++------------- citadel/msgbase.h | 11 ++ citadel/serv_vcard.c | 236 +++++++++++++++++++++++++++++++++++-------- citadel/server.h | 1 + 5 files changed, 221 insertions(+), 114 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index ea0dd39f9..8af68336b 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,9 @@ $Log$ +Revision 655.17 2005/09/27 04:18:45 ajc +* Auto-add *recipient* addresses to Contacts. This is done asynchronously + because we do have to scan the address book to make sure we don't + already have the address recorded. + Revision 655.16 2005/09/26 21:46:08 ajc * Attempt to save *outgoing* email addresses to the address book. @@ -7175,3 +7180,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/msgbase.c b/citadel/msgbase.c index fa73421af..5908133c9 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -55,7 +55,7 @@ #include "vcard.h" long config_msgnum; - +struct addresses_to_be_filed *atbf = NULL; /* * This really belongs in serv_network.c, but I don't know how to export @@ -2047,38 +2047,6 @@ int ReplicationChecks(struct CtdlMessage *msg) { -/* - * Turn an arbitrary RFC822 address into a struct vCard for possible - * inclusion into an address book. - */ -struct vCard *vcard_new_from_rfc822_addr(char *addr) { - struct vCard *v; - char user[256], node[256], name[256], email[256], n[256], uid[256]; - int i; - - v = vcard_new(); - if (v == NULL) return(NULL); - - process_rfc822_addr(addr, user, node, name); - vcard_set_prop(v, "fn", name, 0); - - vcard_fn_to_n(n, name, sizeof n); - vcard_set_prop(v, "n", n, 0); - - snprintf(email, sizeof email, "%s@%s", user, node); - vcard_set_prop(v, "email;internet", email, 0); - - snprintf(uid, sizeof uid, "collected: %s %s@%s", name, user, node); - for (i=0; ilogged_in) && (recps != NULL) ) { collected_addresses = harvest_collected_addresses(msg); } if (collected_addresses != NULL) { - for (i=0; icm_magic = CTDLMESSAGE_MAGIC; - vmsg->cm_anon_type = MES_NORMAL; - vmsg->cm_format_type = FMT_RFC822; - vmsg->cm_fields['A'] = strdup("Citadel"); - vmsg->cm_fields['E'] = strdup(vcard_get_prop(v, "UID", 0, 0, 0)); - ser = vcard_serialize(v); - if (ser != NULL) { - vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024); - sprintf(vmsg->cm_fields['M'], - "Content-type: text/x-vcard" - "\r\n\r\n%s\r\n", ser); - free(ser); - } - vcard_free(v); - - lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient); - MailboxName(actual_rm, sizeof actual_rm, &CC->user, USERCONTACTSROOM); - vmsgnum = CtdlSubmitMsg(vmsg, NULL, actual_rm); - CtdlFreeMessage(vmsg); - } - } - free(collected_addresses); + begin_critical_section(S_ATBF); + aptr = (struct addresses_to_be_filed *) malloc(sizeof(struct addresses_to_be_filed)); + aptr->next = atbf; + MailboxName(actual_rm, sizeof actual_rm, &CC->user, USERCONTACTSROOM); + aptr->roomname = strdup(actual_rm); + aptr->collected_addresses = collected_addresses; + atbf = aptr; + end_critical_section(S_ATBF); } return(newmsgid); } diff --git a/citadel/msgbase.h b/citadel/msgbase.h index 6269f6c33..ad232cf05 100644 --- a/citadel/msgbase.h +++ b/citadel/msgbase.h @@ -66,7 +66,18 @@ struct recptypes { char display_recp[SIZ]; }; +/* + * This is a list of "harvested" email addresses that we might want to + * stick into someone's address book. But we defer this operaiton so + * it can be done asynchronously. + */ +struct addresses_to_be_filed { + struct addresses_to_be_filed *next; + char *roomname; + char *collected_addresses; +}; +extern struct addresses_to_be_filed *atbf; int alias (char *name); void get_mm (void); diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c index a586fdfe3..86e5afd3d 100644 --- a/citadel/serv_vcard.c +++ b/citadel/serv_vcard.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #if TIME_WITH_SYS_TIME @@ -170,27 +171,27 @@ void vcard_add_to_directory(long msgnum, void *data) { * Initialize Global Adress Book */ void cmd_igab(char *argbuf) { - char hold_rm[ROOMNAMELEN]; + char hold_rm[ROOMNAMELEN]; if (CtdlAccessCheck(ac_aide)) return; - strcpy(hold_rm, CC->room.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) { - getroom(&CC->room, hold_rm); + if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) { + getroom(&CC->room, hold_rm); cprintf("%d cannot get address book room\n", ERROR + ROOM_NOT_FOUND); return; - } + } /* Empty the existing database first. */ CtdlDirectoryInit(); - /* We want *all* vCards in this room */ - CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard", + /* We want *all* vCards in this room */ + CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard", NULL, vcard_add_to_directory, NULL); - getroom(&CC->room, hold_rm); /* return to saved room */ + getroom(&CC->room, hold_rm); /* return to saved room */ cprintf("%d Directory has been rebuilt.\n", CIT_OK); } @@ -353,8 +354,8 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { /* Enforce local UID policy if applicable */ if (yes_my_citadel_config) { - snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, - msg->cm_fields['A'], NODENAME); + snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, + msg->cm_fields['A'], NODENAME); vcard_set_prop(v, "UID", buf, 0); } @@ -363,7 +364,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { */ if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']); s = vcard_get_prop(v, "UID", 0, 0, 0); - if (s != NULL) { + if (s != NULL) { msg->cm_fields['E'] = strdup(s); if (msg->cm_fields['U'] == NULL) { msg->cm_fields['U'] = strdup(s); @@ -498,25 +499,25 @@ void vcard_gu_backend(long supplied_msgnum, void *userdata) { * and return an empty vCard. */ struct vCard *vcard_get_user(struct ctdluser *u) { - char hold_rm[ROOMNAMELEN]; - char config_rm[ROOMNAMELEN]; + char hold_rm[ROOMNAMELEN]; + char config_rm[ROOMNAMELEN]; struct CtdlMessage *msg; struct vCard *v; long VCmsgnum; - strcpy(hold_rm, CC->room.QRname); /* save current room */ - MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM); + strcpy(hold_rm, CC->room.QRname); /* save current room */ + MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM); - if (getroom(&CC->room, config_rm) != 0) { - getroom(&CC->room, hold_rm); - return vcard_new(); - } + if (getroom(&CC->room, config_rm) != 0) { + getroom(&CC->room, hold_rm); + return vcard_new(); + } - /* We want the last (and probably only) vcard in this room */ + /* We want the last (and probably only) vcard in this room */ VCmsgnum = (-1); - CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard", + CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard", NULL, vcard_gu_backend, (void *)&VCmsgnum ); - getroom(&CC->room, hold_rm); /* return to saved room */ + getroom(&CC->room, hold_rm); /* return to saved room */ if (VCmsgnum < 0L) return vcard_new(); @@ -536,30 +537,30 @@ struct vCard *vcard_get_user(struct ctdluser *u) { * Write our config to disk */ void vcard_write_user(struct ctdluser *u, struct vCard *v) { - char temp[PATH_MAX]; - FILE *fp; + char temp[PATH_MAX]; + FILE *fp; char *ser; - strcpy(temp, tmpnam(NULL)); + strcpy(temp, tmpnam(NULL)); ser = vcard_serialize(v); - fp = fopen(temp, "w"); - if (fp == NULL) return; + fp = fopen(temp, "w"); + if (fp == NULL) return; if (ser == NULL) { fprintf(fp, "begin:vcard\r\nend:vcard\r\n"); } else { fwrite(ser, strlen(ser), 1, fp); free(ser); } - fclose(fp); + fclose(fp); - /* This handy API function does all the work for us. + /* This handy API function does all the work for us. * NOTE: normally we would want to set that last argument to 1, to * force the system to delete the user's old vCard. But it doesn't * have to, because the vcard_upload_beforesave() hook above * is going to notice what we're trying to do, and delete the old vCard. */ - CtdlWriteObject(USERCONFIGROOM, /* which room */ + CtdlWriteObject(USERCONFIGROOM, /* which room */ "text/x-vcard", /* MIME type */ temp, /* temp file */ u, /* which user */ @@ -567,7 +568,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) { 0, /* don't delete others of this type */ 0); /* no flags */ - unlink(temp); + unlink(temp); } @@ -721,7 +722,7 @@ void vcard_newuser(struct ctdluser *usbuf) { lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname); /* Create and save the vCard */ - v = vcard_new(); + v = vcard_new(); if (v == NULL) return; sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn); for (i=0; icm_magic = CTDLMESSAGE_MAGIC; - msg->cm_anon_type = MES_NORMAL; - msg->cm_format_type = 0; - msg->cm_fields['A'] = strdup(usbuf->fullname); - msg->cm_fields['O'] = strdup(ADDRESS_BOOK_ROOM); - msg->cm_fields['N'] = strdup(NODENAME); - msg->cm_fields['M'] = strdup("Purge this vCard\n"); + msg->cm_magic = CTDLMESSAGE_MAGIC; + msg->cm_anon_type = MES_NORMAL; + msg->cm_format_type = 0; + msg->cm_fields['A'] = strdup(usbuf->fullname); + msg->cm_fields['O'] = strdup(ADDRESS_BOOK_ROOM); + msg->cm_fields['N'] = strdup(NODENAME); + msg->cm_fields['M'] = strdup("Purge this vCard\n"); - snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, + snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME); - msg->cm_fields['E'] = strdup(buf); + msg->cm_fields['E'] = strdup(buf); msg->cm_fields['S'] = strdup("CANCEL"); - CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM); - CtdlFreeMessage(msg); + CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM); + CtdlFreeMessage(msg); } @@ -915,6 +916,154 @@ void vcard_session_login_hook(void) { } +/* + * Turn an arbitrary RFC822 address into a struct vCard for possible + * inclusion into an address book. + */ +struct vCard *vcard_new_from_rfc822_addr(char *addr) { + struct vCard *v; + char user[256], node[256], name[256], email[256], n[256], uid[256]; + int i; + + v = vcard_new(); + if (v == NULL) return(NULL); + + process_rfc822_addr(addr, user, node, name); + vcard_set_prop(v, "fn", name, 0); + + vcard_fn_to_n(n, name, sizeof n); + vcard_set_prop(v, "n", n, 0); + + snprintf(email, sizeof email, "%s@%s", user, node); + vcard_set_prop(v, "email;internet", email, 0); + + snprintf(uid, sizeof uid, "collected: %s %s@%s", name, user, node); + for (i=0; icm_fields['M']); + CtdlFreeMessage(msg); + + i = 0; + while (value = vcard_get_prop(v, "email", 1, i++, 0), value != NULL) { + + for (j=0; jroomname, 0, 0, NULL, NULL); + CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard", NULL, + strip_addresses_already_have, aptr->collected_addresses); + + if (strlen(aptr->collected_addresses) > 0) + for (i=0; icollected_addresses, ','); ++i) { + + /* Make a vCard out of each address */ + extract_token(recipient, aptr->collected_addresses, i, ',', sizeof recipient); + striplt(recipient); + v = vcard_new_from_rfc822_addr(recipient); + if (v != NULL) { + vmsg = malloc(sizeof(struct CtdlMessage)); + memset(vmsg, 0, sizeof(struct CtdlMessage)); + vmsg->cm_magic = CTDLMESSAGE_MAGIC; + vmsg->cm_anon_type = MES_NORMAL; + vmsg->cm_format_type = FMT_RFC822; + vmsg->cm_fields['A'] = strdup("Citadel"); + vmsg->cm_fields['E'] = strdup(vcard_get_prop(v, "UID", 0, 0, 0)); + ser = vcard_serialize(v); + if (ser != NULL) { + vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024); + sprintf(vmsg->cm_fields['M'], + "Content-type: text/x-vcard" + "\r\n\r\n%s\r\n", ser); + free(ser); + } + vcard_free(v); + + lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient); + vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname); + CtdlFreeMessage(vmsg); + } + } + + free(aptr->roomname); + free(aptr->collected_addresses); + free(aptr); +} + + +/* + * When a user sends a message, we may harvest one or more email addresses + * from the recipient list to be added to the user's address book. But we + * want to do this asynchronously so it doesn't keep the user waiting. + */ +void store_harvested_addresses(void) { + + struct addresses_to_be_filed *aptr = NULL; + + if (atbf == NULL) return; + + begin_critical_section(S_ATBF); + while (atbf != NULL) { + aptr = atbf; + atbf = atbf->next; + end_critical_section(S_ATBF); + store_this_ha(aptr); + begin_critical_section(S_ATBF); + } + end_critical_section(S_ATBF); +} + char *serv_vcard_init(void) { @@ -932,6 +1081,7 @@ char *serv_vcard_init(void) CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER); CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER); CtdlRegisterNetprocHook(vcard_extract_from_network); + CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER); /* Create the Global ADdress Book room if necessary */ create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK); diff --git a/citadel/server.h b/citadel/server.h index 2552f6bb4..06d7d49dd 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -218,6 +218,7 @@ enum { S_LDAP, S_FLOORCACHE, S_DEBUGMEMLEAKS, + S_ATBF, MAX_SEMAPHORES }; -- 2.39.2