X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fupgrade%2Fserv_upgrade.c;h=12261deb35c7c9271cd24b96db4b2135959a88d1;hb=c10e7d69147159c0f46b6406f25d3fea0732cac6;hp=06eb8bcae613b8d47eb1749085c5c55b91f664f0;hpb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;p=citadel.git

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 06eb8bcae..12261deb3 100644
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -1,7 +1,10 @@
 /*
- * Transparently handle the upgrading of server data formats.
+ * Transparently handle the upgrading of server data formats.  If we see
+ * an existing version number of our database, we can make some intelligent
+ * guesses about what kind of data format changes need to be applied, and
+ * we apply them transparently.
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
@@ -49,6 +52,8 @@
 #include "serv_upgrade.h"
 #include "euidindex.h"
 #include "ctdl_module.h"
+#include "serv_vcard.h"
+#include "internet_addressing.h"
 
 
 /*
@@ -95,75 +100,24 @@ void fix_sys_user_name(void)
 
 
 /* 
- * Back end processing function for cmd_bmbx
+ * Back end processing function for reindex_uids()
+ * Call this function as a ForEachUser backend in order to queue up
+ * user names, or call it with a null user to make it do the processing.
+ * This allows us to maintain the list as a static instead of passing
+ * pointers around.
  */
-void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
-	static struct RoomProcList *rplist = NULL;
-	struct RoomProcList *ptr;
-	struct ctdlroom qr;
-
-	/* Lazy programming here.  Call this function as a CtdlForEachRoom backend
-	 * in order to queue up the room names, or call it with a null room
-	 * to make it do the processing.
-	 */
-	if (qrbuf != NULL) {
-		ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
-		if (ptr == NULL) return;
-
-		safestrncpy(ptr->name, qrbuf->QRname, sizeof ptr->name);
-		ptr->next = rplist;
-		rplist = ptr;
-		return;
-	}
-
-	while (rplist != NULL) {
-
-		if (CtdlGetRoomLock(&qr, rplist->name) == 0) {
-			syslog(LOG_DEBUG, "Processing <%s>...", rplist->name);
-			if ( (qr.QRflags & QR_MAILBOX) == 0) {
-				syslog(LOG_DEBUG, "  -- not a mailbox");
-			}
-			else {
-
-				qr.QRgen = time(NULL);
-				syslog(LOG_DEBUG, "  -- fixed!");
-			}
-			CtdlPutRoomLock(&qr);
-		}
-
-		ptr = rplist;
-		rplist = rplist->next;
-		free(ptr);
-	}
-}
-
-/*
- * quick fix to bump mailbox generation numbers
- */
-void bump_mailbox_generation_numbers(void) {
-	syslog(LOG_WARNING, "Applying security fix to mailbox rooms");
-	CtdlForEachRoom(cmd_bmbx_backend, NULL);
-	cmd_bmbx_backend(NULL, NULL);
-	return;
-}
-
-
-/* 
- * Back end processing function for convert_ctdluid_to_minusone()
- */
-void cbtm_backend(struct ctdluser *usbuf, void *data) {
+void reindex_uids_backend(struct ctdluser *usbuf, void *data) {
 	static struct UserProcList *uplist = NULL;
 	struct UserProcList *ptr;
 	struct ctdluser us;
 
-	/* Lazy programming here.  Call this function as a ForEachUser backend
-	 * in order to queue up the room names, or call it with a null user
-	 * to make it do the processing.
-	 */
+	/* this is the calling mode where we add a user */
+
 	if (usbuf != NULL) {
-		ptr = (struct UserProcList *)
-			malloc(sizeof (struct UserProcList));
-		if (ptr == NULL) return;
+		ptr = (struct UserProcList *) malloc(sizeof (struct UserProcList));
+		if (ptr == NULL) {
+			return;
+		}
 
 		safestrncpy(ptr->user, usbuf->fullname, sizeof ptr->user);
 		ptr->next = uplist;
@@ -171,14 +125,22 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
 		return;
 	}
 
+	/* this is the calling mode where we do the processing */
+
 	while (uplist != NULL) {
 
 		if (CtdlGetUserLock(&us, uplist->user) == 0) {
-			syslog(LOG_DEBUG, "Processing <%s>...", uplist->user);
+			syslog(LOG_DEBUG, "Processing <%s> (%d)", uplist->user, us.uid);
 			if (us.uid == CTDLUID) {
-				us.uid = (-1);
+				us.uid = NATIVE_AUTH_UID;
 			}
 			CtdlPutUserLock(&us);
+			if (us.uid > 0) {		// if non-native auth , index by uid
+				StrBuf *claimed_id = NewStrBuf();
+				StrBufPrintf(claimed_id, "uid:%d", us.uid);
+				attach_extauth(&us, claimed_id);
+				FreeStrBuf(&claimed_id);
+			}
 		}
 
 		ptr = uplist;
@@ -188,12 +150,13 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
 }
 
 /*
- * quick fix to change all CTDLUID users to (-1)
+ * Build extauth index of all users with uid-based join (system auth, LDAP auth)
+ * Also changes all users with a uid of CTDLUID to NATIVE_AUTH_UID (-1)
  */
-void convert_ctdluid_to_minusone(void) {
-	syslog(LOG_WARNING, "Applying uid changes");
-	ForEachUser(cbtm_backend, NULL);
-	cbtm_backend(NULL, NULL);
+void reindex_uids(void) {
+	syslog(LOG_WARNING, "upgrade: reindexing and applying uid changes");
+	ForEachUser(reindex_uids_backend, NULL);
+	reindex_uids_backend(NULL, NULL);
 	return;
 }
 
@@ -253,6 +216,173 @@ void guess_time_zone(void) {
 }
 
 
+/*
+ * Per-room callback function for ingest_old_roominfo_and_roompic_files()
+ *
+ * This is the second pass, where we process the list of rooms with info or pic files.
+ */
+void iorarf_oneroom(char *roomname, char *infofile, char *picfile)
+{
+	FILE *fp;
+	long data_length;
+	char *unencoded_data;
+	char *encoded_data;
+	long info_msgnum = 0;
+	long pic_msgnum = 0;
+	char subject[SIZ];
+
+	// Test for the presence of a legacy "room info file"
+	if (!IsEmptyStr(infofile)) {
+		fp = fopen(infofile, "r");
+	}
+	else {
+		fp = NULL;
+	}
+	if (fp) {
+		fseek(fp, 0, SEEK_END);
+		data_length = ftell(fp);
+
+		if (data_length >= 1) {
+			rewind(fp);
+			unencoded_data = malloc(data_length);
+			if (unencoded_data) {
+				fread(unencoded_data, data_length, 1, fp);
+				encoded_data = malloc((data_length * 2) + 100);
+				if (encoded_data) {
+					sprintf(encoded_data, "Content-type: text/plain\nContent-transfer-encoding: base64\n\n");
+					CtdlEncodeBase64(&encoded_data[strlen(encoded_data)], unencoded_data, data_length, 1);
+					snprintf(subject, sizeof subject, "Imported room banner for %s", roomname);
+					info_msgnum = quickie_message("Citadel", NULL, NULL, SYSCONFIGROOM, encoded_data, FMT_RFC822, subject);
+					free(encoded_data);
+				}
+				free(unencoded_data);
+			}
+		}
+		fclose(fp);
+		if (info_msgnum > 0) unlink(infofile);
+	}
+
+	// Test for the presence of a legacy "room picture file" and import it.
+	if (!IsEmptyStr(picfile)) {
+		fp = fopen(picfile, "r");
+	}
+	else {
+		fp = NULL;
+	}
+	if (fp) {
+		fseek(fp, 0, SEEK_END);
+		data_length = ftell(fp);
+
+		if (data_length >= 1) {
+			rewind(fp);
+			unencoded_data = malloc(data_length);
+			if (unencoded_data) {
+				fread(unencoded_data, data_length, 1, fp);
+				encoded_data = malloc((data_length * 2) + 100);
+				if (encoded_data) {
+					sprintf(encoded_data, "Content-type: image/gif\nContent-transfer-encoding: base64\n\n");
+					CtdlEncodeBase64(&encoded_data[strlen(encoded_data)], unencoded_data, data_length, 1);
+					snprintf(subject, sizeof subject, "Imported room icon for %s", roomname);
+					pic_msgnum = quickie_message("Citadel", NULL, NULL, SYSCONFIGROOM, encoded_data, FMT_RFC822, subject);
+					free(encoded_data);
+				}
+				free(unencoded_data);
+			}
+		}
+		fclose(fp);
+		if (pic_msgnum > 0) unlink(picfile);
+	}
+
+	// Now we have the message numbers of our new banner and icon.  Record them in the room record.
+	// NOTE: we are not deleting the old msgnum_info because that position in the record was previously
+	// a pointer to the highest message number which existed in the room when the info file was saved,
+	// and we don't want to delete messages that are not *actually* old banners.
+	struct ctdlroom qrbuf;
+	if (CtdlGetRoomLock(&qrbuf, roomname) == 0) {
+		qrbuf.msgnum_info = info_msgnum;
+		qrbuf.msgnum_pic = pic_msgnum;
+		CtdlPutRoomLock(&qrbuf);
+	}
+
+}
+
+
+struct iorarf_list {
+	struct iorarf_list *next;
+	char name[ROOMNAMELEN];
+	char info[PATH_MAX];
+	char pic[PATH_MAX];
+};
+
+
+/*
+ * Per-room callback function for ingest_old_roominfo_and_roompic_files()
+ *
+ * This is the first pass, where the list of qualifying rooms is gathered.
+ */
+void iorarf_backend(struct ctdlroom *qrbuf, void *data)
+{
+	FILE *fp;
+	struct iorarf_list **iorarf_list = (struct iorarf_list **)data;
+
+	struct iorarf_list *i = malloc(sizeof(struct iorarf_list));
+	i->next = *iorarf_list;
+	strcpy(i->name, qrbuf->QRname);
+	strcpy(i->info, "");
+	strcpy(i->pic, "");
+
+	// Test for the presence of a legacy "room info file"
+	assoc_file_name(i->info, sizeof i->info, qrbuf, ctdl_info_dir);
+	fp = fopen(i->info, "r");
+	if (fp) {
+		fclose(fp);
+	}
+	else {
+		i->info[0] = 0;
+	}
+
+	// Test for the presence of a legacy "room picture file"
+	assoc_file_name(i->pic, sizeof i->pic, qrbuf, ctdl_image_dir);
+	fp = fopen(i->pic, "r");
+	if (fp) {
+		fclose(fp);
+	}
+	else {
+		i->pic[0] = 0;
+	}
+
+	if ( (!IsEmptyStr(i->info)) || (!IsEmptyStr(i->pic)) ) {
+		*iorarf_list = i;
+	}
+	else {
+		free(i);
+	}
+}
+
+
+/*
+ * Prior to Citadel Server version 902, room info and pictures (which comprise the
+ * displayed banner for each room) were stored in the filesystem.  If we are upgrading
+ * from version >000 to version >=902, ingest those files into the database.
+ */
+void ingest_old_roominfo_and_roompic_files(void)
+{
+	struct iorarf_list *il = NULL;
+
+	CtdlForEachRoom(iorarf_backend, &il);
+
+	struct iorarf_list *p;
+	while (il) {
+		iorarf_oneroom(il->name, il->info, il->pic);
+		p = il->next;
+		free(il);
+		il = p;
+	}
+
+	unlink(ctdl_info_dir);
+}
+
+
 /*
  * Perform any upgrades that can be done automatically based on our knowledge of the previous
  * version of Citadel server that was running here.
@@ -303,6 +433,90 @@ void update_config(void) {
 }
 
 
+/*
+ * Helper function for move_inet_addrs_from_vcards_to_user_records()
+ *
+ * Call this function as a ForEachUser backend in order to queue up
+ * user names, or call it with a null user to make it do the processing.
+ * This allows us to maintain the list as a static instead of passing
+ * pointers around.
+ */
+void miafvtur_backend(struct ctdluser *usbuf, void *data) {
+
+	struct miafvtur {
+		char name[64];
+		char emails[512];
+	};
+
+	static struct miafvtur *m = NULL;
+	static int num_m = 0;
+	static int alloc_m = 0;
+
+	/* this is the calling mode where we add a user */
+
+	if (usbuf != NULL) {
+		char primary_inet_email[512] = { 0 };
+		char other_inet_emails[512] = { 0 };
+		struct vCard *v = vcard_get_user(usbuf);
+		if (!v) return;
+		extract_inet_email_addrs(primary_inet_email, sizeof primary_inet_email, other_inet_emails, sizeof other_inet_emails, v, 1);
+		vcard_free(v);
+	
+		if ( (IsEmptyStr(primary_inet_email)) && (IsEmptyStr(other_inet_emails)) ) {
+			return;
+		}
+
+		if (num_m >= alloc_m) {
+			if (alloc_m == 0) {
+				alloc_m = 100;
+				m = malloc(sizeof(struct miafvtur) * alloc_m);
+			}
+			else {
+				alloc_m *= 2;
+				m = realloc(m, (sizeof(struct miafvtur) * alloc_m));
+			}
+		}
+
+		strcpy(m[num_m].name, usbuf->fullname);
+		snprintf(m[num_m].emails, 512, "%s%s%s",
+			(!IsEmptyStr(primary_inet_email) ? primary_inet_email : ""),
+			((!IsEmptyStr(primary_inet_email)&&(!IsEmptyStr(other_inet_emails))) ? "|" : ""),
+			(!IsEmptyStr(other_inet_emails) ? other_inet_emails : "")
+		);
+		++num_m;
+		return;
+	}
+
+	/* this is the calling mode where we do the processing */
+
+	int i;
+	struct ctdluser u;
+
+	for (i=0; i<num_m; ++i) {
+		syslog(LOG_DEBUG, "<%s> = <%s>", m[i].name, m[i].emails);
+		if (CtdlGetUser(&u, m[i].name) == 0) {
+			safestrncpy(u.emailaddrs, m[i].emails, sizeof u.emailaddrs);
+			CtdlPutUser(&u);
+		}
+	}
+	free(m);
+	num_m = 0;
+	alloc_m = 0;
+	return;
+}
+
+
+/*
+ * Prior to version 912 we kept a user's various Internet email addresses in their vCards.
+ * This function moves them over to the user record, which is where we keep them now.
+ */
+void move_inet_addrs_from_vcards_to_user_records(void)
+{
+	ForEachUser(miafvtur_backend, NULL);
+	miafvtur_backend(NULL, NULL);
+	CtdlRebuildDirectoryIndex();
+}
+
 
 /*
  * Based on the server version number reported by the existing database,
@@ -310,15 +524,10 @@ void update_config(void) {
  */
 void check_server_upgrades(void) {
 
-	syslog(LOG_INFO, "Existing database version on disk is %d.%02d",
-		(CtdlGetConfigInt("MM_hosted_upgrade_level") / 100),
-		(CtdlGetConfigInt("MM_hosted_upgrade_level") % 100)
-	);
+	syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
 
 	if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
-		syslog(LOG_WARNING,
-			"Server hosted updates need to be processed at this time.  Please wait..."
-		);
+		syslog(LOG_WARNING, "Server hosted updates need to be processed at this time.  Please wait...");
 	}
 	else {
 		return;
@@ -326,15 +535,12 @@ void check_server_upgrades(void) {
 
 	update_config();
 
-	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 555)) {
+	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 591)) {
 		syslog(LOG_EMERG, "This database is too old to be upgraded.  Citadel server will exit.");
 		exit(EXIT_FAILURE);
 	}
-	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 591)) {
-		bump_mailbox_generation_numbers();
-	}
-	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 608)) {
-		convert_ctdluid_to_minusone();
+	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 913)) {
+		reindex_uids();
 	}
 	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 659)) {
 		rebuild_euid_index();
@@ -354,10 +560,14 @@ void check_server_upgrades(void) {
 			QRoom.QRdefaultview = VIEW_QUEUE;
 			CtdlPutRoom(&QRoom);
 		}
-		if (!CtdlGetRoom(&QRoom, FNBL_QUEUE_ROOM)) {
-			QRoom.QRdefaultview = VIEW_QUEUE;
-			CtdlPutRoom(&QRoom);
-		}
+	}
+
+	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 902)) {
+		ingest_old_roominfo_and_roompic_files();
+	}
+
+	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 912)) {
+		move_inet_addrs_from_vcards_to_user_records();
 	}
 
 	CtdlSetConfigInt("MM_hosted_upgrade_level", REV_LEVEL);