X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=f3624bdc451e8891b0e02ccf430ca2dd64f14196;hp=07b33336cc22904369ac16e486bef82c4fb48dc8;hb=1cf98031e3530393ec5fb753567bf496c6277ab3;hpb=18dee8c3d4593cfd33a2a865470627b898111d5e diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 07b33336c..f3624bdc4 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -2,21 +2,15 @@ * A server-side module for Citadel which supports address book information * using the standard vCard format. * - * Copyright (c) 1999-2012 by the citadel.org team + * Copyright (c) 1999-2017 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. - * - * * * 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. - * - * - * - * */ /* @@ -69,6 +63,7 @@ #include "user_ops.h" #include "database.h" #include "msgbase.h" +#include "room_ops.h" #include "internet_addressing.h" #include "serv_vcard.h" #include "citadel_ldap.h" @@ -78,10 +73,12 @@ * set global flag calling for an aide to validate new users */ void set_mm_valid(void) { + int flags = 0; + begin_critical_section(S_CONTROL); - get_control(); - CitControl.MMflags = CitControl.MMflags | MM_VALID ; - put_control(); + flags = CtdlGetConfigInt("MMflags"); + flags = flags | MM_VALID ; + CtdlSetConfigInt("MMflags", flags); end_critical_section(S_CONTROL); } @@ -100,12 +97,12 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, int (*callback)(c int instance = 0; int found_something = 0; - if (msg->cm_fields['A'] == NULL) return; - if (msg->cm_fields['N'] == NULL) return; + if (CM_IsEmpty(msg, eAuthor)) return; + if (CM_IsEmpty(msg, eNodeName)) return; snprintf(citadel_address, sizeof citadel_address, "%s @ %s", - msg->cm_fields['A'], msg->cm_fields['N']); + msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]); - v = vcard_load(msg->cm_fields['M']); + v = vcard_load(msg->cm_fields[eMesageText]); if (v == NULL) return; /* Go through the vCard searching for *all* instances of @@ -132,103 +129,10 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, int (*callback)(c vcard_free(v); } -///TODO: gettext! -#define _(a) a -/* - * Callback for vcard_add_to_directory() - * (Lotsa ugly nested callbacks. Oh well.) - */ -int vcard_directory_add_user(char *internet_addr, char *citadel_addr) { - struct CitContext *CCC = CC; - 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 (CCC->logged_in) { - 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. - */ - syslog(LOG_DEBUG, "DOOP!\n"); - - StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ALREADY_EXISTS); - StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0); - StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0); - StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress again."), -1, 0); - StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n"), 0); - return 0; - } - } - } - syslog(LOG_INFO, "Adding %s (%s) to directory\n", citadel_addr, internet_addr); - if (CtdlDirectoryAddUser(internet_addr, citadel_addr)) - { - StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", CIT_OK); - StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0); - StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0); - StrBufAppendBufPlain(CCC->StatusMessage, _("successfully addded emailaddress."), -1, 0); - return 1; - } - else - { - StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE); - StrBufAppendBufPlain(CCC->StatusMessage, internet_addr, -1, 0); - StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0); - StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0); - return 0; - } -} - - -/* - * Back end function for cmd_igab() - */ -void vcard_add_to_directory(long msgnum, void *data) { - struct CtdlMessage *msg; - - msg = CtdlFetchMessage(msgnum, 1); - if (msg != NULL) { - vcard_extract_internet_addresses(msg, vcard_directory_add_user); - } - - CtdlFreeMessage(msg); -} - - -/* - * Initialize Global Adress Book - */ -void cmd_igab(char *argbuf) { - char hold_rm[ROOMNAMELEN]; - - if (CtdlAccessCheck(ac_aide)) return; - - strcpy(hold_rm, CC->room.QRname); /* save current room */ - - 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; - } - - /* Empty the existing database first. - */ - CtdlDirectoryInit(); - - /* We want *all* vCards in this room */ - NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0); - CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", - NULL, vcard_add_to_directory, NULL); - - CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ - cprintf("%d Directory has been rebuilt.\n", CIT_OK); -} +///TODO: gettext! +#define _(a) a /* @@ -319,7 +223,7 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp, if ( (!strcasecmp(cbtype, "text/x-vcard")) || (!strcasecmp(cbtype, "text/vcard")) ) { - syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...\n", partnum); + syslog(LOG_DEBUG, "vcard: part %s contains a vCard! Loading...", partnum); if (*v != NULL) { vcard_free(*v); } @@ -334,8 +238,8 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp, * function accordingly (delete the user's existing vCard in the config room * and in the global address book). */ -int vcard_upload_beforesave(struct CtdlMessage *msg) { - char *ptr; +int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) { + struct CitContext *CCC = CC; char *s; char buf[SIZ]; struct ctdluser usbuf; @@ -346,17 +250,16 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { 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 ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0); /* Only do this if logged in, or if ldap changed the vcard. */ /* Is this some user's "My Citadel Config" room? */ - if ( (CC->room.QRflags && QR_MAILBOX) - && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) { + if (((CCC->room.QRflags & QR_MAILBOX) != 0) && + (!strcasecmp(&CCC->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 < AxAideU) { + /* Prevent non-aides from performing registration changes, but ldap is ok. */ + if ((CCC->user.axlevel < AxAideU) && (CCC->vcard_updated_by_ldap==0)) { return(1); } #endif @@ -364,7 +267,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { } /* Is this a room with an address book in it? */ - if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) { + if (CCC->room.QRdefaultview == VIEW_ADDRESSBOOK) { yes_any_vcard_room = 1; } @@ -378,36 +281,39 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { /* Ok, if we got this far, look into the situation further... */ - ptr = msg->cm_fields['M']; - if (ptr == NULL) return(0); + if (CM_IsEmpty(msg, eMesageText)) return(0); - mime_parser(msg->cm_fields['M'], - NULL, - *vcard_extract_vcard, - NULL, NULL, - &v, /* user data ptr - put the vcard here */ - 0 + mime_parser(CM_RANGE(msg, eMesageText), + *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 */ /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (yes_my_citadel_config) && (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) { + if ( (yes_my_citadel_config) && + (CtdlGetConfigInt("c_disable_newu")) && + (CCC->user.axlevel < AxAideU) && + (CCC->vcard_updated_by_ldap==0) ) + { return(1); } - s = vcard_get_prop(v, "fn", 1, 0, 0); + vcard_get_prop(v, "fn", 1, 0, 0); + 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); + what_user = atol(CCC->room.QRname); - if (what_user == CC->user.usernum) { + if (what_user == CCC->user.usernum) { /* It's the logged in user. That was easy. */ - memcpy(&usbuf, &CC->user, sizeof(struct ctdluser)); + memcpy(&usbuf, &CCC->user, sizeof(struct ctdluser)); } else if (CtdlGetUserByNumber(&usbuf, what_user) == 0) { @@ -427,19 +333,18 @@ 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]$"); + CtdlDeleteMessages(CCC->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']); + if (!IsEmptyStr(usbuf.fullname)) { + CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname)); } - msg->cm_fields['A'] = strdup(usbuf.fullname); } /* Insert or replace RFC2739-compliant free/busy URL */ if (yes_my_citadel_config) { sprintf(buf, "http://%s/%s.vfb", - config.c_fqdn, + CtdlGetConfigStr("c_fqdn"), usbuf.fullname); for (i=0; buf[i]; ++i) { if (buf[i] == ' ') buf[i] = '_'; @@ -447,32 +352,30 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { vcard_set_prop(v, "FBURL;PREF", buf, 0); } - /* If the vCard has no UID, then give it one. */ + s = vcard_get_prop(v, "UID", 1, 0, 0); - if (s == NULL) { + if (s == NULL) { /* Note LDAP auth sets UID from the LDAP UUID, use that if it exists. */ + /* Enforce local UID policy if applicable */ + if (yes_my_citadel_config) { + snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME); + } else { + /* If the vCard has no UID, then give it one. */ generate_uuid(buf); - vcard_set_prop(v, "UID", buf, 0); - } + } + vcard_set_prop(v, "UID", buf, 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']); - msg->cm_fields['E'] = NULL; - } + CM_FlushField(msg, eExclusiveID); + s = vcard_get_prop(v, "UID", 1, 0, 0); - if (s != NULL) { - msg->cm_fields['E'] = strdup(s); - if (msg->cm_fields['U'] == NULL) { - msg->cm_fields['U'] = strdup(s); + if (!IsEmptyStr(s)) { + CM_SetField(msg, eExclusiveID, s, strlen(s)); + if (CM_IsEmpty(msg, eMsgSubject)) { + CM_CopyField(msg, eMsgSubject, eExclusiveID); } } @@ -483,20 +386,23 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { if (s == NULL) { s = vcard_get_prop(v, "N", 1, 0, 0); } - if (s != NULL) { - if (msg->cm_fields['U'] != NULL) { - free(msg->cm_fields['U']); - } - msg->cm_fields['U'] = strdup(s); + if (!IsEmptyStr(s)) { + CM_SetField(msg, eMsgSubject, s, strlen(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: " VCARD_MIME_TYPE - "\r\n\r\n%s\r\n", ser); + if (!IsEmptyStr(ser)) { + StrBuf *buf; + long serlen; + + serlen = strlen(ser); + buf = NewStrBufPlain(NULL, serlen + 1024); + + StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0); + StrBufAppendBufPlain(buf, ser, serlen, 0); + StrBufAppendBufPlain(buf, HKEY("\r\n"), 0); + CM_SetAsFieldSB(msg, eMesageText, &buf); free(ser); } @@ -513,7 +419,8 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { * function accordingly (copy the vCard from the config room to the global * address book). */ -int vcard_upload_aftersave(struct CtdlMessage *msg) { +int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) { + struct CitContext *CCC = CC; char *ptr; int linelen; long I; @@ -524,30 +431,36 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { char roomname[ROOMNAMELEN]; if (msg->cm_format_type != 4) return(0); - if (!CC->logged_in) return(0); /* Only do this if logged in. */ + if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0); /* Only do this if logged in, or if ldap changed the vcard. */ /* We're interested in user config rooms only. */ - if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) { + if ( !IsEmptyStr(CCC->room.QRname) && + (strlen(CCC->room.QRname) >= 12) && + (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) { is_UserConf = 1; /* It's someone's config room */ } - CtdlMailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM); - if (!strcasecmp(CC->room.QRname, roomname)) { + CtdlMailboxName(roomname, sizeof roomname, &CCC->user, USERCONFIGROOM); + if (!strcasecmp(CCC->room.QRname, roomname)) { is_UserConf = 1; is_MY_UserConf = 1; /* It's MY config room */ } - if (!strcasecmp(CC->room.QRname, ADDRESS_BOOK_ROOM)) { + if (!strcasecmp(CCC->room.QRname, ADDRESS_BOOK_ROOM)) { is_GAB = 1; /* It's the Global Address Book */ } if (!is_UserConf && !is_GAB) return(0); - ptr = msg->cm_fields['M']; - if (ptr == NULL) return(0); + if (CM_IsEmpty(msg, eMesageText)) + return 0; - NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0); + ptr = msg->cm_fields[eMesageText]; - StrBufPrintf(CC->StatusMessage, "%d\n", LISTING_FOLLOWS); + CCC->vcard_updated_by_ldap=0; /* As this will write LDAP's previous changes, disallow LDAP change auth until next LDAP change. */ + + NewStrBufDupAppendFlush(&CCC->StatusMessage, NULL, NULL, 0); + + StrBufPrintf(CCC->StatusMessage, "%d\n", LISTING_FOLLOWS); while (ptr != NULL) { @@ -561,16 +474,13 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { * copy it to the Global Address Book room. */ - I = atol(msg->cm_fields['3']); + I = atol(msg->cm_fields[eVltMsgNum]); if (I <= 0L) return(0); - /* Store our Internet return address in memory */ + /* Store our friendly/display name in memory */ 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); + v = vcard_load(msg->cm_fields[eMesageText]); + extract_friendly_name(CCC->cs_inet_fn, sizeof CCC->cs_inet_fn, v); vcard_free(v); } @@ -580,27 +490,24 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { 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 * 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); + if (CCC->user.axlevel >= AxAideU) { + CtdlLockGetCurrentUser(); + CCC->user.flags |= US_REGIS; + CtdlPutCurrentUserLock(); return (0); } set_mm_valid(); /* ...which also means we need to flag the user */ - CtdlGetUserLock(&CC->user, CC->curr_user); - CC->user.flags |= (US_REGIS|US_NEEDVALID); - CtdlPutUserLock(&CC->user); + CtdlLockGetCurrentUser(); + CCC->user.flags |= (US_REGIS|US_NEEDVALID); + CtdlPutCurrentUserLock(); return(0); } @@ -630,17 +537,18 @@ void vcard_gu_backend(long supplied_msgnum, void *userdata) { * and return an empty vCard. */ struct vCard *vcard_get_user(struct ctdluser *u) { + struct CitContext *CCC = CC; char hold_rm[ROOMNAMELEN]; char config_rm[ROOMNAMELEN]; struct CtdlMessage *msg = NULL; struct vCard *v; long VCmsgnum; - strcpy(hold_rm, CC->room.QRname); /* save current room */ + strcpy(hold_rm, CCC->room.QRname); /* save current room */ CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM); - if (CtdlGetRoom(&CC->room, config_rm) != 0) { - CtdlGetRoom(&CC->room, hold_rm); + if (CtdlGetRoom(&CCC->room, config_rm) != 0) { + CtdlGetRoom(&CCC->room, hold_rm); return vcard_new(); } @@ -648,15 +556,15 @@ struct vCard *vcard_get_user(struct ctdluser *u) { VCmsgnum = (-1); CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL, vcard_gu_backend, (void *)&VCmsgnum ); - CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */ + CtdlGetRoom(&CCC->room, hold_rm); /* return to saved room */ if (VCmsgnum < 0L) return vcard_new(); - msg = CtdlFetchMessage(VCmsgnum, 1); + msg = CtdlFetchMessage(VCmsgnum, 1, 1); if (msg == NULL) return vcard_new(); - v = vcard_load(msg->cm_fields['M']); - CtdlFreeMessage(msg); + v = vcard_load(msg->cm_fields[eMesageText]); + CM_Free(msg); return v; } @@ -674,7 +582,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) { if (ser == NULL) { ser = strdup("begin:vcard\r\nend:vcard\r\n"); } - if (!ser) return; + if (ser == NULL) return; /* This handy API function does all the work for us. * NOTE: normally we would want to set that last argument to 1, to @@ -702,6 +610,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) { * and enters the vCard into the user's configuration. */ void cmd_regi(char *argbuf) { + struct CitContext *CCC = CC; int a,b,c; char buf[SIZ]; struct vCard *my_vcard; @@ -715,18 +624,18 @@ void cmd_regi(char *argbuf) { unbuffer_output(); - if (!(CC->logged_in)) { + if (!(CCC->logged_in)) { cprintf("%d Not logged in.\n",ERROR + NOT_LOGGED_IN); return; } /* If users cannot create their own accounts, they cannot re-register either. */ - if ( (config.c_disable_newu) && (CC->user.axlevel < AxAideU) ) { + if ( (CtdlGetConfigInt("c_disable_newu")) && (CCC->user.axlevel < AxAideU) ) { cprintf("%d Self-service registration is not allowed here.\n", ERROR + HIGHER_ACCESS_REQUIRED); } - my_vcard = vcard_get_user(&CC->user); + my_vcard = vcard_get_user(&CCC->user); strcpy(tmpaddr, ""); strcpy(tmpcity, ""); strcpy(tmpstate, ""); @@ -758,7 +667,7 @@ void cmd_regi(char *argbuf) { 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->user, my_vcard); + vcard_write_user(&CCC->user, my_vcard); vcard_free(my_vcard); } @@ -768,6 +677,7 @@ void cmd_regi(char *argbuf) { */ void cmd_greg(char *argbuf) { + struct CitContext *CCC = CC; struct ctdluser usbuf; struct vCard *v; char *s; @@ -777,16 +687,15 @@ void cmd_greg(char *argbuf) extract_token(who, argbuf, 0, '|', sizeof who); - if (!(CC->logged_in)) { + if (!(CCC->logged_in)) { cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); return; } - if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user); + if (!strcasecmp(who,"_SELF_")) strcpy(who,CCC->curr_user); - if ((CC->user.axlevel < AxAideU) && (strcasecmp(who,CC->curr_user))) { - cprintf("%d Higher access required.\n", - ERROR + HIGHER_ACCESS_REQUIRED); + if ((CCC->user.axlevel < AxAideU) && (strcasecmp(who,CCC->curr_user))) { + cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED); return; } @@ -801,11 +710,9 @@ void cmd_greg(char *argbuf) cprintf("%ld\n", usbuf.usernum); cprintf("%s\n", usbuf.password); s = vcard_get_prop(v, "n", 1, 0, 0); - cprintf("%s\n", s ? s : " "); /* name */ - + cprintf("%s\n", s ? s : " "); /* name */ s = vcard_get_prop(v, "adr", 1, 0, 0); - snprintf(adr, sizeof adr, "%s", s ? s : " ");/* address... */ - + snprintf(adr, sizeof adr, "%s", s ? s : " "); /* address */ extract_token(buf, adr, 2, ';', sizeof buf); cprintf("%s\n", buf); /* street */ extract_token(buf, adr, 3, ';', sizeof buf); @@ -847,9 +754,11 @@ void vcard_newuser(struct ctdluser *usbuf) { char buf[256]; int i; struct vCard *v; + int need_default_vcard; + need_default_vcard =1; vcard_fn_to_n(vname, usbuf->fullname, sizeof vname); - syslog(LOG_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname); + syslog(LOG_DEBUG, "vcard: converted <%s> to <%s>", usbuf->fullname, vname); /* Create and save the vCard */ v = vcard_new(); @@ -860,7 +769,7 @@ void vcard_newuser(struct ctdluser *usbuf) { #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) { + if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) { struct passwd pwd; char pwd_buffer[SIZ]; @@ -868,23 +777,50 @@ void vcard_newuser(struct ctdluser *usbuf) { 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); + syslog(LOG_DEBUG, "vcard: searching for uid %d", 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); + snprintf(buf, sizeof buf, "%s@%s", pwd.pw_name, CtdlGetConfigStr("c_fqdn")); vcard_add_prop(v, "email;internet", buf); + need_default_vcard = 0; } } #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); - +#ifdef HAVE_LDAP + /* + * Is this an LDAP session? If so, copy various LDAP attributes from the directory entry + * into the user's vCard. + */ + if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) { + //uid_t ldap_uid; + int found_user; + char ldap_cn[512]; + char ldap_dn[512]; + +syslog(LOG_DEBUG, "\033[31m FIXME BORK BORK BORK try lookup by uid , or maybe dn?\033[0m"); + + + found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid); + if (found_user == 0) { + if (Ctdl_LDAP_to_vCard(ldap_dn, v)) { + /* Allow global address book and internet directory update without login long enough to write this. */ + CC->vcard_updated_by_ldap++; /* Otherwise we'll only update the user config. */ + need_default_vcard = 0; + syslog(LOG_DEBUG, "vcard: LDAP Created Initial vCard for %s\n",usbuf->fullname); + } + } + } +#endif + if (need_default_vcard!=0) { + /* Everyone gets an email address based on their display name */ + snprintf(buf, sizeof buf, "%s@%s", usbuf->fullname, CtdlGetConfigStr("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); } @@ -898,6 +834,7 @@ void vcard_newuser(struct ctdluser *usbuf) { void vcard_purge(struct ctdluser *usbuf) { struct CtdlMessage *msg; char buf[SIZ]; + long len; msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); if (msg == NULL) return; @@ -906,19 +843,18 @@ void vcard_purge(struct ctdluser *usbuf) { 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, - msg->cm_fields['A'], NODENAME); - msg->cm_fields['E'] = strdup(buf); - - msg->cm_fields['S'] = strdup("CANCEL"); + if (!IsEmptyStr(usbuf->fullname)) { + CM_SetField(msg, eAuthor, usbuf->fullname, strlen(usbuf->fullname)); + } + CM_SetField(msg, eOriginalRoom, HKEY(ADDRESS_BOOK_ROOM)); + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); + CM_SetField(msg, eMesageText, HKEY("Purge this vCard\n")); + len = snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields[eAuthor], NODENAME); + CM_SetField(msg, eExclusiveID, buf, len); + CM_SetField(msg, eSpecialField, HKEY("CANCEL")); CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM, QP_EADDR); - CtdlFreeMessage(msg); + CM_Free(msg); } @@ -937,8 +873,11 @@ int vcard_extract_from_network(struct CtdlMessage *msg, char *target_room) { if (msg->cm_format_type != 4) return(0); - ptr = msg->cm_fields['M']; - if (ptr == NULL) return(0); + if (CM_IsEmpty(msg, eMesageText)) + return 0; + + ptr = msg->cm_fields[eMesageText]; + while (ptr != NULL) { linelen = strcspn(ptr, "\n"); @@ -977,11 +916,14 @@ void vcard_delete_remove(char *room, long msgnum) { return; } - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) return; - ptr = msg->cm_fields['M']; - if (ptr == NULL) goto EOH; + if (CM_IsEmpty(msg, eMesageText)) + goto EOH; + + ptr = msg->cm_fields[eMesageText]; + while (ptr != NULL) { linelen = strcspn(ptr, "\n"); if (linelen == 0) goto EOH; @@ -995,7 +937,7 @@ void vcard_delete_remove(char *room, long msgnum) { if (ptr != NULL) ++ptr; } -EOH: CtdlFreeMessage(msg); +EOH: CM_Free(msg); } @@ -1005,12 +947,14 @@ EOH: CtdlFreeMessage(msg); */ void cmd_gvsn(char *argbuf) { + struct CitContext *CCC = CC; + if (CtdlAccessCheck(ac_logged_in)) return; cprintf("%d valid screen names:\n", LISTING_FOLLOWS); - cprintf("%s\n", CC->user.fullname); - if ( (!IsEmptyStr(CC->cs_inet_fn)) && (strcasecmp(CC->user.fullname, CC->cs_inet_fn)) ) { - cprintf("%s\n", CC->cs_inet_fn); + cprintf("%s\n", CCC->user.fullname); + if ( (!IsEmptyStr(CCC->cs_inet_fn)) && (strcasecmp(CCC->user.fullname, CCC->cs_inet_fn)) ) { + cprintf("%s\n", CCC->cs_inet_fn); } cprintf("000\n"); } @@ -1018,9 +962,11 @@ void cmd_gvsn(char *argbuf) /* * Get Valid Email Addresses + * FIXME this doesn't belong in serv_vcard.c anymore , maybe move it to internet_addressing.c */ void cmd_gvea(char *argbuf) { + struct CitContext *CCC = CC; int num_secondary_emails = 0; int i; char buf[256]; @@ -1028,13 +974,13 @@ void cmd_gvea(char *argbuf) if (CtdlAccessCheck(ac_logged_in)) return; cprintf("%d valid email addresses:\n", LISTING_FOLLOWS); - if (!IsEmptyStr(CC->cs_inet_email)) { - cprintf("%s\n", CC->cs_inet_email); + if (!IsEmptyStr(CCC->cs_inet_email)) { + cprintf("%s\n", CCC->cs_inet_email); } - if (!IsEmptyStr(CC->cs_inet_other_emails)) { - num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|'); + if (!IsEmptyStr(CCC->cs_inet_other_emails)) { + num_secondary_emails = num_tokens(CCC->cs_inet_other_emails, '|'); for (i=0; ics_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails); + extract_token(buf, CCC->cs_inet_other_emails,i,'|',sizeof CCC->cs_inet_other_emails); cprintf("%s\n", buf); } } @@ -1042,8 +988,6 @@ void cmd_gvea(char *argbuf) } - - /* * Callback function for cmd_dvca() that hunts for vCard content types * and outputs any email addresses found within. @@ -1098,16 +1042,15 @@ void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp, void dvca_callback(long msgnum, void *userdata) { struct CtdlMessage *msg = NULL; - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) return; - mime_parser(msg->cm_fields['M'], - NULL, - *dvca_mime_callback, /* callback function */ - NULL, NULL, - NULL, /* user data */ - 0 - ); - CtdlFreeMessage(msg); + mime_parser(CM_RANGE(msg, eMesageText), + *dvca_mime_callback, /* callback function */ + NULL, NULL, + NULL, /* user data */ + 0 + ); + CM_Free(msg); } @@ -1144,6 +1087,7 @@ void cmd_qdir(char *argbuf) { cprintf("%d %s\n", CIT_OK, citadel_addr); } + /* * Query Directory, in fact an alias to match postfix tcp auth. */ @@ -1155,17 +1099,17 @@ void check_get(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - syslog(LOG_CRIT, "vcard client disconnected: ending session.\n"); + syslog(LOG_ERR, "vcard: client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - syslog(LOG_INFO, ": %s\n", cmdbuf); + syslog(LOG_INFO, ": %s", cmdbuf); while (strlen(cmdbuf) < 3) strcat(cmdbuf, " "); - syslog(LOG_INFO, "[ %s]\n", cmdbuf); + syslog(LOG_INFO, "[ %s]", cmdbuf); if (strncasecmp(cmdbuf, "GET ", 4)==0) { - struct recptypes *rcpt; + recptypes *rcpt; char *argbuf = &cmdbuf[4]; extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr); @@ -1178,22 +1122,20 @@ void check_get(void) { { cprintf("200 OK %s\n", internet_addr); - syslog(LOG_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp); + syslog(LOG_INFO, "vcard: sending 200 OK for the room %s", rcpt->display_recp); } else { cprintf("500 REJECT noone here by that name.\n"); - syslog(LOG_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr); + syslog(LOG_INFO, "vcard: sending 500 REJECT no one here by that name: %s", internet_addr); } if (rcpt != NULL) free_recipients(rcpt); } - else - { + else { cprintf("500 REJECT invalid Query.\n"); - - syslog(LOG_INFO, "sending 500 REJECT invalid Query: %s\n", internet_addr); + syslog(LOG_INFO, "vcard: sending 500 REJECT invalid query: %s", internet_addr); } } @@ -1215,7 +1157,7 @@ void vcard_CtdlCreateRoom(void) /* Set expiration policy to manual; otherwise objects will be lost! */ if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) { - syslog(LOG_ERR, "Couldn't get the user CONTACTS room!\n"); + syslog(LOG_ERR, "vcard: couldn't get the user CONTACTS room!"); return; } qr.QRep.expire_mode = EXPIRE_MANUAL; @@ -1245,10 +1187,12 @@ void vcard_session_login_hook(void) { * 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)) { + if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) { v = vcard_get_user(&CCC->user); if (v) { if (Ctdl_LDAP_to_vCard(CCC->ldap_dn, v)) { + CCC->vcard_updated_by_ldap++; /* Make sure changes make it to the global address book and internet directory, not just the user config. */ + syslog(LOG_DEBUG, "vcard: LDAP Detected vcard change"); vcard_write_user(&CCC->user, v); } } @@ -1256,15 +1200,11 @@ void vcard_session_login_hook(void) { #endif /* - * Extract from the user's vCard, any Internet email addresses and the user's real name. + * Extract the user's friendly/screen 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); } @@ -1323,10 +1263,10 @@ void strip_addresses_already_have(long msgnum, void *userdata) { collected_addresses = (char *)userdata; - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) return; - v = vcard_load(msg->cm_fields['M']); - CtdlFreeMessage(msg); + v = vcard_load(msg->cm_fields[eMesageText]); + CM_Free(msg); i = 0; while (value = vcard_get_prop(v, "email", 1, i++, 0), value != NULL) { @@ -1360,7 +1300,7 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { int i; /* First remove any addresses we already have in the address book */ - CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL); + CtdlUserGoto(aptr->roomname, 0, 0, NULL, NULL, NULL, NULL); CtdlForEachMessage(MSGS_ALL, 0, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL, strip_addresses_already_have, aptr->collected_addresses); @@ -1372,26 +1312,36 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { striplt(recipient); v = vcard_new_from_rfc822_addr(recipient); if (v != NULL) { + const char *s; 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", 1, 0, 0)); + CM_SetField(vmsg, eAuthor, HKEY("Citadel")); + s = vcard_get_prop(v, "UID", 1, 0, 0); + if (!IsEmptyStr(s)) { + CM_SetField(vmsg, eExclusiveID, s, strlen(s)); + } ser = vcard_serialize(v); if (ser != NULL) { - vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024); - sprintf(vmsg->cm_fields['M'], - "Content-type: " VCARD_MIME_TYPE - "\r\n\r\n%s\r\n", ser); + StrBuf *buf; + long serlen; + + serlen = strlen(ser); + buf = NewStrBufPlain(NULL, serlen + 1024); + + StrBufAppendBufPlain(buf, HKEY("Content-type: " VCARD_MIME_TYPE "\r\n\r\n"), 0); + StrBufAppendBufPlain(buf, ser, serlen, 0); + StrBufAppendBufPlain(buf, HKEY("\r\n"), 0); + CM_SetAsFieldSB(vmsg, eMesageText, &buf); free(ser); } vcard_free(v); - syslog(LOG_DEBUG, "Adding contact: %s\n", recipient); + syslog(LOG_DEBUG, "vcard: adding contact: %s", recipient); CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR); - CtdlFreeMessage(vmsg); + CM_Free(vmsg); } } @@ -1454,19 +1404,18 @@ const char *CitadelServiceDICT_TCP="DICT_TCP"; CTDL_MODULE_INIT(vcard) { struct ctdlroom qr; - char filename[256]; - FILE *fp; - int rv = 0; + //char filename[256]; + //FILE *fp; + //int rv = 0; if (!threading) { - CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN); + CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN, PRIO_LOGIN + 70); 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"); @@ -1474,11 +1423,11 @@ CTDL_MODULE_INIT(vcard) CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER); CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER); CtdlRegisterNetprocHook(vcard_extract_from_network); - CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER); + CtdlRegisterSessionHook(store_harvested_addresses, EVT_TIMER, PRIO_CLEANUP + 470); CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output); CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output); - /* Create the Global ADdress Book room if necessary */ + /* 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! */ @@ -1492,18 +1441,30 @@ CTDL_MODULE_INIT(vcard) * 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. + * + * FIXME this no longer works + * */ - 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)); + //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_ERR, "vcard: failed to adjust ownership of %s: %m", filename); + //} + //rv = chmod(filename, 0600); + //if (rv == -1) { + //syslog(LOG_ERR, "vcard: failed to adjust ownership of %s: %m", filename); + //} + //} + //else { + //syslog(LOG_ERR, "vcard: cannot create %s: %m", filename); + //} } /* for postfix tcpdict */ - CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */ + CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"), /* Postfix */ NULL, check_get_greeting, check_get,