/*
- * 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-2012 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.
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/utsname.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#include "serv_upgrade.h"
#include "euidindex.h"
#include "ctdl_module.h"
+#include "serv_vcard.h"
+#include "internet_addressing.h"
/*
/*
- * 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;
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) && (us.uid != NATIVE_AUTH_UID)) { // if non-native auth , index by uid
+
+ syslog(LOG_DEBUG, "\033[31m attaching %d to %s \033[0m", us.uid , us.fullname);
+
+
+ StrBuf *claimed_id = NewStrBuf();
+ StrBufPrintf(claimed_id, "uid:%d", us.uid);
+ attach_extauth(&us, claimed_id);
+ FreeStrBuf(&claimed_id);
+ }
}
ptr = uplist;
}
/*
- * 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;
}
if (fp) {
if (fgets(buf, sizeof buf, fp) && (strlen(buf) > 2)) {
buf[strlen(buf)-1] = 0;
- safestrncpy(config.c_default_cal_zone, buf, sizeof config.c_default_cal_zone);
- syslog(LOG_INFO, "Configuring timezone: %s", config.c_default_cal_zone);
+ CtdlSetConfigStr("c_default_cal_zone", buf);
+ syslog(LOG_INFO, "Configuring timezone: %s", buf);
}
fclose(fp);
}
/*
- * Put some sane default values into our configuration. Some will be overridden when we run setup.
+ * 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 brand_new_installation_set_defaults(void) {
-
- struct passwd *pw;
- struct utsname my_utsname;
- struct hostent *he;
-
- /* Determine our host name, in case we need to use it as a default */
- uname(&my_utsname);
-
- /* set some sample/default values in place of blanks... */
- char c_nodename[256];
- safestrncpy(c_nodename, my_utsname.nodename, sizeof c_nodename);
- strtok(config.c_nodename, ".");
- if (IsEmptyStr(config.c_fqdn) ) {
- if ((he = gethostbyname(my_utsname.nodename)) != NULL) {
- safestrncpy(config.c_fqdn, he->h_name, sizeof config.c_fqdn);
- }
- else {
- safestrncpy(config.c_fqdn, my_utsname.nodename, sizeof config.c_fqdn);
+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);
}
- safestrncpy(config.c_humannode, "Citadel Server", sizeof config.c_humannode);
- safestrncpy(config.c_phonenum, "US 800 555 1212", sizeof config.c_phonenum);
- config.c_initax = 4;
- safestrncpy(config.c_moreprompt, "<more>", sizeof config.c_moreprompt);
- safestrncpy(config.c_twitroom, "Trashcan", sizeof config.c_twitroom);
- safestrncpy(config.c_baseroom, BASEROOM, sizeof config.c_baseroom);
- safestrncpy(config.c_aideroom, "Aide", sizeof config.c_aideroom);
- config.c_port_number = 504;
- config.c_sleeping = 900;
- config.c_instant_expunge = 1;
-
- if (config.c_ctdluid == 0) {
- pw = getpwnam("citadel");
- if (pw != NULL) {
- config.c_ctdluid = pw->pw_uid;
- }
+ // Test for the presence of a legacy "room picture file" and import it.
+ if (!IsEmptyStr(picfile)) {
+ fp = fopen(picfile, "r");
}
- if (config.c_ctdluid == 0) {
- pw = getpwnam("bbs");
- if (pw != NULL) {
- config.c_ctdluid = pw->pw_uid;
- }
+ else {
+ fp = NULL;
}
- if (config.c_ctdluid == 0) {
- pw = getpwnam("guest");
- if (pw != NULL) {
- config.c_ctdluid = pw->pw_uid;
+ 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);
}
- if (config.c_createax == 0) {
- config.c_createax = 3;
+
+ // 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);
}
- /*
- * Default port numbers for various services
- */
- config.c_smtp_port = 25;
- config.c_pop3_port = 110;
- config.c_imap_port = 143;
- config.c_msa_port = 587;
- config.c_smtps_port = 465;
- config.c_pop3s_port = 995;
- config.c_imaps_port = 993;
- config.c_pftcpdict_port = -1 ;
- config.c_managesieve_port = 2020;
- config.c_xmpp_c2s_port = 5222;
- config.c_xmpp_s2s_port = 5269;
}
+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
* Note that if the previous version was 0 then this is a new installation running for the first time.
*/
void update_config(void) {
- get_config();
- if (CitControl.version == 0) {
- brand_new_installation_set_defaults();
+ int oldver = CtdlGetConfigInt("MM_hosted_upgrade_level");
+
+ if (oldver < 606) {
+ CtdlSetConfigInt("c_rfc822_strict_from", 0);
}
- if (CitControl.version < 606) {
- config.c_rfc822_strict_from = 0;
+ if (oldver < 609) {
+ CtdlSetConfigInt("c_purge_hour", 3);
}
- if (CitControl.version < 609) {
- config.c_purge_hour = 3;
+ if (oldver < 615) {
+ CtdlSetConfigInt("c_ldap_port", 389);
}
- if (CitControl.version < 615) {
- config.c_ldap_port = 389;
+ if (oldver < 623) {
+ CtdlSetConfigStr("c_ip_addr", "*");
}
- if (CitControl.version < 623) {
- strcpy(config.c_ip_addr, "*");
+ if (oldver < 650) {
+ CtdlSetConfigInt("c_enable_fulltext", 1);
}
- if (CitControl.version < 650) {
- config.c_enable_fulltext = 1;
+ if (oldver < 652) {
+ CtdlSetConfigInt("c_auto_cull", 1);
}
- if (CitControl.version < 652) {
- config.c_auto_cull = 1;
+ if (oldver < 725) {
+ CtdlSetConfigInt("c_xmpp_c2s_port", 5222);
+ CtdlSetConfigInt("c_xmpp_s2s_port", 5269);
}
- if (CitControl.version < 725) {
- config.c_xmpp_c2s_port = 5222;
- config.c_xmpp_s2s_port = 5269;
+ if (oldver < 830) {
+ CtdlSetConfigInt("c_nntp_port", 119);
+ CtdlSetConfigInt("c_nntps_port", 563);
}
- if (IsEmptyStr(config.c_default_cal_zone)) {
+ if (IsEmptyStr(CtdlGetConfigStr("c_default_cal_zone"))) {
guess_time_zone();
}
+}
- put_config();
+
+/*
+ * 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,
*/
void check_server_upgrades(void) {
- get_control();
- syslog(LOG_INFO, "Existing database version on disk is %d.%02d",
- (CitControl.version / 100),
- (CitControl.version % 100)
- );
+ syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
- if (CitControl.version < REV_LEVEL) {
- syslog(LOG_WARNING,
- "Server hosted updates need to be processed at this time. Please wait..."
- );
+ if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
+ syslog(LOG_WARNING, "Server hosted updates need to be processed at this time. Please wait...");
}
else {
return;
update_config();
- if ((CitControl.version > 000) && (CitControl.version < 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 ((CitControl.version > 000) && (CitControl.version < 591)) {
- bump_mailbox_generation_numbers();
- }
- if ((CitControl.version > 000) && (CitControl.version < 608)) {
- convert_ctdluid_to_minusone();
+ if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 913)) {
+ reindex_uids();
}
- if ((CitControl.version > 000) && (CitControl.version < 659)) {
+ if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 659)) {
rebuild_euid_index();
}
- if (CitControl.version < 735) {
+ if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 735) {
fix_sys_user_name();
}
- if (CitControl.version < 736) {
+ if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 736) {
rebuild_usersbynumber();
}
- if (CitControl.version < 790) {
+ if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 790) {
remove_thread_users();
}
- CitControl.version = REV_LEVEL;
+ if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 810) {
+ struct ctdlroom QRoom;
+ if (!CtdlGetRoom(&QRoom, SMTP_SPOOLOUT_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);
/*
* Negative values for maxsessions are not allowed.
*/
- if (config.c_maxsessions < 0) {
- config.c_maxsessions = 0;
+ if (CtdlGetConfigInt("c_maxsessions") < 0) {
+ CtdlSetConfigInt("c_maxsessions", 0);
}
/* We need a system default message expiry policy, because this is
* the top level and there's no 'higher' policy to fall back on.
* By default, do not expire messages at all.
*/
- if (config.c_ep.expire_mode == 0) {
- config.c_ep.expire_mode = EXPIRE_MANUAL;
- config.c_ep.expire_value = 0;
+ if (CtdlGetConfigInt("c_ep_mode") == 0) {
+ CtdlSetConfigInt("c_ep_mode", EXPIRE_MANUAL);
+ CtdlSetConfigInt("c_ep_value", 0);
}
-
- put_control();
}