X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=5486e094783a1bc5af878ce03d32d2bdbf40c3cc;hb=f9c52de63b58d007291f0e33c035eeb10f728115;hp=9bff42a41732740467b1cc9dfc3e4e5be3714252;hpb=d172a02b4f68e175285052d95f059ff8e3461ac7;p=citadel.git diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 9bff42a41..5486e0947 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -1,10 +1,22 @@ /* - * $Id$ - * * A server-side module for Citadel which supports address book information * using the standard vCard format. * - * Copyright (c) 1999-2007 / released under the GNU General Public License + * Copyright (c) 1999-2009 by the citadel.org team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* @@ -47,27 +59,21 @@ #include #include #include +#include #include "citadel.h" #include "server.h" #include "citserver.h" #include "support.h" #include "config.h" #include "control.h" -#include "room_ops.h" #include "user_ops.h" -#include "policy.h" #include "database.h" #include "msgbase.h" #include "internet_addressing.h" -#include "tools.h" -#include "mime_parser.h" -#include "vcard.h" #include "serv_vcard.h" - +#include "citadel_ldap.h" #include "ctdl_module.h" - - /* * set global flag calling for an aide to validate new users */ @@ -85,10 +91,10 @@ void set_mm_valid(void) { * Extract Internet e-mail addresses from a message containing a vCard, and * perform a callback for any found. */ -void vcard_extract_internet_addresses(struct CtdlMessage *msg, - void (*callback)(char *, char *) ) { +void vcard_extract_internet_addresses(struct CtdlMessage *msg, void (*callback)(char *, char *) ) { struct vCard *v; char *s; + char *k; char *addr; char citadel_address[SIZ]; int instance = 0; @@ -106,8 +112,9 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, * the "email;internet" key */ do { - s = vcard_get_prop(v, "email;internet", 0, instance++, 0); - if (s != NULL) { + s = vcard_get_prop(v, "email", 1, instance, 0); /* get any 'email' field */ + k = vcard_get_prop(v, "email", 1, instance++, 1); /* but also learn it with attrs */ + if ( (s != NULL) && (k != NULL) && (bmstrcasestr(k, "internet")) ) { addr = strdup(s); striplt(addr); if (!IsEmptyStr(addr)) { @@ -127,190 +134,6 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, } -/* - * vCard-to-LDAP conversions. - * - * If 'op' is set to V2L_WRITE, then write - * (add, or change if already exists) a directory entry to the - * LDAP server, based on the information supplied in a vCard. - * - * If 'op' is set to V2L_DELETE, then delete the entry from LDAP. - */ - - -void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) { - struct vCard *v = NULL; - int i; - int have_addr = 0; - int have_cn = 0; - - void *objectlist = NULL; - - char givenname[128]; - char sn[128]; - char uid[256]; - char street[256]; - char city[128]; - char state[3]; - char zipcode[10]; - char calFBURL[256]; - char ldap_dn[SIZ]; - - if (msg == NULL) return; - if (msg->cm_fields['M'] == NULL) return; - if (msg->cm_fields['A'] == NULL) return; - if (msg->cm_fields['N'] == NULL) return; - - /* Initialize variables */ - strcpy(givenname, ""); - strcpy(sn, ""); - strcpy(calFBURL, ""); - - sprintf(uid, "%s@%s", - msg->cm_fields['A'], - msg->cm_fields['N'] - ); - - sprintf(ldap_dn, "euid=%s,ou=%s", msg->cm_fields['E'], msg->cm_fields['N']); - - /* Are we just deleting? If so, it's simple... */ - if (op == V2L_DELETE) { - (void) CtdlDoDirectoryServiceFunc (ldap_dn, NULL, NULL, "ldap", DIRECTORY_USER_DEL); - return; - } - - /* - * If we get to this point then it must be a V2L_WRITE operation. - */ - - /* First make sure the OU for the user's home Citadel host is created */ - (void) CtdlDoDirectoryServiceFunc (NULL, msg->cm_fields['N'], NULL, "ldap", DIRECTORY_CREATE_HOST); - - /* Next create the directory service object */ - (void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_CREATE_OBJECT); - - /* The first LDAP attribute will be an 'objectclass' list. Citadel - * doesn't do anything with this. It's just there for compatibility - * with Kolab. - */ - (void) CtdlDoDirectoryServiceFunc("objectclass", "citadelInetOrgPerson", &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* Convert the vCard fields to LDAP properties */ - v = vcard_load(msg->cm_fields['M']); - if (v->numprops) for (i=0; i<(v->numprops); ++i) if (striplt(v->prop[i].value), strlen(v->prop[i].value) > 0) { - - if (!strcasecmp(v->prop[i].name, "n")) { - extract_token(sn, v->prop[i].value, 0, ';', sizeof sn); - extract_token(givenname, v->prop[i].value, 1, ';', sizeof givenname); - } - - if (!strcasecmp(v->prop[i].name, "fn")) { - (void) CtdlDoDirectoryServiceFunc("cn", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - have_cn = 1; - } - - if (!strcasecmp(v->prop[i].name, "title")) { - (void) CtdlDoDirectoryServiceFunc("title", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - if (!strcasecmp(v->prop[i].name, "org")) { - (void) CtdlDoDirectoryServiceFunc("o", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - if ( (!strcasecmp(v->prop[i].name, "adr")) - ||(!strncasecmp(v->prop[i].name, "adr;", 4)) ) { - /* Unfortunately, we can only do a single address */ - if (!have_addr) { - have_addr = 1; - strcpy(street, ""); - extract_token(&street[strlen(street)], - v->prop[i].value, 0, ';', (sizeof street - strlen(street))); /* po box */ - strcat(street, " "); - extract_token(&street[strlen(street)], - v->prop[i].value, 1, ';', (sizeof street - strlen(street))); /* extend addr */ - strcat(street, " "); - extract_token(&street[strlen(street)], - v->prop[i].value, 2, ';', (sizeof street - strlen(street))); /* street */ - striplt(street); - extract_token(city, v->prop[i].value, 3, ';', sizeof city); - extract_token(state, v->prop[i].value, 4, ';', sizeof state); - extract_token(zipcode, v->prop[i].value, 5, ';', sizeof zipcode); - - // ldap requires these fields to be something - if (IsEmptyStr(street)) strcpy(street, "_"); - if (IsEmptyStr(zipcode)) strcpy(zipcode, "_"); - if (IsEmptyStr(city)) strcpy(city, "_"); - if (IsEmptyStr(state)) strcpy(state, "_"); - - (void) CtdlDoDirectoryServiceFunc("street", street, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - (void) CtdlDoDirectoryServiceFunc("l", city, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - (void) CtdlDoDirectoryServiceFunc("st", state, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - (void) CtdlDoDirectoryServiceFunc("postalcode", zipcode, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - } - - if (!strcasecmp(v->prop[i].name, "tel;home")) - (void) CtdlDoDirectoryServiceFunc("homePhone", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - else - if ( (!strcasecmp(v->prop[i].name, "tel")) - ||(!strncasecmp(v->prop[i].name, "tel;", 4)) ) { - (void) CtdlDoDirectoryServiceFunc("telephoneNumber", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - - if ( (!strcasecmp(v->prop[i].name, "email")) - ||(!strcasecmp(v->prop[i].name, "email;internet")) ) { - (void) CtdlDoDirectoryServiceFunc("mail", v->prop[i].value, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - /* Calendar free/busy URL (take the first one we find, but if a subsequent - * one contains the "pref" designation then we go with that instead.) - */ - if ( (!strcasecmp(v->prop[i].name, "fburl")) - ||(!strncasecmp(v->prop[i].name, "fburl;", 6)) ) { - if ( (IsEmptyStr(calFBURL)) - || (!strncasecmp(v->prop[i].name, "fburl;pref", 10)) ) { - safestrncpy(calFBURL, v->prop[i].value, sizeof calFBURL); - } - } - - } - vcard_free(v); /* Don't need this anymore. */ - - /* "sn" (surname) based on info in vCard */ - (void) CtdlDoDirectoryServiceFunc("sn", sn, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* "givenname" (first name) based on info in vCard */ - if (IsEmptyStr(givenname)) strcpy(givenname, "_"); - if (IsEmptyStr(sn)) strcpy(sn, "_"); - (void) CtdlDoDirectoryServiceFunc("givenname", givenname, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* "uid" is a Kolab compatibility thing. We just do cituser@citnode */ - (void) CtdlDoDirectoryServiceFunc("uid", uid, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* Add a "cn" (Common Name) attribute based on the user's screen name, - * but only there was no 'fn' (full name) property in the vCard - */ - if (!have_cn) - (void) CtdlDoDirectoryServiceFunc("cn", msg->cm_fields['A'], &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - /* Add a "calFBURL" attribute if a calendar free/busy URL exists */ - if (!IsEmptyStr(calFBURL)) { - (void) CtdlDoDirectoryServiceFunc("calFBURL", calFBURL, &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - } - - // Add this messages EUID as the primary key for this entry. - (void) CtdlDoDirectoryServiceFunc("euid", msg->cm_fields['E'], &objectlist, "ldap", DIRECTORY_ATTRIB_ADD); - - - (void) CtdlDoDirectoryServiceFunc(ldap_dn, NULL, &objectlist, "ldap", DIRECTORY_SAVE_OBJECT); - - (void) CtdlDoDirectoryServiceFunc(NULL, NULL, &objectlist, "ldap", DIRECTORY_FREE_OBJECT); - lprintf(CTDL_DEBUG, "Directory Services write operation complete.\n"); -} - - - /* * Callback for vcard_add_to_directory() * (Lotsa ugly nested callbacks. Oh well.) @@ -323,19 +146,18 @@ void vcard_directory_add_user(char *internet_addr, char *citadel_addr) { * probably just the networker or something. */ if (CC->logged_in) { - lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr); + syslog(LOG_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"); + syslog(LOG_DEBUG, "DOOP!\n"); return; } } } - lprintf(CTDL_INFO, "Adding %s (%s) to directory\n", - citadel_addr, internet_addr); + syslog(LOG_INFO, "Adding %s (%s) to directory\n", citadel_addr, internet_addr); CtdlDirectoryAddUser(internet_addr, citadel_addr); } @@ -351,8 +173,6 @@ void vcard_add_to_directory(long msgnum, void *data) { vcard_extract_internet_addresses(msg, vcard_directory_add_user); } - ctdl_vcard_to_directory(msg, V2L_WRITE); - CtdlFreeMessage(msg); } @@ -367,8 +187,8 @@ void cmd_igab(char *argbuf) { strcpy(hold_rm, CC->room.QRname); /* save current room */ - if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) { - getroom(&CC->room, hold_rm); + if (CtdlGetRoom(&CC->room, ADDRESS_BOOK_ROOM) != 0) { + CtdlGetRoom(&CC->room, hold_rm); cprintf("%d cannot get address book room\n", ERROR + ROOM_NOT_FOUND); return; } @@ -378,10 +198,10 @@ void cmd_igab(char *argbuf) { CtdlDirectoryInit(); /* We want *all* vCards in this room */ - CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", + CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL, vcard_add_to_directory, NULL); - getroom(&CC->room, hold_rm); /* return to saved room */ + CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ cprintf("%d Directory has been rebuilt.\n", CIT_OK); } @@ -395,36 +215,39 @@ void cmd_igab(char *argbuf) { void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len, char *secemailaddrbuf, size_t secemailaddrbuf_len, struct vCard *v, int local_addrs_only) { - char *s, *addr; + char *s, *k, *addr; int instance = 0; int saved_instance = 0; - /* Go through the vCard searching for *all* instances of - * the "email;internet" key + /* Go through the vCard searching for *all* Internet email addresses */ - while (s = vcard_get_prop(v, "email;internet", 0, instance++, 0), s != NULL) { - addr = strdup(s); - striplt(addr); - if (!IsEmptyStr(addr)) { - if ( (IsDirectory(addr, 1)) || - (!local_addrs_only) ) { - ++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); + while (s = vcard_get_prop(v, "email", 1, instance, 0), s != NULL) { + k = vcard_get_prop(v, "email", 1, instance, 1); + if ( (s != NULL) && (k != NULL) && (bmstrcasestr(k, "internet")) ) { + addr = strdup(s); + striplt(addr); + if (!IsEmptyStr(addr)) { + if ( (IsDirectory(addr, 1)) || + (!local_addrs_only) ) { + ++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); } - free(addr); + ++instance; } } @@ -438,9 +261,9 @@ void extract_friendly_name(char *namebuf, size_t namebuf_len, struct vCard *v) { char *s; - s = vcard_get_prop(v, "fn", 0, 0, 0); + s = vcard_get_prop(v, "fn", 1, 0, 0); if (s == NULL) { - s = vcard_get_prop(v, "n", 0, 0, 0); + s = vcard_get_prop(v, "n", 1, 0, 0); } if (s != NULL) { @@ -454,14 +277,14 @@ void extract_friendly_name(char *namebuf, size_t namebuf_len, struct vCard *v) */ 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) + char *encoding, char *cbid, 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); + syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...\n", partnum); if (*v != NULL) { vcard_free(*v); } @@ -495,10 +318,11 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) { /* Yes, we want to do this */ yes_my_citadel_config = 1; + syslog(LOG_DEBUG, "GAB: user config room detected"); #ifdef VCARD_SAVES_BY_AIDES_ONLY /* Prevent non-aides from performing registration changes */ - if (CC->user.axlevel < 6) { + if (CC->user.axlevel < AxAideU) { return(1); } #endif @@ -508,6 +332,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { /* Is this a room with an address book in it? */ if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) { yes_any_vcard_room = 1; + syslog(LOG_DEBUG, "GAB: address book room detected"); } /* If neither condition exists, don't run this hook. */ @@ -534,12 +359,12 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { if (v == NULL) return(0); /* no vCards were found in this message */ /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < 6) ) { + if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) { return(1); } - s = vcard_get_prop(v, "FN", 0, 0, 0); - if (s) lprintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s); + s = vcard_get_prop(v, "fn", 1, 0, 0); + if (s) syslog(LOG_DEBUG, "GAB: vCard beforesave hook running for <%s>\n", s); if (yes_my_citadel_config) { /* Bingo! The user is uploading a new vCard, so @@ -553,7 +378,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { memcpy(&usbuf, &CC->user, sizeof(struct ctdluser)); } - else if (getuserbynumber(&usbuf, what_user) == 0) { + else if (CtdlGetUserByNumber(&usbuf, what_user) == 0) { /* We fetched a valid user record */ } @@ -570,7 +395,8 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { * 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]$"); + syslog(LOG_DEBUG, "GAB: deleting old vCard for user"); + 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) { @@ -591,7 +417,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { } /* If the vCard has no UID, then give it one. */ - s = vcard_get_prop(v, "UID", 0, 0, 0); + s = vcard_get_prop(v, "UID", 1, 0, 0); if (s == NULL) { generate_uuid(buf); vcard_set_prop(v, "UID", buf, 0); @@ -606,8 +432,12 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { /* * 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 (msg->cm_fields['E'] != NULL) + { + free(msg->cm_fields['E']); + msg->cm_fields['E'] = NULL; + } + s = vcard_get_prop(v, "UID", 1, 0, 0); if (s != NULL) { msg->cm_fields['E'] = strdup(s); if (msg->cm_fields['U'] == NULL) { @@ -618,9 +448,9 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { /* * Set the Subject to the name in the vCard. */ - s = vcard_get_prop(v, "FN", 0, 0, 0); + s = vcard_get_prop(v, "FN", 1, 0, 0); if (s == NULL) { - s = vcard_get_prop(v, "N", 0, 0, 0); + s = vcard_get_prop(v, "N", 1, 0, 0); } if (s != NULL) { if (msg->cm_fields['U'] != NULL) { @@ -641,6 +471,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { /* Now allow the save to complete. */ vcard_free(v); + syslog(LOG_DEBUG, "GAB: save will proceed"); return(0); } @@ -658,18 +489,31 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { long I; struct vCard *v; int is_UserConf=0; + int is_MY_UserConf=0; int is_GAB=0; + char roomname[ROOMNAMELEN]; + if (msg->cm_format_type != 4) return(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. - */ - if (msg->cm_fields['O'] == NULL) return(0); - if (!strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) is_UserConf = 1; - if (!strcasecmp(msg->cm_fields['O'], ADDRESS_BOOK_ROOM)) is_GAB = 1; + /* We're interested in user config rooms only. */ + + if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) { + is_UserConf = 1; /* It's someone's config room */ + syslog(LOG_DEBUG, "GAB: this is someone's config room"); + } + CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM); + if (!strcasecmp(CC->room.QRname, roomname)) { + is_UserConf = 1; + is_MY_UserConf = 1; /* It's MY config room */ + syslog(LOG_DEBUG, "GAB: this is MY config room"); + } + if (!strcasecmp(CC->room.QRname, ADDRESS_BOOK_ROOM)) { + is_GAB = 1; /* It's the Global Address Book */ + syslog(LOG_DEBUG, "GAB: this is the Global Address Book"); + } + if (!is_UserConf && !is_GAB) return(0); - if (msg->cm_format_type != 4) return(0); ptr = msg->cm_fields['M']; if (ptr == NULL) return(0); @@ -689,16 +533,19 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { 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, + if (is_MY_UserConf) { + 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, 1); - extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); - vcard_free(v); + extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); + vcard_free(v); + } if (!is_GAB) { // This is not the GAB /* Put it in the Global Address Book room... */ + syslog(LOG_DEBUG, "GAB: copying to Global Address Book"); CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg); } @@ -706,14 +553,23 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { vcard_add_to_directory(I, NULL); /* Some sites want an Aide to be notified when a - * user registers or re-registers... + * user registers or re-registers + * But if the user was an Aide or was edited by an Aide then we can + * Assume they don't need validating. */ + if (CC->user.axlevel >= AxAideU) { + CtdlGetUserLock(&CC->user, CC->curr_user); + CC->user.flags |= US_REGIS; + CtdlPutUserLock(&CC->user); + return (0); + } + set_mm_valid(); /* ...which also means we need to flag the user */ - lgetuser(&CC->user, CC->curr_user); + CtdlGetUserLock(&CC->user, CC->curr_user); CC->user.flags |= (US_REGIS|US_NEEDVALID); - lputuser(&CC->user); + CtdlPutUserLock(&CC->user); return(0); } @@ -750,18 +606,18 @@ struct vCard *vcard_get_user(struct ctdluser *u) { long VCmsgnum; strcpy(hold_rm, CC->room.QRname); /* save current room */ - MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM); + CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM); - if (getroom(&CC->room, config_rm) != 0) { - getroom(&CC->room, hold_rm); + if (CtdlGetRoom(&CC->room, config_rm) != 0) { + CtdlGetRoom(&CC->room, hold_rm); return vcard_new(); } /* 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]$", + 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 */ + CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ if (VCmsgnum < 0L) return vcard_new(); @@ -781,22 +637,13 @@ 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 *ser; - CtdlMakeTempFileName(temp, sizeof temp); ser = vcard_serialize(v); - - 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); + ser = strdup("begin:vcard\r\nend:vcard\r\n"); } - fclose(fp); + if (!ser) return; /* This handy API function does all the work for us. * NOTE: normally we would want to set that last argument to 1, to @@ -804,15 +651,16 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) { * 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 */ - VCARD_MIME_TYPE,/* MIME type */ - temp, /* temp file */ - u, /* which user */ - 0, /* not binary */ - 0, /* don't delete others of this type */ - 0); /* no flags */ - - unlink(temp); + CtdlWriteObject(USERCONFIGROOM, /* which room */ + VCARD_MIME_TYPE, /* MIME type */ + ser, /* data */ + strlen(ser)+1, /* length */ + u, /* which user */ + 0, /* not binary */ + 0, /* don't delete others of this type */ + 0); /* no flags */ + + free(ser); } @@ -842,7 +690,7 @@ void cmd_regi(char *argbuf) { } /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (config.c_disable_newu) && (CC->user.axlevel < 6) ) { + if ( (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) { cprintf("%d Self-service registration is not allowed here.\n", ERROR + HIGHER_ACCESS_REQUIRED); } @@ -870,7 +718,7 @@ void cmd_regi(char *argbuf) { } } } - if (a==5) vcard_set_prop(my_vcard, "tel;home", buf, 0); + if (a==5) vcard_set_prop(my_vcard, "tel", buf, 0); if (a==6) vcard_set_prop(my_vcard, "email;internet", buf, 0); if (a==7) strcpy(tmpcountry, buf); ++a; @@ -905,13 +753,13 @@ void cmd_greg(char *argbuf) if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user); - if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) { + if ((CC->user.axlevel < AxAideU) && (strcasecmp(who,CC->curr_user))) { cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED); return; } - if (getuser(&usbuf, who) != 0) { + if (CtdlGetUser(&usbuf, who) != 0) { cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, who); return; } @@ -921,10 +769,10 @@ 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, 0); + s = vcard_get_prop(v, "n", 1, 0, 0); cprintf("%s\n", s ? s : " "); /* name */ - s = vcard_get_prop(v, "adr", 0, 0, 0); + s = vcard_get_prop(v, "adr", 1, 0, 0); snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */ extract_token(buf, adr, 2, ';', sizeof buf); @@ -936,7 +784,7 @@ void cmd_greg(char *argbuf) extract_token(buf, adr, 5, ';', sizeof buf); cprintf("%s\n", buf); /* zip */ - s = vcard_get_prop(v, "tel;home", 0, 0, 0); + s = vcard_get_prop(v, "tel", 1, 0, 0); if (s == NULL) s = vcard_get_prop(v, "tel", 1, 0, 0); if (s != NULL) { cprintf("%s\n", s); @@ -970,19 +818,42 @@ void vcard_newuser(struct ctdluser *usbuf) { struct vCard *v; vcard_fn_to_n(vname, usbuf->fullname, sizeof vname); - lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname); + syslog(LOG_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; buf[i]; ++i) { - if (buf[i] == ' ') buf[i] = '_'; - } vcard_add_prop(v, "fn", usbuf->fullname); vcard_add_prop(v, "n", vname); vcard_add_prop(v, "adr", "adr:;;_;_;_;00000;__"); + +#ifdef HAVE_GETPWUID_R + /* If using host auth mode, we add an email address based on the login */ + if (config.c_auth_mode == AUTHMODE_HOST) { + struct passwd pwd; + char pwd_buffer[SIZ]; + +#ifdef SOLARIS_GETPWUID + if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer) != NULL) { +#else // SOLARIS_GETPWUID + struct passwd *result = NULL; + syslog(LOG_DEBUG, "Searching for uid %d\n", usbuf->uid); + if (getpwuid_r(usbuf->uid, &pwd, pwd_buffer, sizeof pwd_buffer, &result) == 0) { +#endif // HAVE_GETPWUID_R + snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, config.c_fqdn); + vcard_add_prop(v, "email;internet", buf); + } + } +#endif + + /* Everyone gets an email address based on their display name */ + snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, config.c_fqdn); + for (i=0; buf[i]; ++i) { + if (buf[i] == ' ') buf[i] = '_'; + } vcard_add_prop(v, "email;internet", buf); + + vcard_write_user(usbuf, v); vcard_free(v); } @@ -1015,7 +886,7 @@ void vcard_purge(struct ctdluser *usbuf) { msg->cm_fields['S'] = strdup("CANCEL"); - CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM); + CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR); CtdlFreeMessage(msg); } @@ -1088,7 +959,6 @@ void vcard_delete_remove(char *room, long msgnum) { || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) { /* Bingo! A vCard is being deleted. */ vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser); - ctdl_vcard_to_directory(msg, V2L_DELETE); } ptr = strchr((char *)ptr, '\n'); if (ptr != NULL) ++ptr; @@ -1149,7 +1019,7 @@ void cmd_gvea(char *argbuf) */ void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, - void *cbuserdata) { + char *cbid, void *cbuserdata) { struct vCard *v; char displayname[256]; @@ -1254,20 +1124,21 @@ void check_get(void) { 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; + syslog(LOG_CRIT, "vcard client disconnected: ending session.\n"); + CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - lprintf(CTDL_INFO, ": %s\n", cmdbuf); + syslog(LOG_INFO, ": %s\n", cmdbuf); while (strlen(cmdbuf) < 3) strcat(cmdbuf, " "); - - if (strcasecmp(cmdbuf, "GET ")); + syslog(LOG_INFO, "[ %s]\n", cmdbuf); + + if (strncasecmp(cmdbuf, "GET ", 4)==0) { struct recptypes *rcpt; char *argbuf = &cmdbuf[4]; extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr); - rcpt = validate_recipients(internet_addr); + rcpt = validate_recipients(internet_addr, NULL, CHECK_EXISTANCE); if ((rcpt != NULL)&& ( (*rcpt->recp_local != '\0')|| @@ -1276,15 +1147,22 @@ void check_get(void) { { cprintf("200 OK %s\n", internet_addr); - lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp); + syslog(LOG_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); + syslog(LOG_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr); } - if (rcpt != NULL) free_recipients(rcpt); + if (rcpt != NULL) + free_recipients(rcpt); + } + else + { + cprintf("500 REJECT invalid Query.\n"); + + syslog(LOG_INFO, "sending 500 REJECT invalid Query: %s\n", internet_addr); } } @@ -1296,22 +1174,22 @@ void check_get_greeting(void) { /* * We don't know if the Contacts room exists so we just create it at login */ -void vcard_create_room(void) +void vcard_CtdlCreateRoom(void) { struct ctdlroom qr; - struct visit vbuf; + visit vbuf; /* Create the calendar room if it doesn't already exist */ - create_room(USERCONTACTSROOM, 4, "", 0, 1, 0, VIEW_ADDRESSBOOK); + CtdlCreateRoom(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"); + if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) { + syslog(LOG_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); + CtdlPutRoomLock(&qr); /* Set the view to a calendar view */ CtdlGetRelationship(&vbuf, &CC->user, &qr); @@ -1329,15 +1207,41 @@ void vcard_create_room(void) */ void vcard_session_login_hook(void) { struct vCard *v = NULL; + struct CitContext *CCC = CC; /* put this on the stack, just for speed */ - 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, 1); - extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v); - vcard_free(v); +#ifdef HAVE_LDAP + /* + * Is this an LDAP session? If so, copy various LDAP attributes from the directory entry + * into the user's vCard. + */ + if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) { + v = vcard_get_user(&CCC->user); + if (v) { + if (Ctdl_LDAP_to_vCard(CCC->ldap_dn, v)) { + vcard_write_user(&CCC->user, v); + } + } + } +#endif - vcard_create_room(); + /* + * Extract from the user's vCard, any Internet email addresses and the user's real name. + * These are inserted into the session data for various message entry commands to use. + */ + v = vcard_get_user(&CCC->user); + if (v) { + extract_inet_email_addrs(CCC->cs_inet_email, sizeof CCC->cs_inet_email, + CCC->cs_inet_other_emails, sizeof CCC->cs_inet_other_emails, + v, 1 + ); + extract_friendly_name(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v); + vcard_free(v); + } + + /* + * Create the user's 'Contacts' room (personal address book) if it doesn't already exist. + */ + vcard_CtdlCreateRoom(); } @@ -1419,15 +1323,14 @@ void strip_addresses_already_have(long msgnum, void *userdata) { */ void store_this_ha(struct addresses_to_be_filed *aptr) { struct CtdlMessage *vmsg = NULL; - long vmsgnum = (-1L); char *ser = NULL; struct vCard *v = NULL; char recipient[256]; int i; /* First remove any addresses we already have in the address book */ - usergoto(aptr->roomname, 0, 0, NULL, NULL); - CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL, + CtdlUserGoto(aptr->roomname, 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 (!IsEmptyStr(aptr->collected_addresses)) @@ -1444,7 +1347,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { 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)); + vmsg->cm_fields['E'] = strdup(vcard_get_prop(v, "UID", 1, 0, 0)); ser = vcard_serialize(v); if (ser != NULL) { vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024); @@ -1455,8 +1358,8 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { } vcard_free(v); - lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient); - vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname); + syslog(LOG_DEBUG, "Adding contact: %s\n", recipient); + CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR); CtdlFreeMessage(vmsg); } } @@ -1522,55 +1425,61 @@ CTDL_MODULE_INIT(vcard) struct ctdlroom qr; char filename[256]; FILE *fp; + int rv = 0; - 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"); - CtdlRegisterProtoHook(cmd_dvca, "DVCA", "Dump VCard Addresses"); - CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER); - CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER); - 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); + if (!threading) + { + 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"); + CtdlRegisterProtoHook(cmd_dvca, "DVCA", "Dump VCard Addresses"); + CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER); + CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER); + 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 */ + CtdlCreateRoom(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK); + + /* Set expiration policy to manual; otherwise objects will be lost! */ + if (!CtdlGetRoomLock(&qr, ADDRESS_BOOK_ROOM)) { + qr.QRep.expire_mode = EXPIRE_MANUAL; + qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */ + CtdlPutRoomLock(&qr); - /* 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)); - } + /* + * 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); + rv = chown(filename, CTDLUID, (-1)); + if (rv == -1) + syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", + filename, strerror(errno)); + } - /* for postfix tcpdict */ - CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */ - NULL, - check_get_greeting, - check_get, - NULL, - CitadelServiceDICT_TCP); + /* for postfix tcpdict */ + CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */ + NULL, + check_get_greeting, + check_get, + NULL, + CitadelServiceDICT_TCP); + } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our module name for the log */ + return "vcard"; }