stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 846a693e5ca2b2ebbc19022b2cc721535c96037c..9e446c2ef50c45ec0192e55fe4b19712920b8b71 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -4,7 +4,7 @@
  * guesses about what kind of data format changes need to be applied, and
  * we apply them transparently.
  *
- * Copyright (c) 1987-2019 by the citadel.org team
+ * Copyright (c) 1987-2020 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.
@@ -24,18 +24,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 <limits.h>
@@ -84,7 +73,7 @@ void fix_sys_user_name(void)
 
        /* Delete any "user 0" accounts */
        while (CtdlGetUserByNumber(&usbuf, -1) == 0) {
-               makeuserkey(usernamekey, usbuf.fullname, cutusername(usbuf.fullname));
+               makeuserkey(usernamekey, usbuf.fullname);
                cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
        }
 }
@@ -471,6 +460,63 @@ void move_inet_addrs_from_vcards_to_user_records(void)
 }
 
 
+
+
+/*
+ * We found the legacy sieve config in the user's config room.  Store the message number in the user record.
+ */
+void mifm_found_config(long msgnum, void *userdata) {
+       struct ctdluser *us = (struct ctdluser *)userdata;
+
+       us->msgnum_inboxrules = msgnum;
+       syslog(LOG_DEBUG, "user: <%s> inbox filter msgnum: <%ld>", us->fullname, us->msgnum_inboxrules);
+}
+
+
+/*
+ * Helper function for migrate_inbox_filter_msgnums()
+ */
+void mifm_backend(char *username, void *data) {
+       struct ctdluser us;
+       char roomname[ROOMNAMELEN];
+
+       if (CtdlGetUserLock(&us, username) == 0) {
+               /* Take a spin through the user's personal config room */
+               syslog(LOG_DEBUG, "Processing <%s> (%ld)", us.fullname, us.usernum);
+               snprintf(roomname, sizeof roomname, "%010ld.%s", us.usernum, USERCONFIGROOM);
+               if (CtdlGetRoom(&CC->room, roomname) == 0) {
+                       CtdlForEachMessage(MSGS_LAST, 1, NULL, SIEVECONFIG, NULL, mifm_found_config, (void *)&us );
+               }
+               CtdlPutUserLock(&us);
+       }
+}
+
+
+/*
+ * Prior to version 930 we used a MIME type search to locate the user's inbox filter rules. 
+ * This function locates those ruleset messages and simply stores the message number in the user record.
+ */
+void migrate_inbox_filter_msgnums(void)
+{
+       ForEachUser(mifm_backend, NULL);
+}
+
+
+/*
+ * Create a default administrator account so we can log in to a new installation
+ */
+void create_default_admin_account(void) {
+       struct ctdluser usbuf;
+
+       create_user(DEFAULT_ADMIN_USERNAME, CREATE_USER_DO_NOT_BECOME_USER, (-1));
+       CtdlGetUser(&usbuf, DEFAULT_ADMIN_USERNAME);
+       safestrncpy(usbuf.password, DEFAULT_ADMIN_PASSWORD, sizeof(usbuf.password));
+       usbuf.axlevel = AxAideU;
+       CtdlPutUser(&usbuf);
+       CtdlSetConfigStr("c_sysadm", DEFAULT_ADMIN_USERNAME);
+}
+
+
 /*
  * Based on the server version number reported by the existing database,
  * run in-place data format upgrades until everything is up to date.
@@ -536,6 +582,13 @@ void pre_startup_upgrades(void) {
                CtdlSetConfigInt("c_ep_mode", EXPIRE_MANUAL);
                CtdlSetConfigInt("c_ep_value", 0);
        }
+
+       /*
+        * If this is the first run on an empty database, create a default administrator
+        */
+       if (oldver == 0) {
+               create_default_admin_account();
+       }
 }
 
 
@@ -561,6 +614,11 @@ void post_startup_upgrades(void) {
        if ((oldver > 000) && (oldver < 922)) {
                ProcessOldStyleAdjRefCountQueue();
        }
+
+       if ((oldver > 000) && (oldver < 930)) {
+               migrate_inbox_filter_msgnums();
+       }
+
 }