* guesses about what kind of data format changes need to be applied, and
* we apply them transparently.
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2019 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 "serv_vcard.h"
#include "internet_addressing.h"
+/*
+ * oldver is the version number of Citadel Server which was active on the previous run of the program, learned from the system configuration.
+ * If we are running a new Citadel Server for the first time, oldver will be 0.
+ * We keep this value around for the entire duration of the program run because we'll need it during several stages of startup.
+ */
+int oldver = 0;
/*
* Fix up the name for Citadel user 0 and try to remove any extra users with number 0
{
if (strncmp(usbuf.fullname, "SYS_", 4))
{ /* Delete any user 0 that doesn't start with SYS_ */
- makeuserkey(usernamekey, usbuf.fullname, cutuserkey(usbuf.fullname));
+ makeuserkey(usernamekey, usbuf.fullname, cutusername(usbuf.fullname));
cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
}
else {
/*
- * Back end processing function for convert_ctdluid_to_minusone()
+ * 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 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;
/* 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;
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
+ 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;
}
-
/*
* These accounts may have been created by code that ran between mid 2008 and early 2011.
* If present they are no longer in use and may be deleted.
/*
- * Perform any upgrades that can be done automatically based on our knowledge of the previous
- * version of Citadel server that was running here.
- *
- * Note that if the previous version was 0 then this is a new installation running for the first time.
+ * For upgrades in which a new config setting appears for the first time, set default values.
+ * For new installations (oldver == 0) also set default values.
*/
void update_config(void) {
- int oldver = CtdlGetConfigInt("MM_hosted_upgrade_level");
-
if (oldver < 606) {
CtdlSetConfigInt("c_rfc822_strict_from", 0);
}
}
/* 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);
- }
+ CtdlSetEmailAddressesForUser(m[i].name, m[i].emails);
}
free(m);
num_m = 0;
}
+/*
+ * If our system still has a "refcount_adjustments.dat" sitting around from an old version, ingest it now.
+ */
+int ProcessOldStyleAdjRefCountQueue(void)
+{
+ int r;
+ FILE *fp;
+ struct arcq arcq_rec;
+ int num_records_processed = 0;
+
+ fp = fopen(file_arcq, "rb");
+ if (fp == NULL) {
+ return(num_records_processed);
+ }
+
+ syslog(LOG_INFO, "msgbase: ingesting %s", file_arcq);
+
+ while (fread(&arcq_rec, sizeof(struct arcq), 1, fp) == 1) {
+ AdjRefCount(arcq_rec.arcq_msgnum, arcq_rec.arcq_delta);
+ ++num_records_processed;
+ }
+
+ fclose(fp);
+ r = unlink(file_arcq);
+ if (r != 0) {
+ syslog(LOG_ERR, "%s: %m", file_arcq);
+ }
+
+ return(num_records_processed);
+}
+
+
/*
* 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.
* Based on the server version number reported by the existing database,
* run in-place data format upgrades until everything is up to date.
*/
-void check_server_upgrades(void) {
+void pre_startup_upgrades(void) {
- syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
+ oldver = CtdlGetConfigInt("MM_hosted_upgrade_level");
+ syslog(LOG_INFO, "Existing database version on disk is %d", oldver);
+ update_config();
- if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
- syslog(LOG_WARNING, "Server hosted updates need to be processed at this time. Please wait...");
+ if (oldver < REV_LEVEL) {
+ syslog(LOG_WARNING, "Running pre-startup database upgrades.");
}
else {
return;
}
- update_config();
-
- if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 591)) {
+ if ((oldver > 000) && (oldver < 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") < 608)) {
- convert_ctdluid_to_minusone();
+ if ((oldver > 000) && (oldver < 913)) {
+ reindex_uids();
}
- if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 659)) {
+ if ((oldver > 000) && (oldver < 659)) {
rebuild_euid_index();
}
- if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 735) {
+ if (oldver < 735) {
fix_sys_user_name();
}
- if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 736) {
+ if (oldver < 736) {
rebuild_usersbynumber();
}
- if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 790) {
+ if (oldver < 790) {
remove_thread_users();
}
- if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 810) {
+ if (oldver < 810) {
struct ctdlroom QRoom;
if (!CtdlGetRoom(&QRoom, SMTP_SPOOLOUT_ROOM)) {
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)) {
+ if ((oldver > 000) && (oldver < 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);
/*
}
+/*
+ * Based on the server version number reported by the existing database,
+ * run in-place data format upgrades until everything is up to date.
+ */
+void post_startup_upgrades(void) {
+
+ syslog(LOG_INFO, "Existing database version on disk is %d", oldver);
+
+ if (oldver < REV_LEVEL) {
+ syslog(LOG_WARNING, "Running post-startup database upgrades.");
+ }
+ else {
+ return;
+ }
+
+ if ((oldver > 000) && (oldver < 912)) {
+ move_inet_addrs_from_vcards_to_user_records();
+ }
+
+ if ((oldver > 000) && (oldver < 922)) {
+ ProcessOldStyleAdjRefCountQueue();
+ }
+}
+
+
CTDL_MODULE_UPGRADE(upgrade)
{
- check_server_upgrades();
+ pre_startup_upgrades();
/* return our module id for the Log */
return "upgrade";
}
+
+CTDL_MODULE_INIT(upgrade)
+{
+ if(!threading)
+ {
+ post_startup_upgrades();
+ }
+
+ /* return our module name for the log */
+ return "upgrade";
+}