* A server-side module for Citadel which supports address book information
* using the standard vCard format.
*
- * Copyright (c) 1999-2015 by the citadel.org team
+ * Copyright (c) 1999-2020 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.
}
-
-/*
- * 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, int (*callback)(char *, char *) ) {
- struct vCard *v;
- char *s;
- char *k;
- char *addr;
- char citadel_address[SIZ];
- int instance = 0;
- int found_something = 0;
-
- if (CM_IsEmpty(msg, eAuthor)) return;
- if (CM_IsEmpty(msg, eNodeName)) return;
- snprintf(citadel_address, sizeof citadel_address, "%s @ %s",
- msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
-
- v = vcard_load(msg->cm_fields[eMesageText]);
- if (v == NULL) return;
-
- /* Go through the vCard searching for *all* instances of
- * the "email;internet" key
- */
- do {
- 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)) {
- if (callback != NULL) {
- callback(addr, citadel_address);
- }
- }
- free(addr);
- found_something = 1;
- }
- else {
- found_something = 0;
- }
- } while(found_something);
-
- 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>...", 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!");
-
- 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;
- }
- }
- }
- 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;
- }
-}
-
-
-/*
- * Back end function for cmd_igab()
- */
-void vcard_add_to_directory(long msgnum, void *data) {
- struct CtdlMessage *msg;
-
- msg = CtdlFetchMessage(msgnum, 1, 1);
- if (msg != NULL) {
- vcard_extract_internet_addresses(msg, vcard_directory_add_user);
- }
-
- CM_Free(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);
-}
-
-
-
/*
* See if there is a valid Internet address in a vCard to use for outbound
void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len,
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 */
+ int local_addrs_only
+) {
char *s, *k, *addr;
int instance = 0;
int IsDirectoryAddress;
striplt(addr);
if (!IsEmptyStr(addr)) {
IsDirectoryAddress = IsDirectory(addr, 1);
+
+ syslog(LOG_DEBUG, "EVQ: addr=<%s> IsDirectoryAddress=<%d> local_addrs_only=<%d>", addr, IsDirectoryAddress, local_addrs_only);
+
if ( IsDirectoryAddress || !local_addrs_only)
{
++saved_instance;
}
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);
+ StrBufAppendPrintf(CC->StatusMessage, "\n%d|", ERROR+ ILLEGAL_VALUE);
+ StrBufAppendBufPlain(CC->StatusMessage, addr, -1, 0);
+ StrBufAppendBufPlain(CC->StatusMessage, HKEY("|"), 0);
+ StrBufAppendBufPlain(CC->StatusMessage, _("unable to add this emailaddress; its not matching our domain."), -1, 0);
}
}
free(addr);
}
-
/*
* See if there is a name / screen name / friendly name in a vCard to use for outbound
* Internet messages. If there is, stick it in the buffer.
if ( (!strcasecmp(cbtype, "text/x-vcard"))
|| (!strcasecmp(cbtype, "text/vcard")) ) {
- syslog(LOG_DEBUG, "Part %s contains a vCard! Loading...", partnum);
+ syslog(LOG_DEBUG, "vcard: part %s contains a vCard! Loading...", partnum);
if (*v != NULL) {
vcard_free(*v);
}
* and in the global address book).
*/
int vcard_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
- struct CitContext *CCC = CC;
char *s;
char buf[SIZ];
struct ctdluser usbuf;
int yes_my_citadel_config = 0;
int yes_any_vcard_room = 0;
- if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0); /* Only do this if logged in, or if ldap changed the vcard. */
+ if ((!CC->logged_in) && (CC->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 (((CCC->room.QRflags & QR_MAILBOX) != 0) &&
- (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
+ if (((CC->room.QRflags & QR_MAILBOX) != 0) &&
+ (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
/* Yes, we want to do this */
yes_my_citadel_config = 1;
#ifdef VCARD_SAVES_BY_AIDES_ONLY
/* Prevent non-aides from performing registration changes, but ldap is ok. */
- if ((CCC->user.axlevel < AxAideU) && (CCC->vcard_updated_by_ldap==0)) {
+ if ((CC->user.axlevel < AxAideU) && (CC->vcard_updated_by_ldap==0)) {
return(1);
}
#endif
}
/* Is this a room with an address book in it? */
- if (CCC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
+ if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
yes_any_vcard_room = 1;
}
/* If users cannot create their own accounts, they cannot re-register either. */
if ( (yes_my_citadel_config) &&
(CtdlGetConfigInt("c_disable_newu")) &&
- (CCC->user.axlevel < AxAideU) &&
- (CCC->vcard_updated_by_ldap==0) )
+ (CC->user.axlevel < AxAideU) &&
+ (CC->vcard_updated_by_ldap==0) )
{
return(1);
}
* delete the old one. First, figure out which user
* is being re-registered...
*/
- what_user = atol(CCC->room.QRname);
+ what_user = atol(CC->room.QRname);
- if (what_user == CCC->user.usernum) {
+ if (what_user == CC->user.usernum) {
/* It's the logged in user. That was easy. */
- memcpy(&usbuf, &CCC->user, sizeof(struct ctdluser));
+ memcpy(&usbuf, &CC->user, sizeof(struct ctdluser));
}
else if (CtdlGetUserByNumber(&usbuf, what_user) == 0) {
* vCard in the user's config room at all times.
*
*/
- CtdlDeleteMessages(CCC->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. */
- CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
+ if (!IsEmptyStr(usbuf.fullname)) {
+ CM_SetField(msg, eAuthor, usbuf.fullname, strlen(usbuf.fullname));
+ }
}
/* Insert or replace RFC2739-compliant free/busy URL */
CM_FlushField(msg, eExclusiveID);
s = vcard_get_prop(v, "UID", 1, 0, 0);
- if (s != NULL) {
+ if (!IsEmptyStr(s)) {
CM_SetField(msg, eExclusiveID, s, strlen(s));
if (CM_IsEmpty(msg, eMsgSubject)) {
CM_CopyField(msg, eMsgSubject, eExclusiveID);
if (s == NULL) {
s = vcard_get_prop(v, "N", 1, 0, 0);
}
- if (s != NULL) {
+ 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) {
+ if (!IsEmptyStr(ser)) {
StrBuf *buf;
long serlen;
}
-
/*
* This handler detects whether the user is attempting to save a new
* vCard as part of his/her personal configuration, and handles the replace
* address book).
*/
int vcard_upload_aftersave(struct CtdlMessage *msg, recptypes *recp) {
- struct CitContext *CCC = CC;
char *ptr;
int linelen;
long I;
char roomname[ROOMNAMELEN];
if (msg->cm_format_type != 4) return(0);
- if ((!CCC->logged_in) && (CCC->vcard_updated_by_ldap==0)) return(0); /* Only do this if logged in, or if ldap changed the vcard. */
+ if ((!CC->logged_in) && (CC->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(CCC->room.QRname) >= 12) && (!strcasecmp(&CCC->room.QRname[11], USERCONFIGROOM)) ) {
+ if ( !IsEmptyStr(CC->room.QRname) &&
+ (strlen(CC->room.QRname) >= 12) &&
+ (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
is_UserConf = 1; /* It's someone's config room */
}
- CtdlMailboxName(roomname, sizeof roomname, &CCC->user, USERCONFIGROOM);
- if (!strcasecmp(CCC->room.QRname, roomname)) {
+ 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 */
}
- if (!strcasecmp(CCC->room.QRname, ADDRESS_BOOK_ROOM)) {
+ if (!strcasecmp(CC->room.QRname, ADDRESS_BOOK_ROOM)) {
is_GAB = 1; /* It's the Global Address Book */
}
ptr = msg->cm_fields[eMesageText];
- CCC->vcard_updated_by_ldap=0; /* As this will write LDAP's previous changes, disallow LDAP change auth until next LDAP change. */
+ CC->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);
+ NewStrBufDupAppendFlush(&CC->StatusMessage, NULL, NULL, 0);
- StrBufPrintf(CCC->StatusMessage, "%d\n", LISTING_FOLLOWS);
+ StrBufPrintf(CC->StatusMessage, "%d\n", LISTING_FOLLOWS);
while (ptr != NULL) {
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[eMesageText]);
- 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);
+ extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
vcard_free(v);
}
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 (CCC->user.axlevel >= AxAideU) {
+ if (CC->user.axlevel >= AxAideU) {
CtdlLockGetCurrentUser();
- CCC->user.flags |= US_REGIS;
+ CC->user.flags |= US_REGIS;
CtdlPutCurrentUserLock();
return (0);
}
/* ...which also means we need to flag the user */
CtdlLockGetCurrentUser();
- CCC->user.flags |= (US_REGIS|US_NEEDVALID);
+ CC->user.flags |= (US_REGIS|US_NEEDVALID);
CtdlPutCurrentUserLock();
return(0);
* 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, CCC->room.QRname); /* save current room */
+ strcpy(hold_rm, CC->room.QRname); /* save current room */
CtdlMailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
- if (CtdlGetRoom(&CCC->room, config_rm) != 0) {
- CtdlGetRoom(&CCC->room, hold_rm);
+ if (CtdlGetRoom(&CC->room, config_rm) != 0) {
+ CtdlGetRoom(&CC->room, hold_rm);
return vcard_new();
}
VCmsgnum = (-1);
CtdlForEachMessage(MSGS_LAST, 1, NULL, "[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$",
NULL, vcard_gu_backend, (void *)&VCmsgnum );
- CtdlGetRoom(&CCC->room, hold_rm); /* return to saved room */
+ CtdlGetRoom(&CC->room, hold_rm); /* return to saved room */
if (VCmsgnum < 0L) return vcard_new();
- msg = CtdlFetchMessage(VCmsgnum, 1, 1);
+ msg = CtdlFetchMessage(VCmsgnum, 1);
if (msg == NULL) return vcard_new();
v = vcard_load(msg->cm_fields[eMesageText]);
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
* 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;
unbuffer_output();
- if (!(CCC->logged_in)) {
+ if (!(CC->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 ( (CtdlGetConfigInt("c_disable_newu")) && (CCC->user.axlevel < AxAideU) ) {
+ if ( (CtdlGetConfigInt("c_disable_newu")) && (CC->user.axlevel < AxAideU) ) {
cprintf("%d Self-service registration is not allowed here.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
}
- my_vcard = vcard_get_user(&CCC->user);
+ my_vcard = vcard_get_user(&CC->user);
strcpy(tmpaddr, "");
strcpy(tmpcity, "");
strcpy(tmpstate, "");
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(&CCC->user, my_vcard);
+ vcard_write_user(&CC->user, my_vcard);
vcard_free(my_vcard);
}
*/
void cmd_greg(char *argbuf)
{
- struct CitContext *CCC = CC;
struct ctdluser usbuf;
struct vCard *v;
char *s;
extract_token(who, argbuf, 0, '|', sizeof who);
- if (!(CCC->logged_in)) {
+ if (!(CC->logged_in)) {
cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
return;
}
- if (!strcasecmp(who,"_SELF_")) strcpy(who,CCC->curr_user);
+ if (!strcasecmp(who,"_SELF_")) strcpy(who,CC->curr_user);
- if ((CCC->user.axlevel < AxAideU) && (strcasecmp(who,CCC->curr_user))) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
+ if ((CC->user.axlevel < AxAideU) && (strcasecmp(who,CC->curr_user))) {
+ cprintf("%d Higher access required.\n", ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
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);
need_default_vcard =1;
vcard_fn_to_n(vname, usbuf->fullname, sizeof vname);
- syslog(LOG_DEBUG, "Converted <%s> to <%s>", usbuf->fullname, vname);
+ syslog(LOG_DEBUG, "vcard: converted <%s> to <%s>", usbuf->fullname, vname);
/* Create and save the vCard */
v = vcard_new();
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", 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, CtdlGetConfigStr("c_fqdn"));
* 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];
- found_user = CtdlTryUserLDAP(usbuf->fullname, ldap_dn, sizeof ldap_dn, ldap_cn, sizeof ldap_cn, &usbuf->uid,1);
- 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, "LDAP Created Initial Vcard for %s\n",usbuf->fullname);
+ //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);
-}
-
-
-/*
- * When a user is being deleted, we have to remove his/her vCard.
- * This is accomplished by issuing a message with 'CANCEL' in the S (special)
- * field, and the same Exclusive ID as the existing card.
- */
-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;
- memset(msg, 0, sizeof(struct CtdlMessage));
-
- msg->cm_magic = CTDLMESSAGE_MAGIC;
- msg->cm_anon_type = MES_NORMAL;
- msg->cm_format_type = 0;
- 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);
- CM_Free(msg);
-}
-
-
-/*
- * Grab vCard directory stuff out of incoming network messages
- */
-int vcard_extract_from_network(struct CtdlMessage *msg, char *target_room) {
- char *ptr;
- int linelen;
-
- if (msg == NULL) return(0);
-
- if (strcasecmp(target_room, ADDRESS_BOOK_ROOM)) {
- return(0);
- }
-
- if (msg->cm_format_type != 4) return(0);
-
- if (CM_IsEmpty(msg, eMesageText))
- return 0;
-
- ptr = msg->cm_fields[eMesageText];
-
- while (ptr != NULL) {
-
- linelen = strcspn(ptr, "\n");
- if (linelen == 0) return(0); /* end of headers */
-
- if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26))
- || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
- /* It's a vCard. Add it to the directory. */
- vcard_extract_internet_addresses(msg, CtdlDirectoryAddUser);
- return(0);
- }
-
- ptr = strchr((char *)ptr, '\n');
- if (ptr != NULL) ++ptr;
- }
-
- return(0);
-}
-
-
-
-/*
- * When a vCard is being removed from the Global Address Book room, remove it
- * from the directory as well.
- */
-void vcard_delete_remove(char *room, long msgnum) {
- struct CtdlMessage *msg;
- char *ptr;
- int linelen;
-
- if (msgnum <= 0L) return;
-
- if (room == NULL) return;
-
- if (strcasecmp(room, ADDRESS_BOOK_ROOM)) {
- return;
- }
-
- msg = CtdlFetchMessage(msgnum, 1, 1);
- if (msg == NULL) return;
-
- if (CM_IsEmpty(msg, eMesageText))
- goto EOH;
-
- ptr = msg->cm_fields[eMesageText];
-
- while (ptr != NULL) {
- linelen = strcspn(ptr, "\n");
- if (linelen == 0) goto EOH;
-
- if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26))
- || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
- /* Bingo! A vCard is being deleted. */
- vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser);
+ /* 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] = '_';
}
- ptr = strchr((char *)ptr, '\n');
- if (ptr != NULL) ++ptr;
+ vcard_add_prop(v, "email;internet", buf);
}
-
-EOH: CM_Free(msg);
+ vcard_write_user(usbuf, v);
+ vcard_free(v);
}
-
/*
* Get Valid Screen Names
*/
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", 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("%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("000\n");
}
/*
* 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];
if (CtdlAccessCheck(ac_logged_in)) return;
cprintf("%d valid email addresses:\n", LISTING_FOLLOWS);
- if (!IsEmptyStr(CCC->cs_inet_email)) {
- cprintf("%s\n", CCC->cs_inet_email);
+ if (!IsEmptyStr(CC->cs_inet_email)) {
+ cprintf("%s\n", CC->cs_inet_email);
}
- if (!IsEmptyStr(CCC->cs_inet_other_emails)) {
- num_secondary_emails = num_tokens(CCC->cs_inet_other_emails, '|');
+ if (!IsEmptyStr(CC->cs_inet_other_emails)) {
+ num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|');
for (i=0; i<num_secondary_emails; ++i) {
- extract_token(buf, CCC->cs_inet_other_emails,i,'|',sizeof CCC->cs_inet_other_emails);
+ extract_token(buf, CC->cs_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails);
cprintf("%s\n", buf);
}
}
}
-
-
/*
* Callback function for cmd_dvca() that hunts for vCard content types
* and outputs any email addresses found within.
void dvca_callback(long msgnum, void *userdata) {
struct CtdlMessage *msg = NULL;
- msg = CtdlFetchMessage(msgnum, 1, 1);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
mime_parser(CM_RANGE(msg, eMesageText),
*dvca_mime_callback, /* callback function */
cprintf("%d %s\n", CIT_OK, citadel_addr);
}
+
/*
* Query Directory, in fact an alias to match postfix tcp auth.
*/
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.");
+ syslog(LOG_ERR, "vcard: client disconnected: ending session.");
CC->kill_me = KILLME_CLIENT_DISCONNECTED;
return;
}
extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
rcpt = validate_recipients(internet_addr, NULL, CHECK_EXISTANCE);
- if ((rcpt != NULL)&&
+ if ( (rcpt != NULL) &&
(
- (*rcpt->recp_local != '\0')||
- (*rcpt->recp_room != '\0')||
- (*rcpt->recp_ignet != '\0')))
- {
-
+ (*rcpt->recp_local != '\0') ||
+ (*rcpt->recp_room != '\0')
+ )
+ ) {
cprintf("200 OK %s\n", internet_addr);
- syslog(LOG_INFO, "sending 200 OK for the room %s", 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 no one here by that name: %s", 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 {
cprintf("500 REJECT invalid Query.\n");
- syslog(LOG_INFO, "sending 500 REJECT invalid query: %s", internet_addr);
+ syslog(LOG_INFO, "vcard: sending 500 REJECT invalid query: %s", internet_addr);
}
}
+
void check_get_greeting(void) {
-/* dummy function, we have no greeting in this verry simple protocol. */
+/* dummy function, we have no greeting in this very simple protocol. */
}
/* Set expiration policy to manual; otherwise objects will be lost! */
if (CtdlGetRoomLock(&qr, USERCONTACTSROOM)) {
- syslog(LOG_ERR, "Couldn't get the user CONTACTS room!");
+ syslog(LOG_ERR, "vcard: couldn't get the user CONTACTS room!");
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
*/
void vcard_session_login_hook(void) {
struct vCard *v = NULL;
- struct CitContext *CCC = CC; /* put this on the stack, just for speed */
#ifdef HAVE_LDAP
/*
* into the user's vCard.
*/
if ((CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP) || (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_LDAP_AD)) {
- v = vcard_get_user(&CCC->user);
+ v = vcard_get_user(&CC->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, "LDAP Detected vcard change.\n");
- vcard_write_user(&CCC->user, v);
+ if (Ctdl_LDAP_to_vCard(CC->ldap_dn, v)) {
+ CC->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(&CC->user, v);
}
}
}
#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);
+ v = vcard_get_user(&CC->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);
+ extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
vcard_free(v);
}
}
-
/*
* This is called by store_harvested_addresses() to remove from the
* list any addresses we already have in our address book.
collected_addresses = (char *)userdata;
- msg = CtdlFetchMessage(msgnum, 1, 1);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
v = vcard_load(msg->cm_fields[eMesageText]);
CM_Free(msg);
vmsg->cm_format_type = FMT_RFC822;
CM_SetField(vmsg, eAuthor, HKEY("Citadel"));
s = vcard_get_prop(v, "UID", 1, 0, 0);
- CM_SetField(vmsg, eExclusiveID, s, strlen(s));
+ if (!IsEmptyStr(s)) {
+ CM_SetField(vmsg, eExclusiveID, s, strlen(s));
+ }
ser = vcard_serialize(v);
if (ser != NULL) {
StrBuf *buf;
}
vcard_free(v);
- syslog(LOG_DEBUG, "Adding contact: %s", recipient);
- CtdlSubmitMsg(vmsg, NULL, aptr->roomname, QP_EADDR);
+ syslog(LOG_DEBUG, "vcard: adding contact: %s", recipient);
+ CtdlSubmitMsg(vmsg, NULL, aptr->roomname);
CM_Free(vmsg);
}
}
CTDL_MODULE_INIT(vcard)
{
struct ctdlroom qr;
- char filename[256];
- FILE *fp;
- int rv = 0;
if (!threading)
{
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");
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, 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! */
if (!CtdlGetRoomLock(&qr, ADDRESS_BOOK_ROOM)) {
qr.QRep.expire_mode = EXPIRE_MANUAL;
- qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */
+ qr.QRdefaultview = VIEW_ADDRESSBOOK; // 2 = address book view
CtdlPutRoomLock(&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);
- rv = chown(filename, CTDLUID, (-1));
- if (rv == -1)
- syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]",
- filename, strerror(errno));
- rv = chmod(filename, 0600);
- if (rv == -1)
- syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]",
- filename, strerror(errno));
}
/* for postfix tcpdict */
- CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"), /* Postfix */
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"), // Postfix
NULL,
check_get_greeting,
check_get,
NULL,
- CitadelServiceDICT_TCP);
+ CitadelServiceDICT_TCP
+ );
}
-
+
/* return our module name for the log */
return "vcard";
}
projects / citadel.git / blobdiff