X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_vcard.c;h=f2205b687b6d26177f05f621ccc39a32c6d8bd24;hb=11219dbc3e638e7ee47feffbbb7d63588d7dd77f;hp=a586fdfe39bc97d6c5a957363f2dab0c2021ffec;hpb=623c97e16c354492d4bbf14d709192d83896b35a;p=citadel.git

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index a586fdfe3..f2205b687 100644
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -24,6 +24,7 @@
 #include <signal.h>
 #include <pwd.h>
 #include <errno.h>
+#include <ctype.h>
 #include <sys/types.h>
 
 #if TIME_WITH_SYS_TIME
@@ -57,6 +58,7 @@
 #include "tools.h"
 #include "vcard.h"
 #include "serv_ldap.h"
+#include "serv_vcard.h"
 
 /*
  * set global flag calling for an aide to validate new users
@@ -170,27 +172,27 @@ void vcard_add_to_directory(long msgnum, void *data) {
  * Initialize Global Adress Book
  */
 void cmd_igab(char *argbuf) {
-        char hold_rm[ROOMNAMELEN];
+	char hold_rm[ROOMNAMELEN];
 
 	if (CtdlAccessCheck(ac_aide)) return;
 
-        strcpy(hold_rm, CC->room.QRname);	/* save current room */
+	strcpy(hold_rm, CC->room.QRname);	/* save current room */
 
-        if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
-                getroom(&CC->room, hold_rm);
+	if (getroom(&CC->room, ADDRESS_BOOK_ROOM) != 0) {
+		getroom(&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 */
-        CtdlForEachMessage(MSGS_ALL, 0, "text/x-vcard",
+	/* We want *all* vCards in this room */
+	CtdlForEachMessage(MSGS_ALL, 0, NULL, "text/x-vcard",
 		NULL, vcard_add_to_directory, NULL);
 
-        getroom(&CC->room, hold_rm);	/* return to saved room */
+	getroom(&CC->room, hold_rm);	/* return to saved room */
 	cprintf("%d Directory has been rebuilt.\n", CIT_OK);
 }
 
@@ -199,9 +201,9 @@ void cmd_igab(char *argbuf) {
 
 /*
  * See if there is a valid Internet address in a vCard to use for outbound
- * Internet messages.  If there is, stick it in CC->cs_inet_email.
+ * Internet messages.  If there is, stick it in the buffer.
  */
-void vcard_populate_cs_inet_email(struct vCard *v) {
+void extract_primary_inet_email(char *emailaddrbuf, size_t emailaddrbuf_len, struct vCard *v) {
 	char *s, *addr;
 	int continue_searching = 1;
 	int instance = 0;
@@ -218,10 +220,8 @@ void vcard_populate_cs_inet_email(struct vCard *v) {
 			if (strlen(addr) > 0) {
 				if (IsDirectory(addr)) {
 					continue_searching = 0;
-					safestrncpy(CC->cs_inet_email,
-						addr,
-						sizeof(CC->cs_inet_email)
-					);
+					safestrncpy(emailaddrbuf, addr,
+						emailaddrbuf_len);
 				}
 			}
 			free(addr);
@@ -260,10 +260,18 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 	   && (!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 */
+		if (CC->user.axlevel < 6) {
+			return(1);
+		}
+#endif
+
 	}
 
 	/* Is this a room with an address book in it? */
-	if (CC->curr_view == VIEW_ADDRESSBOOK) {
+	if (CC->room.QRdefaultview == VIEW_ADDRESSBOOK) {
 		yes_any_vcard_room = 1;
 	}
 
@@ -315,7 +323,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 				 * vCard in the user's config room at all times.
 				 */
 				CtdlDeleteMessages(CC->room.QRname,
-						0L, "text/x-vcard", 1);
+						NULL, 0, "text/x-vcard", 1);
 
 				/* Make the author of the message the name of the user.
 				 */
@@ -353,8 +361,8 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 
 				/* Enforce local UID policy if applicable */
 				if (yes_my_citadel_config) {
-                        		snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
-                                		msg->cm_fields['A'], NODENAME);
+					snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
+						msg->cm_fields['A'], NODENAME);
 					vcard_set_prop(v, "UID", buf, 0);
 				}
 
@@ -363,7 +371,7 @@ int vcard_upload_beforesave(struct CtdlMessage *msg) {
 				 */
 				if (msg->cm_fields['E'] != NULL) free(msg->cm_fields['E']);
 				s = vcard_get_prop(v, "UID", 0, 0, 0);
-                        	if (s != NULL) {
+				if (s != NULL) {
 					msg->cm_fields['E'] = strdup(s);
 					if (msg->cm_fields['U'] == NULL) {
 						msg->cm_fields['U'] = strdup(s);
@@ -450,12 +458,12 @@ int vcard_upload_aftersave(struct CtdlMessage *msg) {
 
 			/* Store our Internet return address in memory */
 			v = vcard_load(msg->cm_fields['M']);
-			vcard_populate_cs_inet_email(v);
+			extract_primary_inet_email(CC->cs_inet_email,
+						sizeof CC->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) );
+			CtdlSaveMsgPointerInRoom(ADDRESS_BOOK_ROOM, I, 1, msg);
 
 			/* ...and also in the directory database. */
 			vcard_add_to_directory(I, NULL);
@@ -498,25 +506,25 @@ void vcard_gu_backend(long supplied_msgnum, void *userdata) {
  * and return an empty vCard.
  */
 struct vCard *vcard_get_user(struct ctdluser *u) {
-        char hold_rm[ROOMNAMELEN];
-        char config_rm[ROOMNAMELEN];
+	char hold_rm[ROOMNAMELEN];
+	char config_rm[ROOMNAMELEN];
 	struct CtdlMessage *msg;
 	struct vCard *v;
 	long VCmsgnum;
 
-        strcpy(hold_rm, CC->room.QRname);	/* save current room */
-        MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
+	strcpy(hold_rm, CC->room.QRname);	/* save current room */
+	MailboxName(config_rm, sizeof config_rm, u, USERCONFIGROOM);
 
-        if (getroom(&CC->room, config_rm) != 0) {
-                getroom(&CC->room, hold_rm);
-                return vcard_new();
-        }
+	if (getroom(&CC->room, config_rm) != 0) {
+		getroom(&CC->room, hold_rm);
+		return vcard_new();
+	}
 
-        /* We want the last (and probably only) vcard in this room */
+	/* We want the last (and probably only) vcard in this room */
 	VCmsgnum = (-1);
-        CtdlForEachMessage(MSGS_LAST, 1, "text/x-vcard",
+	CtdlForEachMessage(MSGS_LAST, 1, NULL, "text/x-vcard",
 		NULL, vcard_gu_backend, (void *)&VCmsgnum );
-        getroom(&CC->room, hold_rm);	/* return to saved room */
+	getroom(&CC->room, hold_rm);	/* return to saved room */
 
 	if (VCmsgnum < 0L) return vcard_new();
 
@@ -536,30 +544,30 @@ struct vCard *vcard_get_user(struct ctdluser *u) {
  * Write our config to disk
  */
 void vcard_write_user(struct ctdluser *u, struct vCard *v) {
-        char temp[PATH_MAX];
-        FILE *fp;
+	char temp[PATH_MAX];
+	FILE *fp;
 	char *ser;
 
-        strcpy(temp, tmpnam(NULL));
+	CtdlMakeTempFileName(temp, sizeof temp);
 	ser = vcard_serialize(v);
 
-        fp = fopen(temp, "w");
-        if (fp == NULL) return;
+	fp = fopen(temp, "w");
+	if (fp == NULL) return;
 	if (ser == NULL) {
 		fprintf(fp, "begin:vcard\r\nend:vcard\r\n");
 	} else {
 		fwrite(ser, strlen(ser), 1, fp);
 		free(ser);
 	}
-        fclose(fp);
+	fclose(fp);
 
-        /* This handy API function does all the work for us.
+	/* This handy API function does all the work for us.
 	 * NOTE: normally we would want to set that last argument to 1, to
 	 * force the system to delete the user's old vCard.  But it doesn't
 	 * have to, because the vcard_upload_beforesave() hook above
 	 * is going to notice what we're trying to do, and delete the old vCard.
 	 */
-        CtdlWriteObject(USERCONFIGROOM,	/* which room */
+	CtdlWriteObject(USERCONFIGROOM,	/* which room */
 			"text/x-vcard",	/* MIME type */
 			temp,		/* temp file */
 			u,		/* which user */
@@ -567,7 +575,7 @@ void vcard_write_user(struct ctdluser *u, struct vCard *v) {
 			0,		/* don't delete others of this type */
 			0);		/* no flags */
 
-        unlink(temp);
+	unlink(temp);
 }
 
 
@@ -721,7 +729,7 @@ void vcard_newuser(struct ctdluser *usbuf) {
 	lprintf(CTDL_DEBUG, "Converted <%s> to <%s>\n", usbuf->fullname, vname);
 
 	/* Create and save the vCard */
-        v = vcard_new();
+	v = vcard_new();
 	if (v == NULL) return;
 	sprintf(buf, "%s@%s", usbuf->fullname, config.c_fqdn);
 	for (i=0; i<strlen(buf); ++i) {
@@ -749,22 +757,22 @@ void vcard_purge(struct ctdluser *usbuf) {
 	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'] = 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");
+	msg->cm_magic = CTDLMESSAGE_MAGIC;
+	msg->cm_anon_type = MES_NORMAL;
+	msg->cm_format_type = 0;
+	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,
+	snprintf(buf, sizeof buf, VCARD_EXT_FORMAT,
 			msg->cm_fields['A'], NODENAME);
-        msg->cm_fields['E'] = strdup(buf);
+	msg->cm_fields['E'] = strdup(buf);
 
 	msg->cm_fields['S'] = strdup("CANCEL");
 
-        CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
-        CtdlFreeMessage(msg);
+	CtdlSubmitMsg(msg, NULL, ADDRESS_BOOK_ROOM);
+	CtdlFreeMessage(msg);
 }
 
 
@@ -868,6 +876,56 @@ void cmd_qdir(char *argbuf) {
 	cprintf("%d %s\n", CIT_OK, citadel_addr);
 }
 
+/*
+ * Query Directory, in fact an alias to match postfix tcp auth.
+ */
+void check_get(void) {
+	char internet_addr[256];
+
+	char cmdbuf[SIZ];
+
+	time(&CC->lastcmd);
+	memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
+	if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
+		lprintf(CTDL_CRIT, "Client disconnected: ending session.\n");
+		CC->kill_me = 1;
+		return;
+	}
+	lprintf(CTDL_INFO, ": %s\n", cmdbuf);
+	while (strlen(cmdbuf) < 3) strcat(cmdbuf, " ");
+
+	if (strcasecmp(cmdbuf, "GET "));
+	{
+		struct recptypes *rcpt;
+		char *argbuf = &cmdbuf[4];
+		
+		extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr);
+		rcpt = validate_recipients(internet_addr);
+		if ((rcpt != NULL)&&
+			(
+			 (*rcpt->recp_local != '\0')||
+			 (*rcpt->recp_room != '\0')||
+			 (*rcpt->recp_ignet != '\0')))
+		{
+
+			cprintf("200 OK %s\n", internet_addr);
+			lprintf(CTDL_INFO, "sending 200 OK for the room %s\n", rcpt->display_recp);
+		}
+		else 
+		{
+			cprintf("500 REJECT noone here by that name.\n");
+			
+			lprintf(CTDL_INFO, "sending 500 REJECT noone here by that name: %s\n", internet_addr);
+		}
+		if (rcpt != NULL) free (rcpt);
+	}
+///	CC->kill_me = 1;
+}
+
+void check_get_greeting(void) {
+/* dummy function, we have no greeting in this verry simple protocol. */
+}
+
 
 /*
  * We don't know if the Contacts room exists so we just create it at login
@@ -907,18 +965,194 @@ void vcard_session_login_hook(void) {
 	struct vCard *v;
 
 	v = vcard_get_user(&CC->user);
-	vcard_populate_cs_inet_email(v);
-
+	extract_primary_inet_email(CC->cs_inet_email,
+				sizeof CC->cs_inet_email, v);
 	vcard_free(v);
 
 	vcard_create_room();
 }
 
 
+/* 
+ * Turn an arbitrary RFC822 address into a struct vCard for possible
+ * inclusion into an address book.
+ */
+struct vCard *vcard_new_from_rfc822_addr(char *addr) {
+	struct vCard *v;
+	char user[256], node[256], name[256], email[256], n[256], uid[256];
+	int i;
+
+	v = vcard_new();
+	if (v == NULL) return(NULL);
+
+	process_rfc822_addr(addr, user, node, name);
+	vcard_set_prop(v, "fn", name, 0);
+
+	vcard_fn_to_n(n, name, sizeof n);
+	vcard_set_prop(v, "n", n, 0);
+
+	snprintf(email, sizeof email, "%s@%s", user, node);
+	vcard_set_prop(v, "email;internet", email, 0);
+
+	snprintf(uid, sizeof uid, "collected: %s %s@%s", name, user, node);
+	for (i=0; i<strlen(uid); ++i) {
+		if (isspace(uid[i])) uid[i] = '_';
+		uid[i] = tolower(uid[i]);
+	}
+	vcard_set_prop(v, "UID", uid, 0);
+
+	return(v);
+}
+
+
+
+/*
+ * This is called by store_harvested_addresses() to remove from the
+ * list any addresses we already have in our address book.
+ */
+void strip_addresses_already_have(long msgnum, void *userdata) {
+	char *collected_addresses;
+	struct CtdlMessage *msg;
+	struct vCard *v;
+	char *value = NULL;
+	int i, j;
+	char addr[256], user[256], node[256], name[256];
+
+	collected_addresses = (char *)userdata;
+
+	msg = CtdlFetchMessage(msgnum, 1);
+	if (msg == NULL) return;
+	v = vcard_load(msg->cm_fields['M']);
+	CtdlFreeMessage(msg);
+
+	i = 0;
+	while (value = vcard_get_prop(v, "email", 1, i++, 0), value != NULL) {
+
+		for (j=0; j<num_tokens(collected_addresses, ','); ++j) {
+			extract_token(addr, collected_addresses, j, ',', sizeof addr);
+
+			/* Remove the address if we already have it! */
+			process_rfc822_addr(addr, user, node, name);
+			snprintf(addr, sizeof addr, "%s@%s", user, node);
+			if (!strcasecmp(value, addr)) {
+				remove_token(collected_addresses, j, ',');
+			}
+		}
+
+	}
+
+	vcard_free(v);
+}
+
+
+
+/*
+ * Back end function for store_harvested_addresses()
+ */
+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, "text/x-vcard", NULL,
+		strip_addresses_already_have, aptr->collected_addresses);
+
+	if (strlen(aptr->collected_addresses) > 0)
+	   for (i=0; i<num_tokens(aptr->collected_addresses, ','); ++i) {
+
+		/* Make a vCard out of each address */
+		extract_token(recipient, aptr->collected_addresses, i, ',', sizeof recipient);
+		striplt(recipient);
+		v = vcard_new_from_rfc822_addr(recipient);
+		if (v != NULL) {
+			vmsg = malloc(sizeof(struct CtdlMessage));
+			memset(vmsg, 0, sizeof(struct CtdlMessage));
+			vmsg->cm_magic = CTDLMESSAGE_MAGIC;
+			vmsg->cm_anon_type = MES_NORMAL;
+			vmsg->cm_format_type = FMT_RFC822;
+			vmsg->cm_fields['A'] = strdup("Citadel");
+			vmsg->cm_fields['E'] =  strdup(vcard_get_prop(v, "UID", 0, 0, 0));
+			ser = vcard_serialize(v);
+			if (ser != NULL) {
+				vmsg->cm_fields['M'] = malloc(strlen(ser) + 1024);
+				sprintf(vmsg->cm_fields['M'],
+					"Content-type: text/x-vcard"
+					"\r\n\r\n%s\r\n", ser);
+				free(ser);
+			}
+			vcard_free(v);
+
+			lprintf(CTDL_DEBUG, "Adding contact: %s\n", recipient);
+			vmsgnum = CtdlSubmitMsg(vmsg, NULL, aptr->roomname);
+			CtdlFreeMessage(vmsg);
+		}
+	}
+
+	free(aptr->roomname);
+	free(aptr->collected_addresses);
+	free(aptr);
+}
+
+
+/*
+ * When a user sends a message, we may harvest one or more email addresses
+ * from the recipient list to be added to the user's address book.  But we
+ * want to do this asynchronously so it doesn't keep the user waiting.
+ */
+void store_harvested_addresses(void) {
+
+	struct addresses_to_be_filed *aptr = NULL;
+
+	if (atbf == NULL) return;
+
+	begin_critical_section(S_ATBF);
+	while (atbf != NULL) {
+		aptr = atbf;
+		atbf = atbf->next;
+		end_critical_section(S_ATBF);
+		store_this_ha(aptr);
+		begin_critical_section(S_ATBF);
+	}
+	end_critical_section(S_ATBF);
+}
+
+
+/* 
+ * Function to output vCard data as plain text.  Nobody uses MSG0 anymore, so
+ * really this is just so we expose the vCard data to the full text indexer.
+ */
+void vcard_fixed_output(char *ptr, int len) {
+	char *serialized_vcard;
+	struct vCard *v;
+	char *key, *value;
+	int i = 0;
+
+	serialized_vcard = malloc(len + 1);
+	safestrncpy(serialized_vcard, ptr, len+1);
+	v = vcard_load(serialized_vcard);
+	free(serialized_vcard);
+
+	i = 0;
+	while (key = vcard_get_prop(v, "", 0, i, 1), key != NULL) {
+		value = vcard_get_prop(v, "", 0, i++, 0);
+		cprintf("%s\n", value);
+	}
+
+	vcard_free(v);
+}
+
+
 
 char *serv_vcard_init(void)
 {
 	struct ctdlroom qr;
+	char filename[256];
+	FILE *fp;
 
 	CtdlRegisterSessionHook(vcard_session_login_hook, EVT_LOGIN);
 	CtdlRegisterMessageHook(vcard_upload_beforesave, EVT_BEFORESAVE);
@@ -932,6 +1166,8 @@ char *serv_vcard_init(void)
 	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);
 
 	/* Create the Global ADdress Book room if necessary */
 	create_room(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
@@ -941,7 +1177,29 @@ char *serv_vcard_init(void)
 		qr.QRep.expire_mode = EXPIRE_MANUAL;
 		qr.QRdefaultview = VIEW_ADDRESSBOOK;	/* 2 = address book view */
 		lputroom(&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);
+		chown(filename, CTDLUID, (-1));
 	}
 
 	return "$Id$";
 }
+
+
+char *serv_postfix_tcpdict(void)
+{
+	CtdlRegisterServiceHook(config.c_pftcpdict_port,	/* Postfix */
+				NULL,
+				check_get_greeting,
+				check_get,
+				NULL);
+	return "$Id$";
+}