X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fvcard%2Fserv_vcard.c;h=9505ba1852efd110e7dca1a496878bfa3ccaf0d4;hb=62ef1542cefd2c2ff068a8b65d86d2e2a41c5ad8;hp=18b30ae6eadb883d1b301b36e469b5fde8af4991;hpb=c2a329d11a3ef37971f567cc10ac42c42342a96b;p=citadel.git diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 18b30ae6e..9505ba185 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -1,10 +1,16 @@ /* - * $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-2012 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. */ /* @@ -54,18 +60,14 @@ #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 "serv_vcard.h" - +#include "citadel_ldap.h" #include "ctdl_module.h" - - /* * set global flag calling for an aide to validate new users */ @@ -83,8 +85,7 @@ 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, int (*callback)(char *, char *) ) { struct vCard *v; char *s; char *k; @@ -125,33 +126,55 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg, vcard_free(v); } - - +///TODO: gettext! +#define _(a) a /* * Callback for vcard_add_to_directory() * (Lotsa ugly nested callbacks. Oh well.) */ -void vcard_directory_add_user(char *internet_addr, char *citadel_addr) { +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 (CC->logged_in) { - CtdlLogPrintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr); + if (CCC->logged_in) { + syslog(LOG_DEBUG, "Checking for <%s>...", 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. */ - CtdlLogPrintf(CTDL_DEBUG, "DOOP!\n"); - return; + syslog(LOG_DEBUG, "DOOP!"); + + 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 email address again."), -1, 0); + StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n"), 0); + return 0; } } } - CtdlLogPrintf(CTDL_INFO, "Adding %s (%s) to directory\n", citadel_addr, internet_addr); - CtdlDirectoryAddUser(internet_addr, citadel_addr); + syslog(LOG_INFO, "Adding %s (%s) to directory", 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 added email address."), -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 email address. It does not match any local domain."), -1, 0); + return 0; + } } @@ -180,8 +203,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; } @@ -191,10 +214,11 @@ 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]$", + 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); - 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); } @@ -206,10 +230,14 @@ void cmd_igab(char *argbuf) { * 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, int local_addrs_only) { + char *secemailaddrbuf, size_t secemailaddrbuf_len, + struct vCard *v, + int local_addrs_only) +{ + struct CitContext *CCC = CC; /* put this on the stack, just for speed */ char *s, *k, *addr; int instance = 0; + int IsDirectoryAddress; int saved_instance = 0; /* Go through the vCard searching for *all* Internet email addresses @@ -220,8 +248,9 @@ void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len, addr = strdup(s); striplt(addr); if (!IsEmptyStr(addr)) { - if ( (IsDirectory(addr, 1)) || - (!local_addrs_only) ) { + IsDirectoryAddress = IsDirectory(addr, 1); + if ( IsDirectoryAddress || !local_addrs_only) + { ++saved_instance; if ((saved_instance == 1) && (emailaddrbuf != NULL)) { safestrncpy(emailaddrbuf, addr, emailaddrbuf_len); @@ -237,6 +266,13 @@ void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len, } } } + if (!IsDirectoryAddress && local_addrs_only) + { + StrBufAppendPrintf(CCC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE); + StrBufAppendBufPlain(CCC->StatusMessage, addr, -1, 0); + StrBufAppendBufPlain(CCC->StatusMessage, HKEY("|"), 0); + StrBufAppendBufPlain(CCC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0); + } } free(addr); } @@ -277,7 +313,7 @@ void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp, if ( (!strcasecmp(cbtype, "text/x-vcard")) || (!strcasecmp(cbtype, "text/vcard")) ) { - CtdlLogPrintf(CTDL_DEBUG, "Part %s contains a vCard! Loading...\n", partnum); + syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...", partnum); if (*v != NULL) { vcard_free(*v); } @@ -314,7 +350,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) { #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 @@ -350,12 +386,11 @@ 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", 1, 0, 0); - if (s) CtdlLogPrintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s); + vcard_get_prop(v, "fn", 1, 0, 0); if (yes_my_citadel_config) { /* Bingo! The user is uploading a new vCard, so @@ -369,7 +404,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 */ } @@ -386,7 +421,7 @@ 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(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) { @@ -490,7 +525,7 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { if ( (strlen(CC->room.QRname) >= 12) && (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) { is_UserConf = 1; /* It's someone's config room */ } - MailboxName(roomname, sizeof roomname, &CC->user, USERCONFIGROOM); + 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 */ @@ -503,6 +538,11 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { ptr = msg->cm_fields['M']; if (ptr == NULL) return(0); + + NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0); + + StrBufPrintf(CC->StatusMessage, "%d\n", LISTING_FOLLOWS); + while (ptr != NULL) { linelen = strcspn(ptr, "\n"); @@ -515,8 +555,8 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { * copy it to the Global Address Book room. */ - I = atol(msg->cm_fields['I']); - if (I < 0L) return(0); + I = atol(msg->cm_fields['3']); + if (I <= 0L) return(0); /* Store our Internet return address in memory */ if (is_MY_UserConf) { @@ -542,19 +582,19 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) { * 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 >= 6) { - lgetuser(&CC->user, CC->curr_user); + if (CC->user.axlevel >= AxAideU) { + CtdlGetUserLock(&CC->user, CC->curr_user); CC->user.flags |= US_REGIS; - lputuser(&CC->user); + 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); } @@ -591,18 +631,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(); @@ -675,7 +715,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); } @@ -738,13 +778,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; } @@ -803,7 +843,7 @@ void vcard_newuser(struct ctdluser *usbuf) { struct vCard *v; vcard_fn_to_n(vname, usbuf->fullname, sizeof vname); - CtdlLogPrintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname); + syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname); /* Create and save the vCard */ v = vcard_new(); @@ -822,7 +862,7 @@ 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; - CtdlLogPrintf(CTDL_DEBUG, "Searching for uid %d\n", usbuf->uid); + syslog(LOG_DEBUG, "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); @@ -1007,9 +1047,9 @@ void dvca_mime_callback(char *name, char *filename, char *partnum, char *disp, char *cbid, void *cbuserdata) { struct vCard *v; - char displayname[256]; + char displayname[256] = ""; int displayname_len; - char emailaddr[256]; + char emailaddr[256] = ""; int i; int has_commas = 0; @@ -1109,14 +1149,15 @@ void check_get(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n"); - CC->kill_me = 1; + syslog(LOG_CRIT, "vcard client disconnected: ending session."); + CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - CtdlLogPrintf(CTDL_INFO, ": %s\n", cmdbuf); + syslog(LOG_INFO, ": %s", cmdbuf); while (strlen(cmdbuf) < 3) strcat(cmdbuf, " "); - - if (strcasecmp(cmdbuf, "GET ")); + syslog(LOG_INFO, "[ %s]", cmdbuf); + + if (strncasecmp(cmdbuf, "GET ", 4)==0) { struct recptypes *rcpt; char *argbuf = &cmdbuf[4]; @@ -1131,15 +1172,20 @@ void check_get(void) { { cprintf("200 OK %s\n", internet_addr); - CtdlLogPrintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp); + syslog(LOG_INFO, "sending 200 OK for the room %s", rcpt->display_recp); } else { cprintf("500 REJECT noone here by that name.\n"); - CtdlLogPrintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr); + syslog(LOG_INFO, "sending 500 REJECT no one here by that name: %s", 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", internet_addr); } } @@ -1151,22 +1197,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)) { - CtdlLogPrintf(CTDL_ERR, "Couldn't get the user CONTACTS room!\n"); + if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) { + syslog(LOG_ERR, "Couldn't get the user CONTACTS room!"); 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); @@ -1192,11 +1238,12 @@ void vcard_session_login_hook(void) { * into the user's vCard. */ if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) { - - /* FIXME do something with this. - * The DN of the account will be found in: CCC->ldap_dn - */ - + v = vcard_get_user(&CCC->user); + if (v) { + if (Ctdl_LDAP_to_vCard(CCC->ldap_dn, v)) { + vcard_write_user(&CCC->user, v); + } + } } #endif @@ -1217,7 +1264,7 @@ void vcard_session_login_hook(void) { /* * Create the user's 'Contacts' room (personal address book) if it doesn't already exist. */ - vcard_create_room(); + vcard_CtdlCreateRoom(); } @@ -1299,15 +1346,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)) @@ -1335,8 +1381,8 @@ void store_this_ha(struct addresses_to_be_filed *aptr) { } vcard_free(v); - CtdlLogPrintf(CTDL_DEBUG, "Adding contact: %s\n", recipient); - vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR); + syslog(LOG_DEBUG, "Adding contact: %s", recipient); + CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR); CtdlFreeMessage(vmsg); } } @@ -1425,13 +1471,13 @@ CTDL_MODULE_INIT(vcard) 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); + CtdlCreateRoom(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)) { + if (!CtdlGetRoomLock(&qr, ADDRESS_BOOK_ROOM)) { qr.QRep.expire_mode = EXPIRE_MANUAL; qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */ - lputroom(&qr); + CtdlPutRoomLock(&qr); /* * Also make sure it has a netconfig file, so the networker runs @@ -1443,6 +1489,9 @@ CTDL_MODULE_INIT(vcard) 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]", + filename, strerror(errno)); } /* for postfix tcpdict */ @@ -1454,6 +1503,6 @@ CTDL_MODULE_INIT(vcard) CitadelServiceDICT_TCP); } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our module name for the log */ + return "vcard"; }