X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=ff6f9c70756664e77e8e48d0c865ed19cd605000;hb=566a76281118d7433b3266c747879f166b38e50f;hp=40b52a6f6234b67d36c4f4802276e7cf3e06330f;hpb=e23cf6db4aba7a0831388faab91249c1d086f082;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 40b52a6f6..ff6f9c707 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -12,6 +12,10 @@
 #include "webcit.h"
 #include "webserver.h"
 
+#if HAVE_BACKTRACE
+#include <execinfo.h>
+#endif
+
 #ifndef HAVE_SNPRINTF
 int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
 #endif
@@ -20,11 +24,35 @@ int verbosity = 9;		/**< Logging level */
 int msock;			    /**< master listening socket */
 int is_https = 0;		/**< Nonzero if I am an HTTPS service */
 int follow_xff = 0;		/**< Follow X-Forwarded-For: header */
+int home_specified = 0; /**< did the user specify a homedir? */
 extern void *context_loop(int);
 extern void *housekeeping_loop(void);
 extern pthread_mutex_t SessionListMutex;
 extern pthread_key_t MyConKey;
 
+char socket_dir[PATH_MAX];      /**< where to talk to our citadel server */
+static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /**< nailed to what configure gives us. */
+static char static_dir[PATH_MAX]; /**< calculated on startup */
+static char static_local_dir[PATH_MAX]; /**< calculated on startup */
+char  *static_dirs[]={ /**< needs same sort order as the web mapping */
+	(char*)static_dir,                  /** our templates on disk */
+	(char*)static_local_dir,            /** user provided templates disk */
+	(char*)editor_absolut_dir           /** the editor on disk */
+};
+
+/**
+ * Subdirectories from which the client may request static content
+ *
+ * (If you add more, remember to increment 'ndirs' below)
+ */
+char *static_content_dirs[] = {
+	"static",                     /** static templates */
+	"static.local",               /** site local static templates */
+	"tiny_mce"                    /** the JS editor */
+};
+
+int ndirs=3;
+
 
 char *server_cookie = NULL; /**< our Cookie connection to the client */
 
@@ -34,6 +62,8 @@ char *ctdlhost = DEFAULT_HOST; /**< our name */
 char *ctdlport = DEFAULT_PORT; /**< our Port */
 int setup_wizard = 0;          /**< should we run the setup wizard? \todo */
 char wizard_filename[PATH_MAX];/**< where's the setup wizard? */
+int running_as_daemon = 0;     /**< should we deamonize on startup? */
+
 
 /** 
  * \brief This is a generic function to set up a master socket for listening on
@@ -61,14 +91,14 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
 
 	if (port_number == 0) {
 		lprintf(1, "Cannot start: no port number specified.\n");
-		exit(1);
+		exit(WC_EXIT_BIND);
 	}
 	sin.sin_port = htons((u_short) port_number);
 
 	s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
 	if (s < 0) {
 		lprintf(1, "Can't create a socket: %s\n", strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 	/** Set some socket options that make sense. */
 	i = 1;
@@ -76,11 +106,11 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
 
 	if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
 		lprintf(1, "Can't bind: %s\n", strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 	if (listen(s, queue_len) < 0) {
 		lprintf(1, "Can't listen: %s\n", strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 	return (s);
 }
@@ -106,7 +136,7 @@ int ig_uds_server(char *sockpath, int queue_len)
 	if (i != 0) if (errno != ENOENT) {
 		lprintf(1, "citserver: can't unlink %s: %s\n",
 			sockpath, strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 
 	memset(&addr, 0, sizeof(addr));
@@ -117,19 +147,19 @@ int ig_uds_server(char *sockpath, int queue_len)
 	if (s < 0) {
 		lprintf(1, "citserver: Can't create a socket: %s\n",
 			strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 
 	if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		lprintf(1, "citserver: Can't bind: %s\n",
 			strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 
 	if (listen(s, actual_queue_len) < 0) {
 		lprintf(1, "citserver: Can't listen: %s\n",
 			strerror(errno));
-		exit(errno);
+		exit(WC_EXIT_BIND);
 	}
 
 	chmod(sockpath, 0777);
@@ -201,13 +231,29 @@ int client_read_to(int sock, char *buf, int bytes, int timeout)
  */
 ssize_t client_write(const void *buf, size_t count)
 {
+	char *newptr;
+	size_t newalloc;
 
 	if (WC->burst != NULL) {
-		WC->burst =
-		    realloc(WC->burst, (WC->burst_len + count + 2));
-		memcpy(&WC->burst[WC->burst_len], buf, count);
-		WC->burst_len += count;
-		return (count);
+		if ((WC->burst_len + count) >= WC->burst_alloc) {
+			newalloc = (WC->burst_alloc * 2);
+			if ((WC->burst_len + count) >= newalloc) {
+				newalloc += count;
+			}
+			newptr = realloc(WC->burst, newalloc);
+			if (newptr != NULL) {
+				WC->burst = newptr;
+				WC->burst_alloc = newalloc;
+			}
+		}
+		if ((WC->burst_len + count) < WC->burst_alloc) {
+			memcpy(&WC->burst[WC->burst_len], buf, count);
+			WC->burst_len += count;
+			return (count);
+		}
+		else {
+			return(-1);
+		}
 	}
 #ifdef HAVE_OPENSSL
 	if (is_https) {
@@ -233,7 +279,8 @@ void begin_burst(void)
 		WC->burst = NULL;
 	}
 	WC->burst_len = 0;
-	WC->burst = malloc(SIZ);
+	WC->burst_alloc = 32768;
+	WC->burst = malloc(WC->burst_alloc);
 }
 
 
@@ -316,6 +363,7 @@ void end_burst(void)
 	the_data = WC->burst;
 
 	WC->burst_len = 0;
+	WC->burst_alloc = 0;
 	WC->burst = NULL;
 
 #ifdef HAVE_ZLIB
@@ -382,13 +430,12 @@ int client_getln(int sock, char *buf, int bufsiz)
 		if (retval != 1 || buf[i] == '\n' || i == (bufsiz-1))
 			break;
 		if ( (!isspace(buf[i])) && (!isprint(buf[i])) ) {
-			lprintf(2, "Non printable character recieved from client\n");
+			/** Non printable character recieved from client */
 			return(-1);
 		}
 	}
 
-
-	/** If we got a long line, discard characters until the newline.	 */
+	/** If we got a long line, discard characters until the newline. */
 	if (i == (bufsiz-1))
 		while (buf[i] != '\n' && retval == 1)
 			retval = client_read(sock, &buf[i], 1);
@@ -403,25 +450,119 @@ int client_getln(int sock, char *buf, int bufsiz)
 	return (retval);
 }
 
+/**
+ * \brief shut us down the regular way.
+ * param signum the signal we want to forward
+ */
+pid_t current_child;
+void graceful_shutdown(int signum) {
+	kill(current_child, signum);
+	exit(0);
+}
+
 
 /**
- * \brief Start running as a daemon.  
- * param do_close_stdio Only close stdio if set.
+ * \brief	Start running as a daemon.  
+ *
+ * param	do_close_stdio		Only close stdio if set.
+ */
+
+/*
+ * Start running as a daemon.
  */
-void start_daemon(int do_close_stdio)
+void start_daemon(char *pid_file) 
 {
-	if (do_close_stdio) {
-		/* close(0); */
-		close(1);
-		close(2);
-	}
+	int status = 0;
+	pid_t child = 0;
+	FILE *fp;
+	int do_restart = 0;
+
+	current_child = 0;
+
+	/* Close stdin/stdout/stderr and replace them with /dev/null.
+	 * We don't just call close() because we don't want these fd's
+	 * to be reused for other files.
+	 */
+	chdir("/");
+
 	signal(SIGHUP, SIG_IGN);
 	signal(SIGINT, SIG_IGN);
 	signal(SIGQUIT, SIG_IGN);
-	if (fork() != 0)
+
+	child = fork();
+	if (child != 0) {
 		exit(0);
+	}
+
+	setsid();
+	umask(0);
+	freopen("/dev/null", "r", stdin);
+	freopen("/dev/null", "w", stdout);
+	freopen("/dev/null", "w", stderr);
+
+	do {
+		current_child = fork();
+
+	
+		if (current_child < 0) {
+			perror("fork");
+			exit(errno);
+		}
+	
+		else if (current_child == 0) {
+			signal(SIGTERM, graceful_shutdown);
+			return; /* continue starting citadel. */
+		}
+	
+		else {
+			signal(SIGTERM, SIG_IGN);
+			if (pid_file) {
+				fp = fopen(pid_file, "w");
+				if (fp != NULL) {
+					fprintf(fp, "%ld\n", current_child);
+					fclose(fp);
+				}
+			}
+			waitpid(current_child, &status, 0);
+		}
+
+		do_restart = 0;
+
+		/* Did the main process exit with an actual exit code? */
+		if (WIFEXITED(status)) {
+
+			/* Exit code 0 means the watcher should exit */
+			if (WEXITSTATUS(status) == 0) {
+				do_restart = 0;
+			}
+
+			/* Exit code 101-109 means the watcher should exit */
+			else if ( (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109) ) {
+				do_restart = 0;
+			}
+
+			/* Any other exit code means we should restart. */
+			else {
+				do_restart = 1;
+			}
+		}
+
+		/* Any other type of termination (signals, etc.) should also restart. */
+		else {
+			do_restart = 1;
+		}
+
+	} while (do_restart);
+
+	if (pid_file) {
+		unlink(pid_file);
+	}
+	exit(WEXITSTATUS(status));
 }
 
+/**
+ * \brief	Spawn an additional worker thread into the pool.
+ */
 void spawn_another_worker_thread()
 {
 	pthread_t SessThread;	/**< Thread descriptor */
@@ -468,7 +609,15 @@ int main(int argc, char **argv)
 	int a, i;	        	/**< General-purpose variables */
 	char tracefile[PATH_MAX];
 	char ip_addr[256];
-	char *webcitdir = WEBCITDIR;
+	char dirbuffer[PATH_MAX]="";
+	int relh=0;
+	int home=0;
+	int home_specified=0;
+	char relhome[PATH_MAX]="";
+	char webcitdir[PATH_MAX] = DATADIR;
+	char *pidfile = NULL;
+	char *hdir;
+	const char *basedir;
 #ifdef ENABLE_NLS
 	char *locale = NULL;
 	char *mo = NULL;
@@ -479,13 +628,29 @@ int main(int argc, char **argv)
 
 	/** Parse command line */
 #ifdef HAVE_OPENSSL
-	while ((a = getopt(argc, argv, "h:i:p:t:x:cfs")) != EOF)
+	while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cfs")) != EOF)
 #else
-	while ((a = getopt(argc, argv, "h:i:p:t:x:cf")) != EOF)
+	while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cf")) != EOF)
 #endif
 		switch (a) {
 		case 'h':
-			webcitdir = strdup(optarg);
+			hdir = strdup(optarg);
+			relh=hdir[0]!='/';
+			if (!relh) safestrncpy(webcitdir, hdir,
+								   sizeof webcitdir);
+			else
+				safestrncpy(relhome, relhome,
+							sizeof relhome);
+			/* free(hdir); TODO: SHOULD WE DO THIS? */
+			home_specified = 1;
+			home=1;
+			break;
+		case 'd':
+			running_as_daemon = 1;
+			break;
+		case 'D':
+			pidfile = strdup(optarg);
+			running_as_daemon = 1;
 			break;
 		case 'i':
 			safestrncpy(ip_addr, optarg, sizeof ip_addr);
@@ -530,6 +695,7 @@ int main(int argc, char **argv)
 			fprintf(stderr, "usage: webserver "
 				"[-i ip_addr] [-p http_port] "
 				"[-t tracefile] [-c] [-f] "
+				"[-d] "
 #ifdef HAVE_OPENSSL
 				"[-s] "
 #endif
@@ -542,39 +708,55 @@ int main(int argc, char **argv)
 		if (++optind < argc)
 			ctdlport = argv[optind];
 	}
+
+	/* daemonize, if we were asked to */
+	if (running_as_daemon) {
+		start_daemon(pidfile);
+	}
+
 	/** Tell 'em who's in da house */
 	lprintf(1, SERVER "\n");
-	lprintf(1, "Copyright (C) 1996-2006 by the Citadel development team.\n"
+	lprintf(1, "Copyright (C) 1996-2007 by the Citadel development team.\n"
 		"This software is distributed under the terms of the "
 		"GNU General Public License.\n\n"
 	);
 
-	lprintf(9, "Changing directory to %s\n", webcitdir);
-	if (chdir(webcitdir) != 0) {
-		perror("chdir");
-	}
 
 	/** initialize the International Bright Young Thing */
 #ifdef ENABLE_NLS
-
 	initialize_locales();
-
 	locale = setlocale(LC_ALL, "");
-
 	mo = malloc(strlen(webcitdir) + 20);
-	sprintf(mo, "%s/locale", webcitdir);
-	lprintf(9, "Message catalog directory: %s\n",
-		bindtextdomain("webcit", mo)
-	);
+	lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale"));
 	free(mo);
-	lprintf(9, "Text domain: %s\n",
-		textdomain("webcit")
-	);
-	lprintf(9, "Text domain Charset: %s\n",
-			bind_textdomain_codeset("webcit","UTF8")
-	);
+	lprintf(9, "Text domain: %s\n", textdomain("webcit"));
+	lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8"));
 #endif
 
+
+	/* calculate all our path on a central place */
+    /* where to keep our config */
+	
+#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
+	snprintf(SUBDIR,sizeof SUBDIR,  "%s%s%s%s%s%s%s", \
+			 (home&!relh)?webcitdir:basedir, \
+             ((basedir!=webcitdir)&(home&!relh))?basedir:"/", \
+             ((basedir!=webcitdir)&(home&!relh))?"/":"", \
+			 relhome, \
+             (relhome[0]!='\0')?"/":"",\
+			 dirbuffer,\
+			 (dirbuffer[0]!='\0')?"/":"");
+	basedir=RUNDIR;
+	COMPUTE_DIRECTORY(socket_dir);
+	basedir=DATADIR "/static";
+	COMPUTE_DIRECTORY(static_dir);
+	basedir=DATADIR "/static.local";
+	COMPUTE_DIRECTORY(static_local_dir);
+	/** we should go somewhere we can leave our coredump, if enabled... */
+	lprintf(9, "Changing directory to %s\n", socket_dir);
+	if (chdir(webcitdir) != 0) {
+		perror("chdir");
+	}
 	initialize_viewdefs();
 	initialize_axdefs();
 
@@ -682,8 +864,17 @@ void worker_entry(void)
 #endif
 
 			if (fail_this_transaction == 0) {
+
 				/** Perform an HTTP transaction... */
 				context_loop(ssock);
+
+				/** Shut down SSL/TLS if required... */
+#ifdef HAVE_OPENSSL
+				if (is_https) {
+					endtls();
+				}
+#endif
+
 				/** ...and close the socket. */
 				lingering_close(ssock);
 			}
@@ -716,4 +907,27 @@ int lprintf(int loglevel, const char *format, ...)
 }
 
 
+/**
+ * \brief print the actual stack frame.
+ */
+void wc_backtrace(void)
+{
+#ifdef HAVE_BACKTRACE
+	void *stack_frames[50];
+	size_t size, i;
+	char **strings;
+
+
+	size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
+	strings = backtrace_symbols(stack_frames, size);
+	for (i = 0; i < size; i++) {
+		if (strings != NULL)
+			lprintf(1, "%s\n", strings[i]);
+		else
+			lprintf(1, "%p\n", stack_frames[i]);
+	}
+	free(strings);
+#endif
+}
+
 /*@}*/