X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=main.c;h=73a925c2a17ba9abc3a89dedd9102c7893f7f3bf;hp=3013dabccbfa88d60cc0b31942226a07ba196007;hb=f8573c7b4c3a9e1a67cae787690f27a976aee11c;hpb=98a231f91d7731d4f13ea9e4c4f568e42349faa2

diff --git a/main.c b/main.c
index 3013dab..73a925c 100644
--- a/main.c
+++ b/main.c
@@ -17,6 +17,9 @@
  *  limitations under the License.
  */
 
+#define _BSD_SOURCE
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE	700
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -29,12 +32,15 @@
 #include <libubox/usock.h>
 
 #include "uhttpd.h"
+#include "tls.h"
 
+char uh_buf[4096];
 
 static int run_server(void)
 {
 	uloop_init();
 	uh_setup_listeners();
+	uh_plugin_post_init();
 	uloop_run();
 
 	return 0;
@@ -79,20 +85,14 @@ static void uh_config_parse(void)
 
 			conf.error_handler = strdup(col1);
 		}
-#ifdef HAVE_CGI
 		else if ((line[0] == '*') && (strchr(line, ':') != NULL)) {
 			if (!(col1 = strchr(line, '*')) || (*col1++ = 0) ||
 				!(col2 = strchr(col1, ':')) || (*col2++ = 0) ||
 				!(eol = strchr(col2, '\n')) || (*eol++  = 0))
 				continue;
 
-			if (!uh_interpreter_add(col1, col2))
-				fprintf(stderr,
-						"Unable to add interpreter %s for extension %s: "
-						"Out of memory\n", col2, col1
-				);
+			uh_interpreter_add(col1, col2);
 		}
-#endif
 	}
 
 	fclose(c);
@@ -141,13 +141,9 @@ static int usage(const char *name)
 		"	-u string       URL prefix for HTTP/JSON handler\n"
 		"	-U file         Override ubus socket path\n"
 #endif
-#ifdef HAVE_CGI
 		"	-x string       URL prefix for CGI handler, default is '/cgi-bin'\n"
 		"	-i .ext=path    Use interpreter at path for files with the given extension\n"
-#endif
-#if defined(HAVE_CGI) || defined(HAVE_LUA) || defined(HAVE_UBUS)
 		"	-t seconds      CGI, Lua and UBUS script timeout in seconds, default is 60\n"
-#endif
 		"	-T seconds      Network timeout in seconds, default is 30\n"
 		"	-d string       URL decode given string\n"
 		"	-r string       Specify basic auth realm\n"
@@ -161,10 +157,11 @@ static void init_defaults(void)
 {
 	conf.script_timeout = 60;
 	conf.network_timeout = 30;
-	conf.http_keepalive = 0; /* fixme */
+	conf.http_keepalive = 20;
 	conf.max_requests = 3;
 	conf.realm = "Protected Area";
 	conf.cgi_prefix = "/cgi-bin";
+	conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
 
 	uh_index_add("index.html");
 	uh_index_add("index.htm");
@@ -172,14 +169,34 @@ static void init_defaults(void)
 	uh_index_add("default.htm");
 }
 
+static void fixup_prefix(char *str)
+{
+	int len;
+
+	if (!str || !str[0])
+		return;
+
+	len = strlen(str) - 1;
+
+	while (len > 0 && str[len] == '/')
+		len--;
+
+	str[len + 1] = 0;
+}
+
 int main(int argc, char **argv)
 {
+	const char *tls_key = NULL, *tls_crt = NULL;
 	bool nofork = false;
 	char *port;
 	int opt, ch;
 	int cur_fd;
 	int bound = 0;
+	int n_tls = 0;
+
+	BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
 
+	uh_dispatch_add(&cgi_dispatch);
 	init_defaults();
 	signal(SIGPIPE, SIG_IGN);
 
@@ -188,6 +205,7 @@ int main(int argc, char **argv)
 
 		switch(ch) {
 		case 's':
+			n_tls++;
 			tls = true;
 			/* fall through */
 		case 'p':
@@ -195,11 +213,12 @@ int main(int argc, char **argv)
 			break;
 
 		case 'h':
-			if (!realpath(optarg, conf.docroot)) {
+			if (!realpath(optarg, uh_buf)) {
 				fprintf(stderr, "Error: Invalid directory %s: %s\n",
 						optarg, strerror(errno));
 				exit(1);
 			}
+			conf.docroot = strdup(uh_buf);
 			break;
 
 		case 'E':
@@ -236,6 +255,23 @@ int main(int argc, char **argv)
 			conf.max_requests = atoi(optarg);
 			break;
 
+		case 'x':
+			fixup_prefix(optarg);
+			conf.cgi_prefix = optarg;
+			break;
+
+		case 'i':
+			port = strchr(optarg, '=');
+			if (optarg[0] != '.' || !port) {
+				fprintf(stderr, "Error: Invalid interpreter: %s\n",
+						optarg);
+				exit(1);
+			}
+
+			*port++ = 0;
+			uh_interpreter_add(optarg, port);
+			break;
+
 		case 't':
 			conf.script_timeout = atoi(optarg);
 			break;
@@ -287,6 +323,31 @@ int main(int argc, char **argv)
 			conf.file = optarg;
 			break;
 
+		case 'C':
+			tls_crt = optarg;
+			break;
+
+		case 'K':
+			tls_key = optarg;
+			break;
+#ifdef HAVE_LUA
+		case 'l':
+			conf.lua_prefix = optarg;
+			break;
+
+		case 'L':
+			conf.lua_handler = optarg;
+			break;
+#endif
+#ifdef HAVE_UBUS
+		case 'u':
+			conf.ubus_prefix = optarg;
+			break;
+
+		case 'U':
+			conf.ubus_socket = optarg;
+			break;
+#endif
 		default:
 			return usage(argv[0]);
 		}
@@ -299,6 +360,37 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
+	if (n_tls) {
+		if (!tls_crt || !tls_key) {
+			fprintf(stderr, "Please specify a certificate and "
+					"a key file to enable SSL support\n");
+			return 1;
+		}
+
+#ifdef HAVE_TLS
+		if (uh_tls_init(tls_key, tls_crt))
+		    return 1;
+#else
+		fprintf(stderr, "Error: TLS support not compiled in.\n");
+		return 1;
+#endif
+	}
+
+#ifdef HAVE_LUA
+	if (conf.lua_handler || conf.lua_prefix) {
+		if (!conf.lua_handler || !conf.lua_prefix) {
+			fprintf(stderr, "Need handler and prefix to enable Lua support\n");
+			return 1;
+		}
+		if (uh_plugin_init("uhttpd_lua.so"))
+			return 1;
+	}
+#endif
+#ifdef HAVE_UBUS
+	if (conf.ubus_prefix && uh_plugin_init("uhttpd_ubus.so"))
+		return 1;
+#endif
+
 	/* fork (if not disabled) */
 	if (!nofork) {
 		switch (fork()) {