#define ADDRESS_BOOK_ROOM "Global Address Book"
/*
- * Format of the "Extended ID" field of the message containing a user's
+ * Format of the "Exclusive ID" field of the message containing a user's
* vCard. Doesn't matter what it really looks like as long as it's both
* unique and consistent (because we use it for replication checking to
* delete the old vCard network-wide when the user enters a new one).
#include "internet_addressing.h"
#include "tools.h"
#include "vcard.h"
+#include "serv_ldap.h"
struct vcard_internal_info {
long msgnum;
};
/* Message number symbol used internally by these functions */
-unsigned long SYM_VCARD;
#define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
do {
s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
if (s != NULL) {
- addr = strdoop(s);
+ addr = strdup(s);
striplt(addr);
if (strlen(addr) > 0) {
if (callback != NULL) {
callback(addr, citadel_address);
}
}
- phree(addr);
+ free(addr);
found_something = 1;
}
else {
* probably just the networker or something.
*/
if (CC->logged_in) {
- lprintf(9, "Checking for <%s>...\n", internet_addr);
+ lprintf(CTDL_DEBUG, "Checking for <%s>...\n", internet_addr);
if (CtdlDirectoryLookup(buf, internet_addr) == 0) {
if (strcasecmp(buf, citadel_addr)) {
/* This address belongs to someone else.
* Bail out silently without saving.
*/
- lprintf(9, "DOOP!\n");
+ lprintf(CTDL_DEBUG, "DOOP!\n");
return;
}
}
}
- lprintf(9, "ADDING!\n");
+ lprintf(CTDL_INFO, "Adding %s (%s) to directory\n",
+ citadel_addr, internet_addr);
CtdlDirectoryAddUser(internet_addr, citadel_addr);
}
void vcard_add_to_directory(long msgnum, void *data) {
struct CtdlMessage *msg;
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
vcard_extract_internet_addresses(msg, vcard_directory_add_user);
}
+#ifdef HAVE_LDAP
+ ctdl_vcard_to_ldap(msg, V2L_WRITE);
+#endif
+
CtdlFreeMessage(msg);
}
if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
getroom(&CC->room, hold_rm);
- cprintf("%d cannot get address book room\n", ERROR);
+ cprintf("%d cannot get address book room\n", ERROR + ROOM_NOT_FOUND);
return;
}
*/
CtdlDirectoryInit();
- /* We want the last (and probably only) vcard in this room */
+ /* We want *all* vCards in this room */
CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard",
NULL, vcard_add_to_directory, NULL);
s = vcard_get_prop(v, "email;internet", 0, instance++, 0);
if (s != NULL) {
continue_searching = 1;
- addr = strdoop(s);
+ addr = strdup(s);
striplt(addr);
if (strlen(addr) > 0) {
if (IsDirectory(addr)) {
);
}
}
- phree(addr);
+ free(addr);
}
else {
continue_searching = 0;
*/
int vcard_upload_beforesave(struct CtdlMessage *msg) {
char *ptr;
+ char *s;
int linelen;
char buf[SIZ];
- struct user usbuf;
+ struct ctdluser usbuf;
long what_user;
+ struct vCard *v = NULL;
+ char *ser = NULL;
+ int i = 0;
+ 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 this isn't a "My Citadel Config" room, don't bother. */
+ /* Is this some user's "My Citadel Config" room? */
if ( (CC->room.QRflags && QR_MAILBOX)
&& (!strcasecmp(&CC->room.QRname[11], USERCONFIGROOM)) ) {
/* Yes, we want to do this */
+ yes_my_citadel_config = 1;
}
- else {
+
+ /* Is this a room with an address book in it? */
+ if (CC->curr_view == VIEW_ADDRESSBOOK) {
+ yes_any_vcard_room = 1;
+ }
+
+ /* If neither condition exists, don't run this hook. */
+ if ( (!yes_my_citadel_config) && (!yes_any_vcard_room) ) {
return(0);
}
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
- * 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 user) );
- }
+
+ 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 if (getuserbynumber(&usbuf, what_user) == 0) {
- /* We fetched a valid user record */
- }
-
- else {
- /* No user with that number! */
- return(0);
+ 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,
+ 0L, "text/x-vcard");
+
+ /* 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);
}
- /* 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,
- 0L, "text/x-vcard");
+ /* 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);
+ }
- /* Set the Extended-ID to a standardized one so the
- * replication always works correctly
- */
- if (msg->cm_fields['E'] != NULL)
- phree(msg->cm_fields['E']);
+ /* 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 (msg->cm_fields['A'] != NULL)
- phree(msg->cm_fields['A']);
+ /* 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);
+ }
- msg->cm_fields['A'] = strdoop(usbuf.fullname);
+ /* 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'] = strdup(buf);
- snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
- msg->cm_fields['A'], NODENAME);
- msg->cm_fields['E'] = strdoop(buf);
+ /* 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);
+ }
/* Now allow the save to complete. */
return(0);
I = atol(msg->cm_fields['I']);
if (I < 0L) return(0);
+ /* Store our Internet return address in memory */
+ v = vcard_load(msg->cm_fields['M']);
+ vcard_populate_cs_inet_email(v);
+ vcard_free(v);
+
/* Put it in the Global Address Book room... */
CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I,
(SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
/* ...and also in the directory database. */
vcard_add_to_directory(I, NULL);
- /* Store our Internet return address in memory */
- v = vcard_load(msg->cm_fields['M']);
- vcard_populate_cs_inet_email(v);
- vcard_free(v);
-
/* Some sites want an Aide to be notified when a
* user registers or re-registers...
*/
* If this user has a vcard on disk, read it into memory, otherwise allocate
* and return an empty vCard.
*/
-struct vCard *vcard_get_user(struct user *u) {
+struct vCard *vcard_get_user(struct ctdluser *u) {
char hold_rm[ROOMNAMELEN];
char config_rm[ROOMNAMELEN];
struct CtdlMessage *msg;
if (VC->msgnum < 0L) return vcard_new();
- msg = CtdlFetchMessage(VC->msgnum);
+ msg = CtdlFetchMessage(VC->msgnum, 1);
if (msg == NULL) return vcard_new();
v = vcard_load(msg->cm_fields['M']);
/*
* Write our config to disk
*/
-void vcard_write_user(struct user *u, struct vCard *v) {
+void vcard_write_user(struct ctdluser *u, struct vCard *v) {
char temp[PATH_MAX];
FILE *fp;
char *ser;
fprintf(fp, "begin:vcard\r\nend:vcard\r\n");
} else {
fwrite(ser, strlen(ser), 1, fp);
- phree(ser);
+ free(ser);
}
fclose(fp);
char tmpaddress[SIZ];
char tmpcountry[SIZ];
+ unbuffer_output();
+
if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
+ cprintf("%d Not logged in.\n",ERROR + NOT_LOGGED_IN);
return;
}
*/
void cmd_greg(char *argbuf)
{
- struct user usbuf;
+ struct ctdluser usbuf;
struct vCard *v;
char *s;
char who[SIZ];
extract(who, argbuf, 0);
if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR+NOT_LOGGED_IN);
+ cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
return;
}
if ((CC->user.axlevel < 6) && (strcasecmp(who,CC->curr_user))) {
cprintf("%d Higher access required.\n",
- ERROR+HIGHER_ACCESS_REQUIRED);
+ ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
if (getuser(&usbuf, who) != 0) {
- cprintf("%d '%s' not found.\n", ERROR+NO_SUCH_USER, who);
+ cprintf("%d '%s' not found.\n", ERROR + NO_SUCH_USER, who);
return;
}
}
+/*
+ * When a user is being created, create his/her vCard.
+ */
+void vcard_newuser(struct ctdluser *usbuf) {
+ char buf[SIZ];
+ char vname[SIZ];
+
+ char lastname[SIZ];
+ char firstname[SIZ];
+ char middlename[SIZ];
+ char honorific_prefixes[SIZ];
+ char honorific_suffixes[SIZ];
+
+ struct vCard *v;
+ int i;
+
+ /* Try to intelligently convert the screen name to a
+ * fully expanded vCard name based on the number of
+ * words in the name
+ */
+ strcpy(lastname, "");
+ strcpy(firstname, "");
+ strcpy(middlename, "");
+ strcpy(honorific_prefixes, "");
+ strcpy(honorific_suffixes, "");
+
+ strcpy(buf, usbuf->fullname);
+
+ /* Honorific suffixes */
+ if (num_tokens(buf, ',') > 1) {
+ extract_token(honorific_suffixes, buf, (num_tokens(buf, ' ') - 1), ',');
+ remove_token(buf, (num_tokens(buf, ',') - 1), ',');
+ }
+
+ /* Find a last name */
+ extract_token(lastname, buf, (num_tokens(buf, ' ') - 1), ' ');
+ remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
+
+ /* Find honorific prefixes */
+ if (num_tokens(buf, ' ') > 2) {
+ extract_token(honorific_prefixes, buf, 0, ' ');
+ remove_token(buf, 0, ' ');
+ }
+
+ /* Find a middle name */
+ if (num_tokens(buf, ' ') > 1) {
+ extract_token(middlename, buf, (num_tokens(buf, ' ') - 1), ' ');
+ remove_token(buf, (num_tokens(buf, ' ') - 1), ' ');
+ }
+
+ /* Anything left is probably the first name */
+ strcpy(firstname, buf);
+ striplt(firstname);
+
+ /* Compose the structured name */
+ sprintf(vname, "%s;%s;%s;%s;%s", lastname, firstname, middlename,
+ honorific_prefixes, honorific_suffixes);
+
+ lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
+
+ /* Create and save the vCard */
+ v = vcard_new();
+ if (v == NULL) return;
+ sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
+ for (i=0; i<strlen(buf); ++i) {
+ if (buf[i] == ' ') buf[i] = '_';
+ }
+ vcard_add_prop(v, "fn", usbuf->fullname);
+ vcard_add_prop(v, "n", vname);
+ vcard_add_prop(v, "adr", "adr:;;_;_;_;00000;__");
+ 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 Extended ID as the existing card.
+ * field, and the same Exclusive ID as the existing card.
*/
-void vcard_purge(char *username, long usernum) {
+void vcard_purge(struct ctdluser *usbuf) {
struct CtdlMessage *msg;
char buf[SIZ];
- msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
+ 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;
- msg->cm_fields['A'] = strdoop(username);
- msg->cm_fields['O'] = strdoop(ADDRESS_BOOK_ROOM);
- msg->cm_fields['N'] = strdoop(NODENAME);
- msg->cm_fields['M'] = strdoop("Purge this vCard\n");
+ 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'] = strdoop(buf);
+ msg->cm_fields['E'] = strdup(buf);
- msg->cm_fields['S'] = strdoop("CANCEL");
+ msg->cm_fields['S'] = strdup("CANCEL");
CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
CtdlFreeMessage(msg);
return;
}
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
ptr = msg->cm_fields['M'];
*/
vcard_extract_internet_addresses(msg,
CtdlDirectoryDelUser);
+#ifdef HAVE_LDAP
+ ctdl_vcard_to_ldap(msg, V2L_DELETE);
+#endif
}
ptr = strchr((char *)ptr, '\n');
if (ptr != NULL) ++ptr;
if (CtdlDirectoryLookup(citadel_addr, internet_addr) != 0) {
cprintf("%d %s was not found.\n",
- ERROR+NO_SUCH_USER, internet_addr);
+ ERROR + NO_SUCH_USER, internet_addr);
return;
}
}
+/*
+ * We don't know if the Contacts room exists so we just create it at login
+ */
+void vcard_create_room(void)
+{
+ struct ctdlroom qr;
+ struct visit vbuf;
+
+ /* Create the calendar room if it doesn't already exist */
+ create_room(USERCONTACTSROOM, 4, "", 0, 1, 0, VIEW_ADDRESSBOOK);
+
+ /* Set expiration policy to manual; otherwise objects will be lost! */
+ if (lgetroom(&qr, USERCONTACTSROOM)) {
+ lprintf(CTDL_ERR, "Couldn't get the user CONTACTS room!\n");
+ return;
+ }
+ qr.QRep.expire_mode = EXPIRE_MANUAL;
+ qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */
+ lputroom(&qr);
+
+ /* Set the view to a calendar view */
+ CtdlGetRelationship(&vbuf, &CC->user, &qr);
+ vbuf.v_view = 2; /* 2 = address book view */
+ CtdlSetRelationship(&vbuf, &CC->user, &qr);
+
+ return;
+}
+
+
/*
vcard_populate_cs_inet_email(v);
vcard_free(v);
+
+ vcard_create_room();
}
char *serv_vcard_init(void)
{
- SYM_VCARD = CtdlGetDynamicSymbol();
+ struct ctdlroom qr;
+
CtdlRegisterSessionHook(vcard_session_startup_hook, EVT_START);
CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
CtdlRegisterProtoHook(cmd_igab, "IGAB",
"Initialize Global Address Book");
CtdlRegisterProtoHook(cmd_qdir, "QDIR", "Query Directory");
+ CtdlRegisterUserHook(vcard_newuser, EVT_NEWUSER);
CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
CtdlRegisterNetprocHook(vcard_extract_from_network);
- create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0);
+
+ /* Create the Global ADdress Book room if necessary */
+ create_room(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)) {
+ qr.QRep.expire_mode = EXPIRE_MANUAL;
+ qr.QRdefaultview = VIEW_ADDRESSBOOK; /* 2 = address book view */
+ lputroom(&qr);
+ }
+
return "$Id$";
}
projects / citadel.git / blobdiff