* A server-side module for Citadel which supports address book information
* using the standard vCard format.
*
- * Copyright (c) 1999-2002 / released under the GNU General Public License
+ * Copyright (c) 1999-2007 / released under the GNU General Public License
*/
/*
#include "msgbase.h"
#include "internet_addressing.h"
#include "tools.h"
+#include "mime_parser.h"
#include "vcard.h"
#include "serv_ldap.h"
#include "serv_vcard.h"
CtdlDirectoryInit();
/* We want *all* vCards in this room */
- CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/x-vcard",
+ 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 */
* See if there is a valid Internet address in a vCard to use for outbound
* Internet messages. If there is, stick it in the buffer.
*/
-void extract_primary_inet_email(char *emailaddrbuf, size_t emailaddrbuf_len, struct vCard *v) {
+void extract_inet_email_addrs(char *emailaddrbuf, size_t emailaddrbuf_len,
+ char *secemailaddrbuf, size_t secemailaddrbuf_len,
+ struct vCard *v) {
char *s, *addr;
- int continue_searching = 1;
int instance = 0;
+ int saved_instance = 0;
/* Go through the vCard searching for *all* instances of
* the "email;internet" key
*/
- do {
- s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
- if (s != NULL) {
- continue_searching = 1;
- addr = strdup(s);
- striplt(addr);
- if (strlen(addr) > 0) {
- if (IsDirectory(addr)) {
- continue_searching = 0;
- safestrncpy(emailaddrbuf, addr,
- emailaddrbuf_len);
+ while (s = vcard_get_prop(v, "email;internet", 0, instance++, 0), s != NULL) {
+ addr = strdup(s);
+ striplt(addr);
+ if (strlen(addr) > 0) {
+ if (IsDirectory(addr)) {
+ ++saved_instance;
+ if ((saved_instance == 1) && (emailaddrbuf != NULL)) {
+ safestrncpy(emailaddrbuf, addr, emailaddrbuf_len);
+ }
+ else if ((saved_instance == 2) && (secemailaddrbuf != NULL)) {
+ safestrncpy(secemailaddrbuf, addr, secemailaddrbuf_len);
+ }
+ else if ((saved_instance > 2) && (secemailaddrbuf != NULL)) {
+ if ( (strlen(addr) + strlen(secemailaddrbuf) + 2)
+ < secemailaddrbuf_len ) {
+ strcat(secemailaddrbuf, "|");
+ strcat(secemailaddrbuf, addr);
+ }
}
}
- free(addr);
}
- else {
- continue_searching = 0;
- }
- } while(continue_searching);
+ free(addr);
+ }
}
+/*
+ * See if there is a name / screen name / friendly name in a vCard to use for outbound
+ * Internet messages. If there is, stick it in the buffer.
+ */
+void extract_friendly_name(char *namebuf, size_t namebuf_len, struct vCard *v)
+{
+ char *s;
+
+ s = vcard_get_prop(v, "fn", 0, 0, 0);
+ if (s == NULL) {
+ s = vcard_get_prop(v, "n", 0, 0, 0);
+ }
+
+ if (s != NULL) {
+ safestrncpy(namebuf, s, namebuf_len);
+ }
+}
+
+
+/*
+ * Callback function for vcard_upload_beforesave() hunts for the real vcard in the MIME structure
+ */
+void vcard_extract_vcard(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, char *cbcharset, size_t length,
+ char *encoding, void *cbuserdata)
+{
+ struct vCard **v = (struct vCard **) cbuserdata;
+
+ if ( (!strcasecmp(cbtype, "text/x-vcard"))
+ || (!strcasecmp(cbtype, "text/vcard")) ) {
+
+ lprintf(CTDL_DEBUG, "Part %s contains a vCard! Loading...\n", partnum);
+ if (*v != NULL) {
+ vcard_free(*v);
+ }
+ *v = vcard_load(content);
+ }
+}
+
+
/*
* This handler detects whether the user is attempting to save a new
* vCard as part of his/her personal configuration, and handles the replace
int vcard_upload_beforesave(struct CtdlMessage *msg) {
char *ptr;
char *s;
- int linelen;
char buf[SIZ];
struct ctdluser usbuf;
long what_user;
}
#endif
+ /* If users cannot create their own accounts, they cannot re-register either. */
+ if ( (config.c_disable_newu) && (CC->user.axlevel < 6) ) {
+ return(1);
+ }
}
/* Is this a room with an address book in it? */
ptr = msg->cm_fields['M'];
if (ptr == NULL) return(0);
- while (ptr != NULL) {
-
- linelen = strcspn(ptr, "\n");
- if (linelen == 0) return(0); /* end of headers */
-
- if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
+ mime_parser(msg->cm_fields['M'],
+ NULL,
+ *vcard_extract_vcard,
+ NULL, NULL,
+ &v, /* user data ptr - put the vcard here */
+ 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);
-
- if (what_user == CC->user.usernum) {
- /* It's the logged in user. That was easy. */
- memcpy(&usbuf, &CC->user,
- sizeof(struct ctdluser) );
- }
-
- else if (getuserbynumber(&usbuf, what_user) == 0) {
- /* We fetched a valid user record */
- }
-
- else {
- /* No user with that number! */
- return(0);
- }
-
- /* Delete the user's old vCard. This would probably
- * get taken care of by the replication check, but we
- * want to make sure there is absolutely only one
- * vCard in the user's config room at all times.
- */
- CtdlDeleteMessages(CC->room.QRname,
- NULL, 0, "text/x-vcard", 1);
+ if (v == NULL) return(0); /* no vCards were found in this message */
- /* Make the author of the message the name of the user.
- */
- if (msg->cm_fields['A'] != NULL) {
- free(msg->cm_fields['A']);
- }
- msg->cm_fields['A'] = strdup(usbuf.fullname);
- }
+ s = vcard_get_prop(v, "FN", 0, 0, 0);
+ if (s) lprintf(CTDL_DEBUG, "vCard beforesave hook running for <%s>\n", s);
- /* Manipulate the vCard data structure */
- v = vcard_load(msg->cm_fields['M']);
- if (v != NULL) {
-
- /* Insert or replace RFC2739-compliant free/busy URL */
- if (yes_my_citadel_config) {
- sprintf(buf, "http://%s/%s.vfb",
- config.c_fqdn,
- usbuf.fullname);
- for (i=0; i<strlen(buf); ++i) {
- if (buf[i] == ' ') buf[i] = '_';
- }
- vcard_set_prop(v, "FBURL;PREF", buf, 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);
- /* If this is an address book room, and the vCard has
- * no UID, then give it one.
- */
- if (yes_any_vcard_room) {
- s = vcard_get_prop(v, "UID", 0, 0, 0);
- if (s == NULL) {
- generate_uuid(buf);
- vcard_set_prop(v, "UID", buf, 0);
- }
- }
+ if (what_user == CC->user.usernum) {
+ /* It's the logged in user. That was easy. */
+ memcpy(&usbuf, &CC->user, sizeof(struct ctdluser));
+ }
+
+ else if (getuserbynumber(&usbuf, what_user) == 0) {
+ /* We fetched a valid user record */
+ }
- /* 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);
- }
+ else {
+ /* somebody set up us the bomb! */
+ yes_my_citadel_config = 0;
+ }
+ }
+
+ if (yes_my_citadel_config) {
+ /* Delete the user's old vCard. This would probably
+ * get taken care of by the replication check, but we
+ * want to make sure there is absolutely only one
+ * vCard in the user's config room at all times.
+ *
+ */
+ CtdlDeleteMessages(CC->room.QRname, NULL, 0, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$");
- /*
- * Set the EUID of the message to the UID of the vCard.
- */
- if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
- s = vcard_get_prop(v, "UID", 0, 0, 0);
- if (s != NULL) {
- msg->cm_fields['E'] = strdup(s);
- if (msg->cm_fields['U'] == NULL) {
- msg->cm_fields['U'] = strdup(s);
- }
- }
+ /* Make the author of the message the name of the user. */
+ if (msg->cm_fields['A'] != NULL) {
+ free(msg->cm_fields['A']);
+ }
+ msg->cm_fields['A'] = strdup(usbuf.fullname);
+ }
- /*
- * Set the Subject to the name in the vCard.
- */
- s = vcard_get_prop(v, "FN", 0, 0, 0);
- if (s == NULL) {
- s = vcard_get_prop(v, "N", 0, 0, 0);
- }
- if (s != NULL) {
- if (msg->cm_fields['U'] != NULL) {
- free(msg->cm_fields['U']);
- }
- msg->cm_fields['U'] = strdup(s);
- }
+ /* Insert or replace RFC2739-compliant free/busy URL */
+ if (yes_my_citadel_config) {
+ sprintf(buf, "http://%s/%s.vfb",
+ config.c_fqdn,
+ usbuf.fullname);
+ for (i=0; i<strlen(buf); ++i) {
+ if (buf[i] == ' ') buf[i] = '_';
+ }
+ vcard_set_prop(v, "FBURL;PREF", buf, 0);
+ }
- /* Re-serialize it back into the msg body */
- ser = vcard_serialize(v);
- if (ser != NULL) {
- msg->cm_fields['M'] = realloc(
- msg->cm_fields['M'],
- strlen(ser) + 1024
- );
- sprintf(msg->cm_fields['M'],
- "Content-type: text/x-vcard"
- "\r\n\r\n%s\r\n", ser);
- free(ser);
- }
- vcard_free(v);
- }
+ /* If the vCard has no UID, then give it one. */
+ s = vcard_get_prop(v, "UID", 0, 0, 0);
+ if (s == NULL) {
+ generate_uuid(buf);
+ vcard_set_prop(v, "UID", buf, 0);
+ }
- /* Now allow the save to complete. */
- return(0);
+ /* Enforce local UID policy if applicable */
+ if (yes_my_citadel_config) {
+ snprintf(buf, sizeof buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME);
+ vcard_set_prop(v, "UID", buf, 0);
+ }
+
+ /*
+ * Set the EUID of the message to the UID of the vCard.
+ */
+ if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
+ s = vcard_get_prop(v, "UID", 0, 0, 0);
+ if (s != NULL) {
+ msg->cm_fields['E'] = strdup(s);
+ if (msg->cm_fields['U'] == NULL) {
+ msg->cm_fields['U'] = strdup(s);
}
+ }
- ptr = strchr((char *)ptr, '\n');
- if (ptr != NULL) ++ptr;
+ /*
+ * Set the Subject to the name in the vCard.
+ */
+ s = vcard_get_prop(v, "FN", 0, 0, 0);
+ if (s == NULL) {
+ s = vcard_get_prop(v, "N", 0, 0, 0);
+ }
+ if (s != NULL) {
+ if (msg->cm_fields['U'] != NULL) {
+ free(msg->cm_fields['U']);
+ }
+ msg->cm_fields['U'] = strdup(s);
}
+ /* Re-serialize it back into the msg body */
+ ser = vcard_serialize(v);
+ if (ser != NULL) {
+ msg->cm_fields['M'] = realloc(msg->cm_fields['M'], strlen(ser) + 1024);
+ sprintf(msg->cm_fields['M'],
+ "Content-type: text/vcard"
+ "\r\n\r\n%s\r\n", ser);
+ free(ser);
+ }
+
+ /* Now allow the save to complete. */
+ vcard_free(v);
return(0);
}
linelen = strcspn(ptr, "\n");
if (linelen == 0) return(0); /* end of headers */
- if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
- /* Bingo! The user is uploading a new vCard, so
+ if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26))
+ || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
+ /*
+ * Bingo! The user is uploading a new vCard, so
* copy it to the Global Address Book room.
*/
/* Store our Internet return address in memory */
v = vcard_load(msg->cm_fields['M']);
- extract_primary_inet_email(CC->cs_inet_email,
- sizeof CC->cs_inet_email, v);
+ extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email,
+ CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails,
+ v);
+ extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
vcard_free(v);
/* Put it in the Global Address Book room... */
struct vCard *vcard_get_user(struct ctdluser *u) {
char hold_rm[ROOMNAMELEN];
char config_rm[ROOMNAMELEN];
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct vCard *v;
long VCmsgnum;
/* We want the last (and probably only) vcard in this room */
VCmsgnum = (-1);
- CtdlForEachMessage(MSGS_LAST, 1, NULL, "text/x-vcard",
+ 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 */
* is going to notice what we're trying to do, and delete the old vCard.
*/
CtdlWriteObject(USERCONFIGROOM, /* which room */
- "text/x-vcard", /* MIME type */
+ "text/vcard", /* MIME type */
temp, /* temp file */
u, /* which user */
0, /* not binary */
return;
}
+ /* If users cannot create their own accounts, they cannot re-register either. */
+ if ( (config.c_disable_newu) && (CC->user.axlevel < 6) ) {
+ cprintf("%d Self-service registration is not allowed here.\n",
+ ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
my_vcard = vcard_get_user(&CC->user);
strcpy(tmpaddr, "");
strcpy(tmpcity, "");
linelen = strcspn(ptr, "\n");
if (linelen == 0) return(0); /* end of headers */
- if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
- /* It's a vCard. Add it to the directory. */
- vcard_extract_internet_addresses(msg,
- CtdlDirectoryAddUser);
+ if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26))
+ || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
+ /* It's a vCard. Add it to the directory. */
+ vcard_extract_internet_addresses(msg, CtdlDirectoryAddUser);
return(0);
}
linelen = strcspn(ptr, "\n");
if (linelen == 0) goto EOH;
- if (!strncasecmp(ptr, "Content-type: text/x-vcard", 26)) {
- /* Bingo! A vCard is being deleted.
- */
- vcard_extract_internet_addresses(msg,
- CtdlDirectoryDelUser);
+ if ( (!strncasecmp(ptr, "Content-type: text/x-vcard", 26))
+ || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
+ /* Bingo! A vCard is being deleted. */
+ vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser);
#ifdef HAVE_LDAP
ctdl_vcard_to_ldap(msg, V2L_DELETE);
#endif
+/*
+ * Get Valid Screen Names
+ */
+void cmd_gvsn(char *argbuf)
+{
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
+ cprintf("%d valid screen names:\n", LISTING_FOLLOWS);
+ cprintf("%s\n", CC->user.fullname);
+ if ( (strlen(CC->cs_inet_fn) > 0) && (strcasecmp(CC->user.fullname, CC->cs_inet_fn)) ) {
+ cprintf("%s\n", CC->cs_inet_fn);
+ }
+ cprintf("000\n");
+}
+
+
+/*
+ * Get Valid Email Addresses
+ */
+void cmd_gvea(char *argbuf)
+{
+ int num_secondary_emails = 0;
+ int i;
+ char buf[256];
+
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
+ cprintf("%d valid email addresses:\n", LISTING_FOLLOWS);
+ if (strlen(CC->cs_inet_email) > 0) {
+ cprintf("%s\n", CC->cs_inet_email);
+ }
+ if (strlen(CC->cs_inet_other_emails) > 0) {
+ num_secondary_emails = num_tokens(CC->cs_inet_other_emails, '|');
+ for (i=0; i<num_secondary_emails; ++i) {
+ extract_token(buf, CC->cs_inet_other_emails,i,'|',sizeof CC->cs_inet_other_emails);
+ cprintf("%s\n", buf);
+ }
+ }
+ cprintf("000\n");
+}
+
+
/*
* Query Directory
*/
lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
}
- if (rcpt != NULL) free (rcpt);
+ if (rcpt != NULL) free_recipients(rcpt);
}
-/// CC->kill_me = 1;
}
void check_get_greeting(void) {
* When a user logs in...
*/
void vcard_session_login_hook(void) {
- struct vCard *v;
+ struct vCard *v = NULL;
v = vcard_get_user(&CC->user);
- extract_primary_inet_email(CC->cs_inet_email,
- sizeof CC->cs_inet_email, v);
+ extract_inet_email_addrs(CC->cs_inet_email, sizeof CC->cs_inet_email,
+ CC->cs_inet_other_emails, sizeof CC->cs_inet_other_emails,
+ v);
+ extract_friendly_name(CC->cs_inet_fn, sizeof CC->cs_inet_fn, v);
vcard_free(v);
vcard_create_room();
*/
void strip_addresses_already_have(long msgnum, void *userdata) {
char *collected_addresses;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct vCard *v;
char *value = NULL;
int i, j;
/* First remove any addresses we already have in the address book */
usergoto(aptr->roomname, 0, 0, NULL, NULL);
- CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/x-vcard", NULL,
+ CtdlForEachMessage(MSGS_ALL, 0, NULL, "^[Tt][Ee][Xx][Tt]/.*[Vv][Cc][Aa][Rr][Dd]$", NULL,
strip_addresses_already_have, aptr->collected_addresses);
if (strlen(aptr->collected_addresses) > 0)
if (ser != NULL) {
vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
sprintf(vmsg->cm_fields['M'],
- "Content-type: text/x-vcard"
+ "Content-type: text/vcard"
"\r\n\r\n%s\r\n", ser);
free(ser);
}
}
+char *serv_postfix_tcpdict(void)
+{
+ CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */
+ NULL,
+ check_get_greeting,
+ check_get,
+ NULL);
+ return "$Id$";
+}
+
+
char *serv_vcard_init(void)
{
CtdlRegisterProtoHook(cmd_igab, "IGAB",
"Initialize Global Address Book");
CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
+ CtdlRegisterProtoHook(cmd_gvsn, "GVSN", "Get Valid Screen Names");
+ CtdlRegisterProtoHook(cmd_gvea, "GVEA", "Get Valid Email Addresses");
CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
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);
return "$Id$";
}
-
-
-char *serv_postfix_tcpdict(void)
-{
- CtdlRegisterServiceHook(config.c_pftcpdict_port, /* Postfix */
- NULL,
- check_get_greeting,
- check_get,
- NULL);
- return "$Id$";
-}
projects / citadel.git / blobdiff