X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fmigrate%2Fserv_migrate.c;h=aad6615f553dce0659d0f3954edbbd6810411f6d;hb=0fcfc4d81b4def0bd0f7562465b5bf7ef4b7857b;hp=aba5cdb231c025c4838b28e46c2f2535c75d5e88;hpb=220efd57cbdbf4fa2036380362dd1880c125c723;p=citadel.git

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index aba5cdb23..aad6615f5 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -1,7 +1,7 @@
 /*
  * This module dumps and/or loads the Citadel database in XML format.
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
@@ -34,18 +34,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.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 <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <ctype.h>
@@ -63,15 +52,12 @@
 #include "euidindex.h"
 #include "ctdl_module.h"
 
-#define END_OF_MESSAGE	"---eom---dbd---"
-
 char migr_tempfilename1[PATH_MAX];
 char migr_tempfilename2[PATH_MAX];
 FILE *migr_global_message_list;
 int total_msgs = 0;
 char *ikey = NULL;			// If we're importing a config key we store it here.
 
-
 /******************************************************************************
  *        Code which implements the export appears in this section            *
  ******************************************************************************/
@@ -114,21 +100,30 @@ void xml_strout(char *str) {
 /*
  * Export a user record as XML
  */
-void migr_export_users_backend(struct ctdluser *buf, void *data) {
+void migr_export_users_backend(char *username, void *data) {
+
+	struct ctdluser u;
+	if (CtdlGetUser(&u, username) != 0) {
+		return;
+	}
+
 	client_write(HKEY("<user>\n"));
-	cprintf("<u_version>%d</u_version>\n", buf->version);
-	cprintf("<u_uid>%ld</u_uid>\n", (long)buf->uid);
-	client_write(HKEY("<u_password>"));	xml_strout(buf->password);		client_write(HKEY("</u_password>\n"));
-	cprintf("<u_flags>%u</u_flags>\n", buf->flags);
-	cprintf("<u_timescalled>%ld</u_timescalled>\n", buf->timescalled);
-	cprintf("<u_posted>%ld</u_posted>\n", buf->posted);
-	cprintf("<u_axlevel>%d</u_axlevel>\n", buf->axlevel);
-	cprintf("<u_usernum>%ld</u_usernum>\n", buf->usernum);
-	cprintf("<u_lastcall>%ld</u_lastcall>\n", (long)buf->lastcall);
-	cprintf("<u_USuserpurge>%d</u_USuserpurge>\n", buf->USuserpurge);
-	client_write(HKEY("<u_fullname>"));	xml_strout(buf->fullname);		client_write(HKEY("</u_fullname>\n"));
-	cprintf("<u_msgnum_bio>%ld</u_msgnum_bio>\n", buf->msgnum_bio);
-	cprintf("<u_msgnum_pic>%ld</u_msgnum_pic>\n", buf->msgnum_pic);
+	cprintf("<u_version>%d</u_version>\n", u.version);
+	cprintf("<u_uid>%ld</u_uid>\n", (long)u.uid);
+	client_write(HKEY("<u_password>"));	xml_strout(u.password);		client_write(HKEY("</u_password>\n"));
+	cprintf("<u_flags>%u</u_flags>\n", u.flags);
+	cprintf("<u_timescalled>%ld</u_timescalled>\n", u.timescalled);
+	cprintf("<u_posted>%ld</u_posted>\n", u.posted);
+	cprintf("<u_axlevel>%d</u_axlevel>\n", u.axlevel);
+	cprintf("<u_usernum>%ld</u_usernum>\n", u.usernum);
+	cprintf("<u_lastcall>%ld</u_lastcall>\n", (long)u.lastcall);
+	cprintf("<u_USuserpurge>%d</u_USuserpurge>\n", u.USuserpurge);
+	client_write(HKEY("<u_fullname>"));	xml_strout(u.fullname);		client_write(HKEY("</u_fullname>\n"));
+	cprintf("<u_msgnum_bio>%ld</u_msgnum_bio>\n", u.msgnum_bio);
+	cprintf("<u_msgnum_pic>%ld</u_msgnum_pic>\n", u.msgnum_pic);
+	cprintf("<u_emailaddrs>%s</u_emailaddrs>\n", u.emailaddrs);
+	cprintf("<u_msgnum_inboxrules>%ld</u_msgnum_inboxrules>\n", u.msgnum_inboxrules);
+	cprintf("<u_lastproc_inboxrules>%ld</u_lastproc_inboxrules>\n", u.lastproc_inboxrules);
 	client_write(HKEY("</user>\n"));
 }
 
@@ -253,7 +248,6 @@ int is_sequence_set(char *s) {
 }
 
 
-
 /* 
  *  Traverse the visits file...
  */
@@ -321,7 +315,7 @@ void migr_export_message(long msgnum) {
 
 	/* Ok, here we go ... */
 
-	msg = CtdlFetchMessage(msgnum, 1, 0);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) return;	/* fail silently */
 
 	client_write(HKEY("<message>\n"));
@@ -330,7 +324,6 @@ void migr_export_message(long msgnum) {
 	cprintf("<msg_meta_refcount>%d</msg_meta_refcount>\n", smi.meta_refcount);
 	cprintf("<msg_meta_rfc822_length>%ld</msg_meta_rfc822_length>\n", smi.meta_rfc822_length);
 	client_write(HKEY("<msg_meta_content_type>")); xml_strout(smi.meta_content_type); client_write(HKEY("</msg_meta_content_type>\n"));
-	client_write(HKEY("<msg_mimetype>")); xml_strout(smi.mimetype); client_write(HKEY("</msg_mimetype>\n"));
 
 	client_write(HKEY("<msg_text>"));
 	CtdlSerializeMessage(&smr, msg);
@@ -360,7 +353,6 @@ void migr_export_message(long msgnum) {
 }
 
 
-
 void migr_export_openids(void) {
 	struct cdbdata *cdboi;
 	long usernum;
@@ -406,8 +398,6 @@ void migr_export_configs(void) {
 }
 
 
-
-
 void migr_export_messages(void) {
 	char buf[SIZ];
 	long msgnum;
@@ -435,16 +425,17 @@ void migr_export_messages(void) {
 		}
 		fclose(migr_global_message_list);
 	}
-	if (Ctx->kill_me == 0)
+	if (Ctx->kill_me == 0) {
 		syslog(LOG_INFO, "Exported %d messages.", count);
-	else
+	}
+	else {
 		syslog(LOG_ERR, "Export aborted due to client disconnect!");
+	}
 
 	migr_export_message(-1L);	/* This frees the encoding buffer */
 }
 
 
-
 void migr_do_export(void) {
 	CitContext *Ctx;
 
@@ -472,15 +463,13 @@ void migr_do_export(void) {
 	if (Ctx->kill_me == 0)	migr_export_visits();
 	cprintf("<progress>%d</progress>\n", 25);
 	if (Ctx->kill_me == 0)	migr_export_messages();
-	client_write(HKEY("</citadel_migrate_data>\n"));
 	cprintf("<progress>%d</progress>\n", 100);
+	client_write(HKEY("</citadel_migrate_data>\n"));
 	client_write(HKEY("000\n"));
 	Ctx->dont_term = 0;
 }
 
 
-
-
 /******************************************************************************
  *                              Import code                                   *
  *    Here's the code that implements the import side.  It's going to end up  *
@@ -586,6 +575,9 @@ int migr_userrecord(void *data, const char *el)
 	else if (!strcasecmp(el, "u_fullname"))			safestrncpy(usbuf.fullname, ChrPtr(migr_chardata), sizeof usbuf.fullname);
 	else if (!strcasecmp(el, "u_msgnum_bio"))		usbuf.msgnum_bio = atol(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "u_msgnum_pic"))		usbuf.msgnum_pic = atol(ChrPtr(migr_chardata));
+	else if (!strcasecmp(el, "u_emailaddrs"))		safestrncpy(usbuf.emailaddrs, ChrPtr(migr_chardata), sizeof usbuf.emailaddrs);
+	else if (!strcasecmp(el, "u_msgnum_inboxrules"))	usbuf.msgnum_inboxrules = atol(ChrPtr(migr_chardata));
+	else if (!strcasecmp(el, "u_lastproc_inboxrules"))	usbuf.lastproc_inboxrules = atol(ChrPtr(migr_chardata));
 	else return 0;
 	return 1;
 }
@@ -614,9 +606,10 @@ int migr_roomrecord(void *data, const char *el)
 	return 1;
 }
 
+
 int migr_floorrecord(void *data, const char *el)
 {
-	if (!strcasecmp(el, "f_num"))			floornum = atoi(ChrPtr(migr_chardata));
+	if (!strcasecmp(el, "f_num"))				floornum = atoi(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "f_flags"))			flbuf.f_flags = atoi(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "f_name"))			safestrncpy(flbuf.f_name, ChrPtr(migr_chardata), sizeof flbuf.f_name);
 	else if (!strcasecmp(el, "f_ref_count"))		flbuf.f_ref_count = atoi(ChrPtr(migr_chardata));
@@ -626,6 +619,7 @@ int migr_floorrecord(void *data, const char *el)
 	return 1;
 }
 
+
 int migr_visitrecord(void *data, const char *el)
 {
 	if (!strcasecmp(el, "v_roomnum"))			vbuf.v_roomnum = atol(ChrPtr(migr_chardata));
@@ -781,9 +775,9 @@ void migr_xml_end(void *data, const char *el)
 	}
 
 	/*** VISITS ***/
-	else if ((!strncasecmp(el, HKEY("v_"))) && 
-		 migr_visitrecord(data, el))
+	else if ((!strncasecmp(el, HKEY("v_"))) && migr_visitrecord(data, el)) {
 		; /* Nothing to do anymore */
+	}
 	else if (!strcasecmp(el, "visit")) {
 		put_visit(&vbuf);
 		syslog(LOG_INFO, "Imported visit: %ld/%ld/%ld", vbuf.v_roomnum, vbuf.v_roomgen, vbuf.v_usernum);
@@ -795,7 +789,6 @@ void migr_xml_end(void *data, const char *el)
 	else if (!strcasecmp(el, "msg_meta_refcount"))		smi.meta_refcount = atoi(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "msg_meta_rfc822_length"))	smi.meta_rfc822_length = atoi(ChrPtr(migr_chardata));
 	else if (!strcasecmp(el, "msg_meta_content_type"))	safestrncpy(smi.meta_content_type, ChrPtr(migr_chardata), sizeof smi.meta_content_type);
-	else if (!strcasecmp(el, "msg_mimetype"))	        safestrncpy(smi.mimetype, ChrPtr(migr_chardata), sizeof smi.mimetype);
 
 	else if (!strcasecmp(el, "msg_text"))
 	{
@@ -820,14 +813,14 @@ void migr_xml_end(void *data, const char *el)
 		}
 
 		syslog(LOG_INFO,
-		       "%s message #%ld, size=%d, refcount=%d, bodylength=%ld, content-type: %s / %s",
+		       "%s message #%ld, size=%d, refcount=%d, bodylength=%ld, content-type: %s",
 		       (rc!= 0)?"failed to import ":"Imported ",
 		       import_msgnum,
 		       StrLength(migr_MsgData),
 		       smi.meta_refcount,
 		       smi.meta_rfc822_length,
-		       smi.meta_content_type,
-		       smi.mimetype);
+		       smi.meta_content_type
+		);
 		memset(&smi, 0, sizeof(smi));
 	}
 
@@ -837,20 +830,16 @@ void migr_xml_end(void *data, const char *el)
 }
 
 
-
-
 /*
  * Import begins here
  */
 void migr_do_import(void) {
-	StrBuf *Buf;
 	XML_Parser xp;
-	int Finished = 0;
+	char buf[SIZ];
 	
 	unbuffer_output();
 	migr_chardata = NewStrBufPlain(NULL, SIZ * 20);
 	migr_MsgData = NewStrBufPlain(NULL, SIZ * 20);
-	Buf = NewStrBufPlain(NULL, SIZ);
 	xp = XML_ParserCreate(NULL);
 	if (!xp) {
 		cprintf("%d Failed to create XML parser instance\n", ERROR+INTERNAL_ERROR);
@@ -866,26 +855,14 @@ void migr_do_import(void) {
 
 	client_set_inbound_buf(SIZ * 10);
 
-	while (!Finished && client_read_random_blob(Buf, -1) >= 0) {
-		if ((StrLength(Buf) > 4) &&
-		    !strcmp(ChrPtr(Buf) + StrLength(Buf) - 4, "000\n"))
-		{
-			Finished = 1;
-			StrBufCutAt(Buf, StrLength(Buf) - 4, NULL);
-		}
+	while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) {
+		XML_Parse(xp, buf, strlen(buf), 0);
 		if (server_shutting_down)
 			break;	// Should we break or return?
-		
-		if (StrLength(Buf) == 0)
-			continue;
-
-		XML_Parse(xp, ChrPtr(Buf), StrLength(Buf), 0);
-		FlushStrBuf(Buf);
 	}
 
 	XML_Parse(xp, "", 0, 1);
 	XML_ParserFree(xp);
-	FreeStrBuf(&Buf);
 	FreeStrBuf(&migr_chardata);
 	FreeStrBuf(&migr_MsgData);
 	rebuild_euid_index();
@@ -919,7 +896,6 @@ HashList *UsedMessageIDS = NULL;
 
 int migr_restore_message_metadata(long msgnum, int refcount)
 {
-	CitContext *CCC = MyContext();
 	struct MetaData smi;
 	struct CtdlMessage *msg;
 	char *mptr = NULL;
@@ -948,7 +924,7 @@ int migr_restore_message_metadata(long msgnum, int refcount)
 
 	/* Ok, here we go ... */
 
-	msg = CtdlFetchMessage(msgnum, 1, 0);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) {
 		return 1;
 	}
@@ -975,19 +951,18 @@ int migr_restore_message_metadata(long msgnum, int refcount)
 		}
 	}
 
-	CCC->redirect_buffer = PlainMessageBuf;
+	CC->redirect_buffer = PlainMessageBuf;
 	CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, QP_EADDR);
-	smi.meta_rfc822_length = StrLength(CCC->redirect_buffer);
-	CCC->redirect_buffer = NULL;
-
+	smi.meta_rfc822_length = StrLength(CC->redirect_buffer);
+	CC->redirect_buffer = NULL;
 
 	syslog(LOG_INFO,
-	       "Setting message #%ld meta data to: refcount=%d, bodylength=%ld, content-type: %s / %s",
+	       "Setting message #%ld meta data to: refcount=%d, bodylength=%ld, content-type: %s",
 	       smi.meta_msgnum,
 	       smi.meta_refcount,
 	       smi.meta_rfc822_length,
-	       smi.meta_content_type,
-	       smi.mimetype);
+	       smi.meta_content_type
+	);
 
 	PutMetaData(&smi);
 
@@ -996,6 +971,7 @@ int migr_restore_message_metadata(long msgnum, int refcount)
 	return 0;
 }
 
+
 void migr_check_room_msg(long msgnum, void *userdata) {
 	fprintf(migr_global_message_list, "%ld %s\n", msgnum, CC->room.QRname);
 }
@@ -1009,6 +985,7 @@ void migr_check_rooms_backend(struct ctdlroom *buf, void *data) {
 	CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, migr_check_room_msg, NULL);
 }
 
+
 void RemoveMessagesFromRooms(StrBuf *RoomNameVec, long msgnum) {
 	struct MetaData smi;
 	const char *Pos = NULL;
@@ -1021,9 +998,10 @@ void RemoveMessagesFromRooms(StrBuf *RoomNameVec, long msgnum) {
 		CtdlDeleteMessages(ChrPtr(oneRoom), &msgnum, 1, "");
 	};
 	GetMetaData(&smi, msgnum);
-	TDAP_AdjRefCount(msgnum, -smi.meta_refcount);
+	AdjRefCount(msgnum, -smi.meta_refcount);
 }
 
+
 void migr_do_restore_meta(void) {
 	char buf[SIZ];
 	int failGetMessage;
@@ -1071,14 +1049,16 @@ void migr_do_restore_meta(void) {
 				}
 				refcount = 1;
 				lastnum = msgnum;
-				if (prn != NULL)
+				if (prn != NULL) {
 					StrBufPlain(RoomNames, prn + 1, -1);
+				}
 				StrBufTrim(RoomNames);
 			}
 			else {
 				if (prn != NULL) {
-					if (StrLength(RoomNames) > 0)
+					if (StrLength(RoomNames) > 0) {
 						StrBufAppendBufPlain(RoomNames, HKEY("|"), 0);
+					}
 					StrBufAppendBufPlain(RoomNames, prn, -1, 1);
 					StrBufTrim(RoomNames);
 				}
@@ -1099,8 +1079,6 @@ void migr_do_restore_meta(void) {
 }
 
 
-
-
 /******************************************************************************
  *                         Dispatcher, Common code                            *
  ******************************************************************************/
@@ -1109,8 +1087,7 @@ void cmd_migr(char *cmdbuf) {
 	
 	if (CtdlAccessCheck(ac_internal)) return;
 	
-	if (CtdlTrySingleUser())
-	{
+	if (CtdlTrySingleUser()) {
 		CtdlDisableHouseKeeping();
 		CtdlMakeTempFileName(migr_tempfilename1, sizeof migr_tempfilename1);
 		CtdlMakeTempFileName(migr_tempfilename2, sizeof migr_tempfilename2);
@@ -1138,12 +1115,12 @@ void cmd_migr(char *cmdbuf) {
 		CtdlEnableHouseKeeping();
 		CtdlEndSingleUser();
 	}
-	else
-	{
+	else {
 		cprintf("%d The migrator is already running.\n", ERROR + RESOURCE_BUSY);
 	}
 }
 
+
 /******************************************************************************
  *                              Module Hook                                  *
  ******************************************************************************/