/*
- * serv_vcard.c
+ * $Id$
*
* A server-side module for Citadel which supports address book information
* using the standard vCard format.
- *
- * $Id$
- *
+ *
+ * Copyright (c) 1999-2001 / released under the GNU General Public License
*/
+/*
+ * Where we keep messages containing the vCards that source our directory. It
+ * makes no sense to change this, because you'd have to change it on every
+ * system on the network. That would be stupid.
+ */
#define ADDRESS_BOOK_ROOM "Global Address Book"
+/*
+ * Format of the "Extended 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).
+ */
+#define VCARD_EXT_FORMAT "Citadel vCard: personal card for %s at %s"
+
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include <time.h>
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "policy.h"
#include "database.h"
#include "msgbase.h"
+#include "internet_addressing.h"
#include "tools.h"
#include "vcard.h"
#define VC ((struct vcard_internal_info *)CtdlGetUserData(SYM_VCARD))
+/*
+ * 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 *) ) {
+ struct vCard *v;
+ char *s;
+ char *addr;
+ char citadel_address[SIZ];
+
+ if (msg->cm_fields['A'] == NULL) return;
+ if (msg->cm_fields['N'] == NULL) return;
+ sprintf(citadel_address, "%s @ %s",
+ msg->cm_fields['A'], msg->cm_fields['N']);
+
+ v = vcard_load(msg->cm_fields['M']);
+ if (v == NULL) return;
+
+ s = vcard_get_prop(v, "email;internet", 0); /* FIXME handle multiples */
+ if (s != NULL) {
+ addr = strdoop(s);
+ striplt(addr);
+ if (strlen(addr) > 0) {
+ if (callback != NULL) {
+ callback(addr, citadel_address);
+ }
+ }
+ phree(addr);
+ }
+
+ vcard_free(v);
+}
+
+/*
+ * Back end function for cmd_igab()
+ * FIXME use a callback that actually writes to the database, dumbass...
+ */
+void vcard_add_to_directory(long msgnum, void *data) {
+ struct CtdlMessage *msg;
+
+ msg = CtdlFetchMessage(msgnum);
+ if (msg != NULL) {
+ vcard_extract_internet_addresses(msg, CtdlDirectoryAddUser);
+ }
+
+ CtdlFreeMessage(msg);
+}
+
+
+/*
+ * Initialize Global Adress Book
+ */
+void cmd_igab(char *argbuf) {
+ char hold_rm[ROOMNAMELEN];
+
+ if (CtdlAccessCheck(ac_aide)) return;
+
+ strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
+
+ if (getroom(&CC->quickroom, ADDRESS_BOOK_ROOM) != 0) {
+ getroom(&CC->quickroom, hold_rm);
+ cprintf("%d cannot get address book room\n", ERROR);
+ return;
+ }
+
+ /* FIXME empty the existing database first. And don't be a
+ * freakin' momo and dump addresses to the client. We want to write
+ * the harvested addresses into the database and send an OK to the
+ * client when finished.
+ */
+
+ cprintf("%d Directory will be rebuilt\n", OK);
+
+ /* We want the last (and probably only) vcard in this room */
+ CtdlForEachMessage(MSGS_ALL, 0, (-127), "text/x-vcard",
+ NULL, vcard_add_to_directory, NULL);
+
+ getroom(&CC->quickroom, hold_rm); /* return to saved room */
+}
+
+
+
/*
* This handler detects whether the user is attempting to save a new
* vCard as part of his/her personal configuration, and handles the replace
char *ptr;
int linelen;
char config_rm[ROOMNAMELEN];
- char buf[256];
-
+ char buf[SIZ];
if (!CC->logged_in) return(0); /* Only do this if logged in. */
/* If this isn't the configuration room, or if this isn't a MIME
- * message, don't bother.
+ * message, don't bother. (Check for NULL room first, otherwise
+ * some messages will cause it to crash!!)
*/
+ if (msg->cm_fields['O'] == NULL) return(0);
if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
if (msg->cm_format_type != 4) return(0);
ptr = msg->cm_fields['M'];
+ if (ptr == NULL) return(0);
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
* want to make sure there is absolutely only one
* vCard in the user's config room at all times.
*
- * FIX ... this needs to be tweaked to allow an admin
+ * FIXME ... this needs to be tweaked to allow an admin
* to make changes to another user's vCard instead of
* assuming that it's always the user saving his own.
*/
if (msg->cm_fields['E'] != NULL)
phree(msg->cm_fields['E']);
- sprintf(buf,
- "Citadel vCard: personal card for %s at %s",
+ sprintf(buf, VCARD_EXT_FORMAT,
msg->cm_fields['A'], NODENAME);
msg->cm_fields['E'] = strdoop(buf);
int linelen;
long I;
-
if (!CC->logged_in) return(0); /* Only do this if logged in. */
/* If this isn't the configuration room, or if this isn't a MIME
* message, don't bother.
*/
+ if (msg->cm_fields['O'] == NULL) return(0);
if (strcasecmp(msg->cm_fields['O'], USERCONFIGROOM)) return(0);
if (msg->cm_format_type != 4) return(0);
ptr = msg->cm_fields['M'];
+ if (ptr == NULL) return(0);
while (ptr != NULL) {
linelen = strcspn(ptr, "\n");
I = atol(msg->cm_fields['I']);
if (I < 0L) return(0);
+ /* 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);
+
return(0);
}
/*
* back end function used for callbacks
*/
-void vcard_gu_backend(long msgnum) {
+void vcard_gu_backend(long msgnum, void *userdata) {
VC->msgnum = msgnum;
}
/* We want the last (and probably only) vcard in this room */
VC->msgnum = (-1);
- CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
- NULL, vcard_gu_backend);
+ CtdlForEachMessage(MSGS_LAST, 1, (-127), "text/x-vcard",
+ NULL, vcard_gu_backend, NULL);
getroom(&CC->quickroom, hold_rm); /* return to saved room */
if (VC->msgnum < 0L) return vcard_new();
/*
- * old style "enter registration info" command
+ * Old style "enter registration info" command. This function simply honors
+ * the REGI protocol command, translates the entered parameters into a vCard,
+ * and enters the vCard into the user's configuration.
*/
void cmd_regi(char *argbuf) {
int a,b,c;
- char buf[256];
+ char buf[SIZ];
struct vCard *my_vcard;
- char tmpaddr[256];
- char tmpcity[256];
- char tmpstate[256];
- char tmpzip[256];
- char tmpaddress[512];
+ char tmpaddr[SIZ];
+ char tmpcity[SIZ];
+ char tmpstate[SIZ];
+ char tmpzip[SIZ];
+ char tmpaddress[SIZ];
+ char tmpcountry[SIZ];
if (!(CC->logged_in)) {
cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
return;
- }
+ }
my_vcard = vcard_get_user(&CC->usersupp);
strcpy(tmpaddr, "");
strcpy(tmpcity, "");
strcpy(tmpstate, "");
strcpy(tmpzip, "");
+ strcpy(tmpcountry, "USA");
cprintf("%d Send registration...\n", SEND_LISTING);
a=0;
while (client_gets(buf), strcmp(buf,"000")) {
if (a==0) vcard_set_prop(my_vcard, "n", buf);
- if (a==1) strcpy(tmpaddr,buf);
- if (a==2) strcpy(tmpcity,buf);
- if (a==3) strcpy(tmpstate,buf);
+ if (a==1) strcpy(tmpaddr, buf);
+ if (a==2) strcpy(tmpcity, buf);
+ if (a==3) strcpy(tmpstate, buf);
if (a==4) {
for (c=0; c<strlen(buf); ++c) {
- if ((buf[c]>='0')&&(buf[c]<='9')) {
- b=strlen(tmpzip);
- tmpzip[b]=buf[c];
- tmpzip[b+1]=0;
- }
+ if ((buf[c]>='0') && (buf[c]<='9')) {
+ b = strlen(tmpzip);
+ tmpzip[b] = buf[c];
+ tmpzip[b+1] = 0;
}
}
+ }
if (a==5) vcard_set_prop(my_vcard, "tel;home", buf);
if (a==6) vcard_set_prop(my_vcard, "email;internet", buf);
+ if (a==7) strcpy(tmpcountry, buf);
++a;
- }
- sprintf(tmpaddress, ";;%s;%s;%s;%s;USA",
- tmpaddr, tmpcity, tmpstate, tmpzip);
+ }
+
+ sprintf(tmpaddress, ";;%s;%s;%s;%s;%s",
+ tmpaddr, tmpcity, tmpstate, tmpzip, tmpcountry);
vcard_set_prop(my_vcard, "adr", tmpaddress);
vcard_write_user(&CC->usersupp, my_vcard);
vcard_free(my_vcard);
CitControl.MMflags = CitControl.MMflags | MM_VALID ;
put_control();
end_critical_section(S_CONTROL);
- }
+}
/*
- * get registration info for a user
+ * Protocol command to fetch registration info for a user
*/
void cmd_greg(char *argbuf)
{
struct usersupp usbuf;
struct vCard *v;
- char *tel;
- char who[256];
- char adr[256];
- char buf[256];
+ char *s;
+ char who[SIZ];
+ char adr[SIZ];
+ char buf[SIZ];
extract(who, argbuf, 0);
cprintf("%d %s\n", LISTING_FOLLOWS, usbuf.fullname);
cprintf("%ld\n", usbuf.usernum);
cprintf("%s\n", usbuf.password);
- cprintf("%s\n", vcard_get_prop(v, "n", 0)); /* name */
+ s = vcard_get_prop(v, "n", 0);
+ cprintf("%s\n", s ? s : " "); /* name */
- sprintf(adr, "%s", vcard_get_prop(v, "adr", 0));/* address... */
+ s = vcard_get_prop(v, "adr", 0);
+ sprintf(adr, "%s", s ? s : " ");/* address... */
extract_token(buf, adr, 2, ';');
cprintf("%s\n", buf); /* street */
extract_token(buf, adr, 5, ';');
cprintf("%s\n", buf); /* zip */
- tel = vcard_get_prop(v, "tel;home", 0);
- if (tel == NULL) tel = vcard_get_prop(v, "tel", 1);
- if (tel != NULL) {
- cprintf("%s\n", tel);
- }
+ s = vcard_get_prop(v, "tel;home", 0);
+ if (s == NULL) s = vcard_get_prop(v, "tel", 1);
+ if (s != NULL) {
+ cprintf("%s\n", s);
+ }
else {
cprintf(" \n");
}
cprintf("%d\n", usbuf.axlevel);
- cprintf("%s\n", vcard_get_prop(v, "email;internet", 0));
+ s = vcard_get_prop(v, "email;internet", 0);
+ cprintf("%s\n", s ? s : " ");
+ s = vcard_get_prop(v, "adr", 0);
+ sprintf(adr, "%s", s ? s : " ");/* address... */
+
+ extract_token(buf, adr, 6, ';');
+ cprintf("%s\n", buf); /* country */
cprintf("000\n");
- }
+}
/*
*/
void vcard_purge(char *username, long usernum) {
struct CtdlMessage *msg;
- char buf[256];
+ char buf[SIZ];
msg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
if (msg == NULL) return;
msg->cm_fields['N'] = strdoop(NODENAME);
msg->cm_fields['M'] = strdoop("Purge this vCard\n");
- sprintf(buf,
- "Citadel vCard: personal card for %s at %s",
- msg->cm_fields['A'], NODENAME);
+ sprintf(buf, VCARD_EXT_FORMAT, msg->cm_fields['A'], NODENAME);
msg->cm_fields['E'] = strdoop(buf);
msg->cm_fields['S'] = strdoop("CANCEL");
- CtdlSaveMsg(msg, "", ADDRESS_BOOK_ROOM, MES_LOCAL, 1);
+ CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
CtdlFreeMessage(msg);
-
- /* Start a netproc run in the background, so the "purge" message
- * gets flushed out of the room immediately
- */
- system("./netproc &");
}
CtdlRegisterMessageHook(vcard_upload_aftersave, EVT_AFTERSAVE);
CtdlRegisterProtoHook(cmd_regi, "REGI", "Enter registration info");
CtdlRegisterProtoHook(cmd_greg, "GREG", "Get registration info");
+ CtdlRegisterProtoHook(cmd_igab, "IGAB",
+ "Initialize Global Address Book");
CtdlRegisterUserHook(vcard_purge, EVT_PURGEUSER);
- create_room(ADDRESS_BOOK_ROOM, 3, "", 0);
+ create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1);
return "$Id$";
}
-
-
-
projects / citadel.git / blobdiff