X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=68af7888e9ef221011eb88f6d523d2736d6a6ac6;hb=6d051cee6f669b6ecd950e933a95644f3cf097ea;hp=86cf5b0b031eb7d1c0dc2792ac9d6bda00f6336c;hpb=f1ee61891901850ebbdee1e9440b363dc6df540a;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 86cf5b0b0..68af7888e 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,203 +1,201 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2011 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.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 <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
 #include <grp.h>
-#include <pwd.h>
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
+#include <sys/file.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "sysdep_decls.h"
-#include "threads.h"
+
 #include "citserver.h"
-#include "support.h"
+#include "svn_revision.h"
+#include "modules_init.h"
 #include "config.h"
 #include "control.h"
-#include "database.h"
-#include "user_ops.h"
-#include "housekeeping.h"
-#include "svn_revision.h"
+#include "serv_extensions.h"
 #include "citadel_dirs.h"
+#include "user_ops.h"
 
-#include "context.h"
-
-#include "modules_init.h"
-#include "ecrash.h"
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
+uid_t ctdluid = 0;
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
+int sanity_diag_mode = 0;
+
 
+/*
+ * Create or remove a lock file, so we only have one Citadel Server running at a time.
+ */
+void ctdl_lockfile(int yo) {
+	static char lockfilename[PATH_MAX];
+	static FILE *fp;
+
+	if (yo) {
+		syslog(LOG_DEBUG, "main: creating lockfile");
+		snprintf(lockfilename, sizeof lockfilename, "%s/citadel.lock", ctdl_run_dir);
+		fp = fopen(lockfilename, "w");
+		if (!fp) {
+			syslog(LOG_ERR, "%s: %m", lockfilename);
+			exit(CTDLEXIT_DB);
+		}
+		if (flock(fileno(fp), (LOCK_EX|LOCK_NB)) != 0) {
+			syslog(LOG_ERR, "main: cannot lock %s , is another citserver running?", lockfilename);
+			exit(CTDLEXIT_DB);
+		}
+		return;
+	}
 
+	syslog(LOG_DEBUG, "main: removing lockfile");
+	unlink(lockfilename);
+	flock(fileno(fp), LOCK_UN);
+	fclose(fp);
+}
 
-void go_threading(void);
 
 /*
  * Here's where it all begins.
  */
 int main(int argc, char **argv)
 {
+	size_t basesize = 64;
 	char facility[32];
 	int a;			/* General-purpose variables */
 	struct passwd pw, *pwp = NULL;
 	char pwbuf[SIZ];
 	int drop_root_perms = 1;
-	size_t size;
 	int relh=0;
 	int home=0;
 	int dbg=0;
-	int have_log=0;
+	int max_log_level = LOG_INFO;
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 	int syslog_facility = LOG_DAEMON;
+	uid_t u = 0;
+	struct passwd *p = NULL;
 #ifdef HAVE_RUN_DIR
 	struct stat filestats;
 #endif
-#ifdef HAVE_BACKTRACE
-	eCrashParameters params;
-//	eCrashSymbolTable symbol_table;
-#endif
 
-#ifdef HAVE_GC
-	GC_INIT();
-	GC_find_leak = 1;
-#endif
-
-
-	/* initialise semaphores here. Patch by Matt and davew
-	 * its called here as they are needed by syslog for thread safety
-	 */
-	InitialiseSemaphores();
-	
 	/* initialize the master context */
 	InitializeMasterCC();
+	InitializeMasterTSD();
 
 	/* parse command-line arguments */
-	for (a=1; a<argc; ++a) {
+	while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:s:")) != EOF) switch(a) {
 
-		if (!strncmp(argv[a], "-l", 2)) {
-			safestrncpy(facility, &argv[a][2], sizeof(facility));
+		case 'l':
+			safestrncpy(facility, optarg, sizeof(facility));
 			syslog_facility = SyslogFacility(facility);
-		}
+			break;
 
 		/* run in the background if -d was specified */
-		else if (!strcmp(argv[a], "-d")) {
+		case 'd':
 			running_as_daemon = 1;
-		}
-
-		/* run a few stats if -s was specified */
-		else if (!strncmp(argv[a], "-s", 2)) {
-			statcount = atoi(&argv[a][2]);
-		}
+			break;
 
-		else if (!strncmp(argv[a], "-h", 2)) {
-			relh=argv[a][2]!='/';
-			if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
-								   sizeof ctdl_home_directory);
-			else
-				safestrncpy(relhome, &argv[a][2],
-							sizeof relhome);
+		case 'h':
+			relh = optarg[0] != '/';
+			if (!relh) {
+				safestrncpy(ctdl_home_directory, optarg, sizeof ctdl_home_directory);
+			}
+			else {
+				safestrncpy(relhome, optarg, sizeof relhome);
+			}
 			home=1;
-		}
+			break;
 
-		else if (!strncmp(argv[a], "-x", 2)) {
-			/* deprecated */
-		}
+		case 'x':
+			max_log_level = atoi(optarg);
+			break;
 
-		else if (!strncmp(argv[a], "-t", 2)) {
-			if (freopen(&argv[a][2], "w", stderr) != stderr)
-			{
-				syslog(LOG_EMERG, 
-					      "unable to open your trace log [%s]: %s", 
-					      &argv[a][2], 
-					      strerror(errno));
-				exit(1);
-			}
-			have_log = 1;
-		}
+		case 't':	/* deprecated */
+			break;
+                case 'B': /* Basesize */
+                        basesize = atoi(optarg);
+                        break;
 
-		else if (!strncmp(argv[a], "-D", 2)) {
+		case 'D':
 			dbg = 1;
-		}
+			break;
 
-		/* -r tells the server not to drop root permissions. don't use
-		 * this unless you know what you're doing. this should be
-		 * removed in the next release if it proves unnecessary. */
-		else if (!strcmp(argv[a], "-r"))
+		/* -r tells the server not to drop root permissions.
+		 * Don't use this unless you know what you're doing.
+		 */
+		case 'r':
 			drop_root_perms = 0;
+			break;
 
+		/* -u tells the server what uid to run under... */
+		case 'u':
+			u = atoi(optarg);
+			if (u > 0) {
+				ctdluid = u;
+			}
+			else {
+				p = getpwnam(optarg);
+				if (p) {
+					u = p->pw_uid;
+				}
+			}
+			if (u > 0) {
+				ctdluid = u;
+			}
+			break;
+
+		/* -s tells the server to behave differently during sanity checks */
+		case 's':
+			sanity_diag_mode = atoi(optarg);
+			break;
+
+		default:
 		/* any other parameter makes it crash and burn */
-		else {
 			fprintf(stderr,	"citserver: usage: "
 					"citserver "
-					"[-lLogFacility] "
-					"[-d] [-D] [-s] "
-					"[-tTraceFile] "
-					"[-hHomeDir]\n"
+					"[-l LogFacility] "
+					"[-x MaxLogLevel] "
+					"[-d] [-D] [-r] "
+					"[-u user] "
+					"[-h HomeDir]\n"
 			);
 			exit(1);
+	}
+
+	/* Last ditch effort to determine the user name ... if there's a user called "citadel" then use that */
+	if (ctdluid == 0) {
+		p = getpwnam("citadel");
+		if (!p) {
+			p = getpwnam("bbs");
+		}
+		if (!p) {
+			p = getpwnam("guest");
+		}
+		if (p) {
+			u = p->pw_uid;
 		}
+		if (u > 0) {
+			ctdluid = u;
+		}
+	}
 
+	if ((ctdluid == 0) && (drop_root_perms == 0)) {
+		fprintf(stderr, "citserver: cannot determine user to run as; please specify -r or -u options\n");
+		exit(CTDLEXIT_UNUSER);
 	}
 
+	StartLibCitadel(basesize);
+	setlogmask(LOG_UPTO(max_log_level));
 	openlog("citserver",
 		( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
 		syslog_facility
@@ -210,106 +208,67 @@ int main(int argc, char **argv)
 		drop_root_perms = 1;
 	}
 
-#ifdef HAVE_BACKTRACE
-	bzero(&params, sizeof(params));
-	params.filename = file_pid_paniclog;
-	panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
-	params.filep = fopen(file_pid_paniclog, "a+");
-	params.debugLevel = ECRASH_DEBUG_VERBOSE;
-	params.dumpAllThreads = TRUE;
-	params.useBacktraceSymbols = 1;
-	params.signals[0]=SIGSEGV;
-	params.signals[1]=SIGILL;
-	params.signals[2]=SIGBUS;
-	params.signals[3]=SIGABRT;
-	eCrash_Init(&params);
-	eCrash_RegisterThread("MasterThread", 0);
-#endif
-
 	/* Tell 'em who's in da house */
-	syslog(LOG_NOTICE, "\n");
-	syslog(LOG_NOTICE, "\n");
-	syslog(LOG_NOTICE,
-		"*** Citadel server engine v%d.%02d (build %s) ***\n",
-		(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-	syslog(LOG_NOTICE, "Copyright (C) 1987-2010 by the Citadel development team.\n");
-	syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
-					"General Public License.\n");
-	syslog(LOG_NOTICE, "\n");
-	syslog(LOG_DEBUG, "Called as: %s\n", argv[0]);
-	syslog(LOG_INFO, "%s\n", libcitadel_version_string());
-
-	/* Load site-specific parameters, and set the ipgm secret */
-	syslog(LOG_INFO, "Loading citadel.config\n");
-	get_config();
-	config.c_ipgm_secret = rand();
-
-	/* get_control() MUST MUST MUST be called BEFORE the databases are opened!! */
-	syslog(LOG_INFO, "Acquiring control record\n");
-	get_control();
-
-	put_config();
+	syslog(LOG_INFO, " ");
+	syslog(LOG_INFO, " ");
+	syslog(LOG_INFO, "*** Citadel server engine ***\n");
+ 	syslog(LOG_INFO, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
+	syslog(LOG_INFO, "Copyright (C) 1987-2020 by the Citadel development team.");
+	syslog(LOG_INFO, " ");
+	syslog(LOG_INFO, "This program is open source software: you can redistribute it and/or");
+	syslog(LOG_INFO, "modify it under the terms of the GNU General Public License, version 3.");
+	syslog(LOG_INFO, " ");
+	syslog(LOG_INFO, "This program is distributed in the hope that it will be useful,");
+	syslog(LOG_INFO, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+	syslog(LOG_INFO, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the");
+	syslog(LOG_INFO, "GNU General Public License for more details.");
+	syslog(LOG_INFO, " ");
+	syslog(LOG_INFO, "%s", libcitadel_version_string());
 
 #ifdef HAVE_RUN_DIR
 	/* on some dists rundir gets purged on startup. so we need to recreate it. */
 
-	if (stat(ctdl_run_dir, &filestats)==-1){
+	if (stat(ctdl_run_dir, &filestats) == -1) {
 #ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
-		pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+		pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
 #else // SOLARIS_GETPWUID
-		getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+		getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
 #endif // SOLARIS_GETPWUID
 #else // HAVE_GETPWUID_R
 		pwp = NULL;
 #endif // HAVE_GETPWUID_R
 
-		if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST))
-			syslog(LOG_EMERG, 
-				      "unable to create run directory [%s]: %s", 
-				      ctdl_run_dir, strerror(errno));
+		if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST)) {
+			syslog(LOG_ERR, "main: unable to create run directory [%s]: %m", ctdl_run_dir);
+		}
 
-		if (chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0)
-			syslog(LOG_EMERG, 
-				      "unable to set the access rights for [%s]: %s", 
-				      ctdl_run_dir, strerror(errno));
+		if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0) {
+			syslog(LOG_ERR, "main: unable to set the access rights for [%s]: %m", ctdl_run_dir);
+		}
 	}
-			
-
 #endif
 
-	/* Initialize... */
-	init_sysdep();
-
-	/*
-	 * Do non system dependent startup functions.
-	 */
-	master_startup();
-
-	/*
-	 * Check that the control record is correct and place sensible values if it isn't
-	 */
-	check_control();
-	
-	/*
-	 * Run any upgrade entry points
-	 */
-	syslog(LOG_INFO, "Upgrading modules.\n");
+	ctdl_lockfile(1);
+	init_sysdep();						// Initialize...
+	master_startup();					// Do non system dependent startup functions
+	check_control();					// Check/sanitize/initialize control record, fix user indexes
+	syslog(LOG_INFO, "main: upgrading modules");		// Run any upgrade entry points
 	upgrade_modules();
-	
-/**
+
+/*
  * Load the user for the masterCC or create them if they don't exist
  */
 	if (CtdlGetUser(&masterCC.user, "SYS_Citadel"))
 	{
-		/** User doesn't exist. We can't use create user here as the user number needs to be 0 */
+		/* User doesn't exist. We can't use create user here as the user number needs to be 0 */
 		strcpy (masterCC.user.fullname, "SYS_Citadel") ;
 		CtdlPutUser(&masterCC.user);
-		CtdlGetUser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
+		CtdlGetUser(&masterCC.user, "SYS_Citadel"); /* Just to be safe */
 	}
 	
 	/*
-	 * Bind the server to a Unix-domain socket.
+	 * Bind the server to a Unix-domain socket (user client access)
 	 */
 	CtdlRegisterServiceHook(0,
 				file_citadel_socket,
@@ -318,43 +277,46 @@ int main(int argc, char **argv)
 				do_async_loop,
 				CitadelServiceUDS);
 
+	/*
+	 * Bind the server to a Unix-domain socket (admin client access)
+	 */
+	CtdlRegisterServiceHook(0,
+				file_citadel_admin_socket,
+				citproto_begin_admin_session,
+				do_command_loop,
+				do_async_loop,
+				CitadelServiceUDS);
+	chmod(file_citadel_admin_socket, S_IRWXU);	/* for your eyes only */
+
 	/*
 	 * Bind the server to our favorite TCP port (usually 504).
 	 */
-	CtdlRegisterServiceHook(config.c_port_number,
+	CtdlRegisterServiceHook(CtdlGetConfigInt("c_port_number"),
 				NULL,
 				citproto_begin_session,
 				do_command_loop,
 				do_async_loop,
 				CitadelServiceTCP);
 
-				
-	
-	
 	/*
 	 * Load any server-side extensions available here.
 	 */
-	syslog(LOG_INFO, "Initializing server extensions\n");
-	size = strlen(ctdl_home_directory) + 9;
+	syslog(LOG_INFO, "main: initializing server extensions");
 	
 	initialise_modules(0);
-	
-	
 
 	/*
 	 * If we need host auth, start our chkpwd daemon.
 	 */
-	if (config.c_auth_mode == AUTHMODE_HOST) {
+	if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
 		start_chkpwd_daemon();
 	}
 
-
 	/*
 	 * check, whether we're fired up another time after a crash.
 	 * if, post an aide message, so the admin has a chance to react.
 	 */
-	checkcrash ();
-
+	checkcrash();
 
 	/*
 	 * Now that we've bound the sockets, change to the Citadel user id and its
@@ -365,27 +327,24 @@ int main(int argc, char **argv)
 
 #ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
-		pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+		pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
 #else // SOLARIS_GETPWUID
-		getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+		getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
 #endif // SOLARIS_GETPWUID
 #else // HAVE_GETPWUID_R
 		pwp = NULL;
 #endif // HAVE_GETPWUID_R
 
 		if (pwp == NULL)
-			syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s\n"
-				   "Group IDs will be incorrect.\n", (long)CTDLUID,
-				strerror(errno));
+			syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %m Group IDs will be incorrect.", (long)CTDLUID);
 		else {
 			initgroups(pw.pw_name, pw.pw_gid);
 			if (setgid(pw.pw_gid))
-				syslog(LOG_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
-					strerror(errno));
+				syslog(LOG_ERR, "main: setgid(%ld): %m", (long)pw.pw_gid);
 		}
-		syslog(LOG_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+		syslog(LOG_INFO, "main: changing uid to %ld", (long)CTDLUID);
 		if (setuid(CTDLUID) != 0) {
-			syslog(LOG_CRIT, "setuid() failed: %s\n", strerror(errno));
+			syslog(LOG_ERR, "main: setuid() failed: %m");
 		}
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
 		prctl(PR_SET_DUMPABLE, 1);
@@ -393,11 +352,14 @@ int main(int argc, char **argv)
 	}
 
 	/* We want to check for idle sessions once per minute */
-	CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER);
+	CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER, PRIO_CLEANUP + 1);
 
 	go_threading();
 	
-	
-	master_cleanup(exit_signal);
-	return(0);
+	int exit_code = master_cleanup(exit_signal);
+	ctdl_lockfile(0);
+	if (restart_server) {
+		execv(argv[0], argv);
+	}
+	return(exit_code);
 }