X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_vcard.c;h=a22d7c1997dd007149ac4b275d932164f154b5b7;hb=d27e5ce95bd12d9c25a4e596655212253d50c5c9;hp=98319f3b5e97a07fbbd218aba43460812e24fbc9;hpb=9265ca28538d2b40031edc6a33c906eff1672350;p=citadel.git diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c index 98319f3b5..a22d7c199 100644 --- a/citadel/serv_vcard.c +++ b/citadel/serv_vcard.c @@ -4,18 +4,11 @@ * A server-side module for Citadel which supports address book information * using the standard vCard format. * - * Copyright (c) 1999-2001 / released under the GNU General Public License + * Copyright (c) 1999-2007 / released under the GNU General Public License */ /* - * Where we keep messages containing the vCards that source our directory. It - * makes no sense to change this, because you'd have to change it on every - * system on the network. That would be stupid. - */ -#define ADDRESS_BOOK_ROOM "Global Address Book" - -/* - * Format of the "Extended ID" field of the message containing a user's + * Format of the "Exclusive ID" field of the message containing a user's * vCard. Doesn't matter what it really looks like as long as it's both * unique and consistent (because we use it for replication checking to * delete the old vCard network-wide when the user enters a new one). @@ -31,6 +24,7 @@ #include #include #include +#include #include #if TIME_WITH_SYS_TIME @@ -54,7 +48,7 @@ #include "support.h" #include "config.h" #include "control.h" -#include "dynloader.h" +#include "serv_extensions.h" #include "room_ops.h" #include "user_ops.h" #include "policy.h" @@ -62,15 +56,22 @@ #include "msgbase.h" #include "internet_addressing.h" #include "tools.h" +#include "mime_parser.h" #include "vcard.h" +#include "serv_ldap.h" +#include "serv_vcard.h" -struct vcard_internal_info { - long msgnum; -}; +/* + * set global flag calling for an aide to validate new users + */ +void set_mm_valid(void) { + begin_critical_section(S_CONTROL); + get_control(); + CitControl.MMflags = CitControl.MMflags | MM_VALID ; + put_control(); + end_critical_section(S_CONTROL); +} -/* Message number symbol used internally by these functions */ -unsigned long SYM_VCARD; -#define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD)) /* @@ -88,7 +89,7 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, if (msg->cm_fields['A'] == NULL) return; if (msg->cm_fields['N'] == NULL) return; - sprintf(citadel_address, "%s @ %s", + snprintf(citadel_address, sizeof citadel_address, "%s @ %s", msg->cm_fields['A'], msg->cm_fields['N']); v = vcard_load(msg->cm_fields['M']); @@ -98,16 +99,16 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, * the "email;internet" key */ do { - s = vcard_get_prop(v, "email;internet", 0, instance++); + s = vcard_get_prop(v, "email;internet", 0, instance++, 0); if (s != NULL) { - addr = strdoop(s); + addr = strdup(s); striplt(addr); if (strlen(addr) > 0) { if (callback != NULL) { callback(addr, citadel_address); } } - phree(addr); + free(addr); found_something = 1; } else { @@ -118,17 +119,52 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, vcard_free(v); } + + +/* + * Callback for vcard_add_to_directory() + * (Lotsa ugly nested callbacks. Oh well.) + */ +void vcard_directory_add_user(char *internet_addr, char *citadel_addr) { + char buf[SIZ]; + + /* We have to validate that we're not stepping on someone else's + * email address ... but only if we're logged in. Otherwise it's + * probably just the networker or something. + */ + if (CC->logged_in) { + lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr); + if (CtdlDirectoryLookup(buf, internet_addr, sizeof buf) == 0) { + if (strcasecmp(buf, citadel_addr)) { + /* This address belongs to someone else. + * Bail out silently without saving. + */ + lprintf(CTDL_DEBUG, "DOOP!\n"); + return; + } + } + } + lprintf(CTDL_INFO, "Adding %s (%s) to directory\n", + citadel_addr, internet_addr); + CtdlDirectoryAddUser(internet_addr, citadel_addr); +} + + /* * Back end function for cmd_igab() */ void vcard_add_to_directory(long msgnum, void *data) { struct CtdlMessage *msg; - msg = CtdlFetchMessage(msgnum); + msg = CtdlFetchMessage(msgnum, 1); if (msg != NULL) { - vcard_extract_internet_addresses(msg, CtdlDirectoryAddUser); + vcard_extract_internet_addresses(msg, vcard_directory_add_user); } +#ifdef HAVE_LDAP + ctdl_vcard_to_ldap(msg, V2L_WRITE); +#endif + CtdlFreeMessage(msg); } @@ -137,32 +173,114 @@ 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->quickroom.QRname); /* save current room */ + strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->quickroom, ADDRESS_BOOK_ROOM) != 0) { - getroom(&CC->quickroom, hold_rm); - cprintf("%d cannot get address book room\n", ERROR); + 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 the last (and probably only) vcard in this room */ - CtdlForEachMessage(MSGS_ALL, 0, (-127), "text/x-vcard", + /* We want *all* vCards in this room */ + CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL, vcard_add_to_directory, NULL); - getroom(&CC->quickroom, hold_rm); /* return to saved room */ - cprintf("%d Directory has been rebuilt.\n", OK); + getroom(&CC->room, hold_rm); /* return to saved room */ + cprintf("%d Directory has been rebuilt.\n", CIT_OK); } + +/* + * See if there is a valid Internet address in a vCard to use for outbound + * Internet messages. If there is, stick it in the buffer. + */ +void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len, + char *secemailaddrbuf, size_t secemailaddrbuf_len, + struct vCard *v) { + char *s, *addr; + int instance = 0; + int saved_instance = 0; + + /* Go through the vCard searching for *all* instances of + * the "email;internet" key + */ + while (s = vcard_get_prop(v, "email;internet", 0, instance++, 0), s != NULL) { + addr = strdup(s); + striplt(addr); + if (strlen(addr) > 0) { + if (IsDirectory(addr)) { + ++saved_instance; + if ((saved_instance == 1) && (emailaddrbuf != NULL)) { + safestrncpy(emailaddrbuf, addr, emailaddrbuf_len); + } + else if ((saved_instance == 2) && (secemailaddrbuf != NULL)) { + safestrncpy(secemailaddrbuf, addr, secemailaddrbuf_len); + } + else if ((saved_instance > 2) && (secemailaddrbuf != NULL)) { + if ( (strlen(addr) + strlen(secemailaddrbuf) + 2) + < secemailaddrbuf_len ) { + strcat(secemailaddrbuf, "|"); + strcat(secemailaddrbuf, addr); + } + } + } + } + free(addr); + } +} + + + +/* + * See if there is a name / screen name / friendly name in a vCard to use for outbound + * Internet messages. If there is, stick it in the buffer. + */ +void extract_friendly_name(char *namebuf, size_t namebuf_len, struct vCard *v) +{ + char *s; + + s = vcard_get_prop(v, "fn", 0, 0, 0); + if (s == NULL) { + s = vcard_get_prop(v, "n", 0, 0, 0); + } + + if (s != NULL) { + safestrncpy(namebuf, s, namebuf_len); + } +} + + +/* + * Callback function for vcard_upload_beforesave() hunts for the real vcard in the MIME structure + */ +void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp, + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) +{ + struct vCard **v = (struct vCard **) cbuserdata; + + if ( (!strcasecmp(cbtype, "text/x-vcard")) + || (!strcasecmp(cbtype, "text/vcard")) ) { + + lprintf(CTDL_DEBUG, "Part %s contains a vCard! Loading...\n", partnum); + if (*v != NULL) { + vcard_free(*v); + } + *v = vcard_load(content); + } +} + + /* * This handler detects whether the user is attempting to save a new * vCard as part of his/her personal configuration, and handles the replace @@ -171,62 +289,164 @@ void cmd_igab(char *argbuf) { */ int vcard_upload_beforesave(struct CtdlMessage *msg) { char *ptr; - int linelen; - char config_rm[ROOMNAMELEN]; + char *s; char buf[SIZ]; + struct ctdluser usbuf; + long what_user; + struct vCard *v = NULL; + char *ser = NULL; + int i = 0; + int yes_my_citadel_config = 0; + int yes_any_vcard_room = 0; if (!CC->logged_in) return(0); /* Only do this if logged in. */ - /* If this isn't the configuration room, or if this isn't a MIME - * message, don't bother. (Check for NULL room first, otherwise - * some messages will cause it to crash!!) - */ - if (msg->cm_fields['O'] == NULL) return(0); - if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0); + /* Is this some user's "My Citadel Config" room? */ + if ( (CC->room.QRflags && QR_MAILBOX) + && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) { + /* Yes, we want to do this */ + yes_my_citadel_config = 1; + +#ifdef VCARD_SAVES_BY_AIDES_ONLY + /* Prevent non-aides from performing registration changes */ + if (CC->user.axlevel < 6) { + return(1); + } +#endif + + } + + /* Is this a room with an address book in it? */ + if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) { + yes_any_vcard_room = 1; + } + + /* If neither condition exists, don't run this hook. */ + if ( (!yes_my_citadel_config) && (!yes_any_vcard_room) ) { + return(0); + } + + /* If this isn't a MIME message, don't bother. */ if (msg->cm_format_type != 4) return(0); + /* Ok, if we got this far, look into the situation further... */ + ptr = msg->cm_fields['M']; if (ptr == NULL) return(0); - while (ptr != NULL) { - - linelen = strcspn(ptr, "\n"); - if (linelen == 0) return(0); /* end of headers */ + + mime_parser(msg->cm_fields['M'], + NULL, + *vcard_extract_vcard, + NULL, NULL, + &v, /* user data ptr - put the vcard here */ + 0 + ); + + if (v == NULL) return(0); /* no vCards were found in this message */ + + s = vcard_get_prop(v, "FN", 0, 0, 0); + if (s) lprintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s); + + if (yes_my_citadel_config) { + /* Bingo! The user is uploading a new vCard, so + * delete the old one. First, figure out which user + * is being re-registered... + */ + what_user = atol(CC->room.QRname); + + if (what_user == CC->user.usernum) { + /* It's the logged in user. That was easy. */ + memcpy(&usbuf, &CC->user, sizeof(struct ctdluser)); + } - if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) { - /* Bingo! The user is uploading a new vCard, so - * delete the old one. - */ + else if (getuserbynumber(&usbuf, what_user) == 0) { + /* We fetched a valid user record */ + } - /* Delete the user's old vCard. This would probably - * get taken care of by the replication check, but we - * want to make sure there is absolutely only one - * vCard in the user's config room at all times. - * - * FIXME ... this needs to be tweaked to allow an admin - * to make changes to another user's vCard instead of - * assuming that it's always the user saving his own. - */ - MailboxName(config_rm, &CC->usersupp, USERCONFIGROOM); - CtdlDeleteMessages(config_rm, 0L, "text/x-vcard"); + else { + /* somebody set up us the bomb! */ + yes_my_citadel_config = 0; + } + } + + if (yes_my_citadel_config) { + /* Delete the user's old vCard. This would probably + * get taken care of by the replication check, but we + * want to make sure there is absolutely only one + * vCard in the user's config room at all times. + * + */ + CtdlDeleteMessages(CC->room.QRname, NULL, 0, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$"); + + /* Make the author of the message the name of the user. */ + if (msg->cm_fields['A'] != NULL) { + free(msg->cm_fields['A']); + } + msg->cm_fields['A'] = strdup(usbuf.fullname); + } - /* Set the Extended-ID to a standardized one so the - * replication always works correctly - */ - if (msg->cm_fields['E'] != NULL) - phree(msg->cm_fields['E']); + /* Insert or replace RFC2739-compliant free/busy URL */ + if (yes_my_citadel_config) { + sprintf(buf, "http://%s/%s.vfb", + config.c_fqdn, + usbuf.fullname); + for (i=0; icm_fields['A'], NODENAME); - msg->cm_fields['E'] = strdoop(buf); + /* If the vCard has no UID, then give it one. */ + s = vcard_get_prop(v, "UID", 0, 0, 0); + if (s == NULL) { + generate_uuid(buf); + vcard_set_prop(v, "UID", buf, 0); + } - /* Now allow the save to complete. */ - return(0); + /* Enforce local UID policy if applicable */ + if (yes_my_citadel_config) { + snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME); + vcard_set_prop(v, "UID", buf, 0); + } + + /* + * Set the EUID of the message to the UID of the vCard. + */ + if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']); + s = vcard_get_prop(v, "UID", 0, 0, 0); + if (s != NULL) { + msg->cm_fields['E'] = strdup(s); + if (msg->cm_fields['U'] == NULL) { + msg->cm_fields['U'] = strdup(s); } + } - ptr = strchr((char *)ptr, '\n'); - if (ptr != NULL) ++ptr; + /* + * Set the Subject to the name in the vCard. + */ + s = vcard_get_prop(v, "FN", 0, 0, 0); + if (s == NULL) { + s = vcard_get_prop(v, "N", 0, 0, 0); + } + if (s != NULL) { + if (msg->cm_fields['U'] != NULL) { + free(msg->cm_fields['U']); + } + msg->cm_fields['U'] = strdup(s); + } + + /* Re-serialize it back into the msg body */ + ser = vcard_serialize(v); + if (ser != NULL) { + msg->cm_fields['M'] = realloc(msg->cm_fields['M'], strlen(ser) + 1024); + sprintf(msg->cm_fields['M'], + "Content-type: text/vcard" + "\r\n\r\n%s\r\n", ser); + free(ser); } + /* Now allow the save to complete. */ + vcard_free(v); return(0); } @@ -242,6 +462,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { char *ptr; int linelen; long I; + struct vCard *v; if (!CC->logged_in) return(0); /* Only do this if logged in. */ @@ -259,21 +480,40 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { linelen = strcspn(ptr, "\n"); if (linelen == 0) return(0); /* end of headers */ - if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) { - /* Bingo! The user is uploading a new vCard, so + if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) + || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) { + /* + * Bingo! The user is uploading a new vCard, so * copy it to the Global Address Book room. */ I = atol(msg->cm_fields['I']); if (I < 0L) return(0); + /* Store our Internet return address in memory */ + v = vcard_load(msg->cm_fields['M']); + extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email, + CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails, + v); + extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); + vcard_free(v); + /* Put it in the Global Address Book room... */ - CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, - (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) ); + CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg); /* ...and also in the directory database. */ vcard_add_to_directory(I, NULL); + /* Some sites want an Aide to be notified when a + * user registers or re-registers... + */ + set_mm_valid(); + + /* ...which also means we need to flag the user */ + lgetuser(&CC->user, CC->curr_user); + CC->user.flags |= (US_REGIS|US_NEEDVALID); + lputuser(&CC->user); + return(0); } @@ -289,8 +529,11 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { /* * back end function used for callbacks */ -void vcard_gu_backend(long msgnum, void *userdata) { - VC->msgnum = msgnum; +void vcard_gu_backend(long supplied_msgnum, void *userdata) { + long *msgnum; + + msgnum = (long *) userdata; + *msgnum = supplied_msgnum; } @@ -298,29 +541,30 @@ void vcard_gu_backend(long msgnum, void *userdata) { * If this user has a vcard on disk, read it into memory, otherwise allocate * and return an empty vCard. */ -struct vCard *vcard_get_user(struct usersupp *u) { - char hold_rm[ROOMNAMELEN]; - char config_rm[ROOMNAMELEN]; - struct CtdlMessage *msg; +struct vCard *vcard_get_user(struct ctdluser *u) { + char hold_rm[ROOMNAMELEN]; + char config_rm[ROOMNAMELEN]; + struct CtdlMessage *msg = NULL; struct vCard *v; + long VCmsgnum; - strcpy(hold_rm, CC->quickroom.QRname); /* save current room */ - MailboxName(config_rm, u, USERCONFIGROOM); + strcpy(hold_rm, CC->room.QRname); /* save current room */ + MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM); - if (getroom(&CC->quickroom, config_rm) != 0) { - getroom(&CC->quickroom, 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 */ - VC->msgnum = (-1); - CtdlForEachMessage(MSGS_LAST, 1, (-127), "text/x-vcard", - NULL, vcard_gu_backend, NULL); - getroom(&CC->quickroom, hold_rm); /* return to saved room */ + /* We want the last (and probably only) vcard in this room */ + VCmsgnum = (-1); + CtdlForEachMessage(MSGS_LAST, 1, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", + NULL, vcard_gu_backend, (void *)&VCmsgnum ); + getroom(&CC->room, hold_rm); /* return to saved room */ - if (VC->msgnum < 0L) return vcard_new(); + if (VCmsgnum < 0L) return vcard_new(); - msg = CtdlFetchMessage(VC->msgnum); + msg = CtdlFetchMessage(VCmsgnum, 1); if (msg == NULL) return vcard_new(); v = vcard_load(msg->cm_fields['M']); @@ -335,39 +579,39 @@ struct vCard *vcard_get_user(struct usersupp *u) { /* * Write our config to disk */ -void vcard_write_user(struct usersupp *u, struct vCard *v) { - char temp[PATH_MAX]; - FILE *fp; +void vcard_write_user(struct ctdluser *u, struct vCard *v) { + char temp[PATH_MAX]; + FILE *fp; char *ser; - strcpy(temp, tmpnam(NULL)); + CtdlMakeTempFileName(temp, sizeof temp); 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); - phree(ser); + 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 */ - "text/x-vcard", /* MIME type */ + CtdlWriteObject(USERCONFIGROOM, /* which room */ + "text/vcard", /* MIME type */ temp, /* temp file */ u, /* which user */ 0, /* not binary */ 0, /* don't delete others of this type */ 0); /* no flags */ - unlink(temp); + unlink(temp); } @@ -389,12 +633,14 @@ void cmd_regi(char *argbuf) { char tmpaddress[SIZ]; char tmpcountry[SIZ]; + unbuffer_output(); + if (!(CC->logged_in)) { - cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN); + cprintf("%d Not logged in.\n",ERROR + NOT_LOGGED_IN); return; } - my_vcard = vcard_get_user(&CC->usersupp); + my_vcard = vcard_get_user(&CC->user); strcpy(tmpaddr, ""); strcpy(tmpcity, ""); strcpy(tmpstate, ""); @@ -403,7 +649,7 @@ void cmd_regi(char *argbuf) { cprintf("%d Send registration...\n", SEND_LISTING); a=0; - while (client_gets(buf), strcmp(buf,"000")) { + while (client_getln(buf, sizeof buf), strcmp(buf,"000")) { if (a==0) vcard_set_prop(my_vcard, "n", buf, 0); if (a==1) strcpy(tmpaddr, buf); if (a==2) strcpy(tmpcity, buf); @@ -423,55 +669,43 @@ void cmd_regi(char *argbuf) { ++a; } - sprintf(tmpaddress, ";;%s;%s;%s;%s;%s", + snprintf(tmpaddress, sizeof tmpaddress, ";;%s;%s;%s;%s;%s", tmpaddr, tmpcity, tmpstate, tmpzip, tmpcountry); vcard_set_prop(my_vcard, "adr", tmpaddress, 0); - vcard_write_user(&CC->usersupp, my_vcard); + vcard_write_user(&CC->user, my_vcard); vcard_free(my_vcard); - - lgetuser(&CC->usersupp, CC->curr_user); - CC->usersupp.flags=(CC->usersupp.flags|US_REGIS|US_NEEDVALID); - lputuser(&CC->usersupp); - - /* set global flag calling for validation */ - begin_critical_section(S_CONTROL); - get_control(); - CitControl.MMflags = CitControl.MMflags | MM_VALID ; - put_control(); - end_critical_section(S_CONTROL); } - /* * Protocol command to fetch registration info for a user */ void cmd_greg(char *argbuf) { - struct usersupp usbuf; + struct ctdluser usbuf; struct vCard *v; char *s; - char who[SIZ]; - char adr[SIZ]; - char buf[SIZ]; + char who[USERNAME_SIZE]; + char adr[256]; + char buf[256]; - extract(who, argbuf, 0); + extract_token(who, argbuf, 0, '|', sizeof who); if (!(CC->logged_in)) { - cprintf("%d Not logged in.\n", ERROR+NOT_LOGGED_IN); + cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); return; } if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user); - if ((CC->usersupp.axlevel < 6) && (strcasecmp(who,CC->curr_user))) { + if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) { cprintf("%d Higher access required.\n", - ERROR+HIGHER_ACCESS_REQUIRED); + ERROR + HIGHER_ACCESS_REQUIRED); return; } if (getuser(&usbuf, who) != 0) { - cprintf("%d '%s' not found.\n", ERROR+NO_SUCH_USER, who); + cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, who); return; } @@ -480,23 +714,23 @@ void cmd_greg(char *argbuf) cprintf("%d %s\n", LISTING_FOLLOWS, usbuf.fullname); cprintf("%ld\n", usbuf.usernum); cprintf("%s\n", usbuf.password); - s = vcard_get_prop(v, "n", 0, 0); + s = vcard_get_prop(v, "n", 0, 0, 0); cprintf("%s\n", s ? s : " "); /* name */ - s = vcard_get_prop(v, "adr", 0, 0); - sprintf(adr, "%s", s ? s : " ");/* address... */ + s = vcard_get_prop(v, "adr", 0, 0, 0); + snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */ - extract_token(buf, adr, 2, ';'); + extract_token(buf, adr, 2, ';', sizeof buf); cprintf("%s\n", buf); /* street */ - extract_token(buf, adr, 3, ';'); + extract_token(buf, adr, 3, ';', sizeof buf); cprintf("%s\n", buf); /* city */ - extract_token(buf, adr, 4, ';'); + extract_token(buf, adr, 4, ';', sizeof buf); cprintf("%s\n", buf); /* state */ - extract_token(buf, adr, 5, ';'); + extract_token(buf, adr, 5, ';', sizeof buf); cprintf("%s\n", buf); /* zip */ - s = vcard_get_prop(v, "tel;home", 0, 0); - if (s == NULL) s = vcard_get_prop(v, "tel", 1, 0); + s = vcard_get_prop(v, "tel;home", 0, 0, 0); + if (s == NULL) s = vcard_get_prop(v, "tel", 1, 0, 0); if (s != NULL) { cprintf("%s\n", s); } @@ -506,67 +740,89 @@ void cmd_greg(char *argbuf) cprintf("%d\n", usbuf.axlevel); - s = vcard_get_prop(v, "email;internet", 0, 0); + s = vcard_get_prop(v, "email;internet", 0, 0, 0); cprintf("%s\n", s ? s : " "); - s = vcard_get_prop(v, "adr", 0, 0); - sprintf(adr, "%s", s ? s : " ");/* address... */ + s = vcard_get_prop(v, "adr", 0, 0, 0); + snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */ - extract_token(buf, adr, 6, ';'); + extract_token(buf, adr, 6, ';', sizeof buf); cprintf("%s\n", buf); /* country */ cprintf("000\n"); } + +/* + * When a user is being created, create his/her vCard. + */ +void vcard_newuser(struct ctdluser *usbuf) { + char vname[256]; + char buf[256]; + int i; + struct vCard *v; + + vcard_fn_to_n(vname, usbuf->fullname, sizeof vname); + lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname); + + /* Create and save the vCard */ + v = vcard_new(); + if (v == NULL) return; + sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn); + for (i=0; ifullname); + vcard_add_prop(v, "n", vname); + vcard_add_prop(v, "adr", "adr:;;_;_;_;00000;__"); + vcard_add_prop(v, "email;internet", buf); + vcard_write_user(usbuf, v); + vcard_free(v); +} + + /* * When a user is being deleted, we have to remove his/her vCard. * This is accomplished by issuing a message with 'CANCEL' in the S (special) - * field, and the same Extended ID as the existing card. + * field, and the same Exclusive ID as the existing card. */ -void vcard_purge(char *username, long usernum) { +void vcard_purge(struct ctdluser *usbuf) { struct CtdlMessage *msg; char buf[SIZ]; - msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage)); + msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); if (msg == NULL) return; memset(msg, 0, sizeof(struct CtdlMessage)); - msg->cm_magic = CTDLMESSAGE_MAGIC; - msg->cm_anon_type = MES_NORMAL; - msg->cm_format_type = 0; - msg->cm_fields['A'] = strdoop(username); - msg->cm_fields['O'] = strdoop(ADDRESS_BOOK_ROOM); - msg->cm_fields['N'] = strdoop(NODENAME); - msg->cm_fields['M'] = strdoop("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"); - sprintf(buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME); - msg->cm_fields['E'] = strdoop(buf); + snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, + msg->cm_fields['A'], NODENAME); + msg->cm_fields['E'] = strdup(buf); - msg->cm_fields['S'] = strdoop("CANCEL"); + msg->cm_fields['S'] = strdup("CANCEL"); - CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM); - CtdlFreeMessage(msg); + CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM); + CtdlFreeMessage(msg); } /* * Grab vCard directory stuff out of incoming network messages */ -int vcard_extract_from_network(struct CtdlMessage *msg) { +int vcard_extract_from_network(struct CtdlMessage *msg, char *target_room) { char *ptr; int linelen; if (msg == NULL) return(0); - if (msg->cm_fields['C'] != NULL) { - if (strcasecmp(msg->cm_fields['C'], ADDRESS_BOOK_ROOM)) { - return(0); - } - } - - if (msg->cm_fields['O'] != NULL) { - if (strcasecmp(msg->cm_fields['O'], ADDRESS_BOOK_ROOM)) { - return(0); - } + if (strcasecmp(target_room, ADDRESS_BOOK_ROOM)) { + return(0); } if (msg->cm_format_type != 4) return(0); @@ -578,10 +834,10 @@ int vcard_extract_from_network(struct CtdlMessage *msg) { linelen = strcspn(ptr, "\n"); if (linelen == 0) return(0); /* end of headers */ - if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) { - /* It's a vCard. Add it to the directory. */ - vcard_extract_internet_addresses(msg, - CtdlDirectoryAddUser); + if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) + || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) { + /* It's a vCard. Add it to the directory. */ + vcard_extract_internet_addresses(msg, CtdlDirectoryAddUser); return(0); } @@ -594,26 +850,438 @@ int vcard_extract_from_network(struct CtdlMessage *msg) { +/* + * When a vCard is being removed from the Global Address Book room, remove it + * from the directory as well. + */ +void vcard_delete_remove(char *room, long msgnum) { + struct CtdlMessage *msg; + char *ptr; + int linelen; + + if (msgnum <= 0L) return; + + if (strcasecmp(room, ADDRESS_BOOK_ROOM)) { + return; + } + + msg = CtdlFetchMessage(msgnum, 1); + if (msg == NULL) return; + + ptr = msg->cm_fields['M']; + if (ptr == NULL) goto EOH; + while (ptr != NULL) { + linelen = strcspn(ptr, "\n"); + if (linelen == 0) goto EOH; + + if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) + || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) { + /* Bingo! A vCard is being deleted. */ + vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser); +#ifdef HAVE_LDAP + ctdl_vcard_to_ldap(msg, V2L_DELETE); +#endif + } + ptr = strchr((char *)ptr, '\n'); + if (ptr != NULL) ++ptr; + } + +EOH: CtdlFreeMessage(msg); +} + + + /* - * Session startup, allocate some per-session data + * Get Valid Screen Names */ -void vcard_session_startup_hook(void) { - CtdlAllocUserData(SYM_VCARD, sizeof(struct vcard_internal_info)); +void cmd_gvsn(char *argbuf) +{ + if (CtdlAccessCheck(ac_logged_in)) return; + + cprintf("%d valid screen names:\n", LISTING_FOLLOWS); + cprintf("%s\n", CC->user.fullname); + if ( (strlen(CC->cs_inet_fn) > 0) && (strcasecmp(CC->user.fullname, CC->cs_inet_fn)) ) { + cprintf("%s\n", CC->cs_inet_fn); + } + cprintf("000\n"); } -char *Dynamic_Module_Init(void) +/* + * Get Valid Email Addresses + */ +void cmd_gvea(char *argbuf) { - SYM_VCARD = CtdlGetDynamicSymbol(); - CtdlRegisterSessionHook(vcard_session_startup_hook, EVT_START); + int num_secondary_emails = 0; + int i; + char buf[256]; + + if (CtdlAccessCheck(ac_logged_in)) return; + + cprintf("%d valid email addresses:\n", LISTING_FOLLOWS); + if (strlen(CC->cs_inet_email) > 0) { + cprintf("%s\n", CC->cs_inet_email); + } + if (strlen(CC->cs_inet_other_emails) > 0) { + num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|'); + for (i=0; ics_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails); + cprintf("%s\n", buf); + } + } + cprintf("000\n"); +} + + +/* + * Query Directory + */ +void cmd_qdir(char *argbuf) { + char citadel_addr[256]; + char internet_addr[256]; + + if (CtdlAccessCheck(ac_logged_in)) return; + + extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr); + + if (CtdlDirectoryLookup(citadel_addr, internet_addr, sizeof citadel_addr) != 0) { + cprintf("%d %s was not found.\n", + ERROR + NO_SUCH_USER, internet_addr); + return; + } + + cprintf("%d %s\n", CIT_OK, citadel_addr); +} + +/* + * Query Directory, in fact an alias to match postfix tcp auth. + */ +void check_get(void) { + char internet_addr[256]; + + char cmdbuf[SIZ]; + + time(&CC->lastcmd); + memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ + if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { + lprintf(CTDL_CRIT, "Client disconnected: ending session.\n"); + CC->kill_me = 1; + return; + } + lprintf(CTDL_INFO, ": %s\n", cmdbuf); + while (strlen(cmdbuf) < 3) strcat(cmdbuf, " "); + + if (strcasecmp(cmdbuf, "GET ")); + { + struct recptypes *rcpt; + char *argbuf = &cmdbuf[4]; + + extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr); + rcpt = validate_recipients(internet_addr); + if ((rcpt != NULL)&& + ( + (*rcpt->recp_local != '\0')|| + (*rcpt->recp_room != '\0')|| + (*rcpt->recp_ignet != '\0'))) + { + + cprintf("200 OK %s\n", internet_addr); + lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp); + } + else + { + cprintf("500 REJECT noone here by that name.\n"); + + lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr); + } + if (rcpt != NULL) free (rcpt); + } +/// CC->kill_me = 1; +} + +void check_get_greeting(void) { +/* dummy function, we have no greeting in this verry simple protocol. */ +} + + +/* + * We don't know if the Contacts room exists so we just create it at login + */ +void vcard_create_room(void) +{ + struct ctdlroom qr; + struct visit vbuf; + + /* Create the calendar room if it doesn't already exist */ + create_room(USERCONTACTSROOM, 4, "", 0, 1, 0, VIEW_ADDRESSBOOK); + + /* Set expiration policy to manual; otherwise objects will be lost! */ + if (lgetroom(&qr, USERCONTACTSROOM)) { + lprintf(CTDL_ERR, "Couldn't get the user CONTACTS room!\n"); + return; + } + qr.QRep.expire_mode = EXPIRE_MANUAL; + qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */ + lputroom(&qr); + + /* Set the view to a calendar view */ + CtdlGetRelationship(&vbuf, &CC->user, &qr); + vbuf.v_view = 2; /* 2 = address book view */ + CtdlSetRelationship(&vbuf, &CC->user, &qr); + + return; +} + + + + +/* + * When a user logs in... + */ +void vcard_session_login_hook(void) { + struct vCard *v = NULL; + + v = vcard_get_user(&CC->user); + extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email, + CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails, + v); + extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); + vcard_free(v); + + vcard_create_room(); +} + + +/* + * 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, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", 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/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); +} + + +/* + * Function to output vCard data as plain text. Nobody uses MSG0 anymore, so + * really this is just so we expose the vCard data to the full text indexer. + */ +void vcard_fixed_output(char *ptr, int len) { + char *serialized_vcard; + struct vCard *v; + char *key, *value; + int i = 0; + + serialized_vcard = malloc(len + 1); + safestrncpy(serialized_vcard, ptr, len+1); + v = vcard_load(serialized_vcard); + free(serialized_vcard); + + i = 0; + while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) { + value = vcard_get_prop(v, "", 0, i++, 0); + cprintf("%s\n", value); + } + + vcard_free(v); +} + + +char *serv_postfix_tcpdict(void) +{ + CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */ + NULL, + check_get_greeting, + check_get, + NULL); + return "$Id$"; +} + + + +char *serv_vcard_init(void) +{ + struct ctdlroom qr; + char filename[256]; + FILE *fp; + + CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN); CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE); CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE); + CtdlRegisterDeleteHook(vcard_delete_remove); CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info"); CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info"); CtdlRegisterProtoHook(cmd_igab, "IGAB", "Initialize Global Address Book"); + CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory"); + CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names"); + CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses"); + CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER); CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER); - create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1); CtdlRegisterNetprocHook(vcard_extract_from_network); + CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER); + CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output); + CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output); + + /* Create the Global ADdress Book room if necessary */ + create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK); + + /* Set expiration policy to manual; otherwise objects will be lost! */ + if (!lgetroom(&qr, ADDRESS_BOOK_ROOM)) { + qr.QRep.expire_mode = EXPIRE_MANUAL; + qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */ + lputroom(&qr); + + /* + * Also make sure it has a netconfig file, so the networker runs + * on this room even if we don't share it with any other nodes. + * This allows the CANCEL messages (i.e. "Purge this vCard") to be + * purged. + */ + assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir); + fp = fopen(filename, "a"); + if (fp != NULL) fclose(fp); + chown(filename, CTDLUID, (-1)); + } + return "$Id$"; }