X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=main.c;h=11d2e547faea048aad0f844ab79b2a468f8fdb52;hp=66d12b1a3b19f0b2fdf474e5538e7d047558bd81;hb=0590256080feb5e8f8742938efa539f2aec90601;hpb=32760c47e28d2a4313359cbff4bd93c905cc85dd diff --git a/main.c b/main.c index 66d12b1..11d2e54 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 #include #include @@ -29,12 +32,15 @@ #include #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,26 +85,20 @@ 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); } -static void add_listener_arg(char *arg, bool tls) +static int add_listener_arg(char *arg, bool tls) { char *host = NULL; char *port = arg; @@ -110,20 +110,59 @@ static void add_listener_arg(char *arg, bool tls) port = s + 1; *s = 0; } - uh_socket_bind(host, port, tls); + + return uh_socket_bind(host, port, tls); } static int usage(const char *name) { - fprintf(stderr, "Usage: %s -p \n", name); + fprintf(stderr, + "Usage: %s -p [addr:]port -h docroot\n" + " -f Do not fork to background\n" + " -c file Configuration file, default is '/etc/httpd.conf'\n" + " -p [addr:]port Bind to specified address and port, multiple allowed\n" +#ifdef HAVE_TLS + " -s [addr:]port Like -p but provide HTTPS on this port\n" + " -C file ASN.1 server certificate file\n" + " -K file ASN.1 server private key file\n" +#endif + " -h directory Specify the document root, default is '.'\n" + " -E string Use given virtual URL as 404 error handler\n" + " -I string Use given filename as index for directories, multiple allowed\n" + " -S Do not follow symbolic links outside of the docroot\n" + " -D Do not allow directory listings, send 403 instead\n" + " -R Enable RFC1918 filter\n" + " -n count Maximum allowed number of concurrent requests\n" +#ifdef HAVE_LUA + " -l string URL prefix for Lua handler, default is '/lua'\n" + " -L file Lua handler script, omit to disable Lua\n" +#endif +#ifdef HAVE_UBUS + " -u string URL prefix for HTTP/JSON handler\n" + " -U file Override ubus socket path\n" +#endif + " -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" + " -t seconds CGI, Lua and UBUS script timeout in seconds, default is 60\n" + " -T seconds Network timeout in seconds, default is 30\n" + " -k seconds HTTP keepalive timeout\n" + " -d string URL decode given string\n" + " -r string Specify basic auth realm\n" + " -m string MD5 crypt given string\n" + "\n", name + ); return 1; } 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"); @@ -131,32 +170,56 @@ 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); - while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:x:i:t:T:A:u:U:")) != -1) { + while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:x:i:t:k:T:A:u:U:")) != -1) { bool tls = false; switch(ch) { case 's': + n_tls++; tls = true; /* fall through */ case 'p': - add_listener_arg(optarg, tls); + bound += add_listener_arg(optarg, tls); 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': @@ -193,6 +256,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; @@ -201,6 +281,10 @@ int main(int argc, char **argv) conf.network_timeout = atoi(optarg); break; + case 'k': + conf.http_keepalive = atoi(optarg); + break; + case 'A': conf.tcp_keepalive = atoi(optarg); break; @@ -244,6 +328,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]); } @@ -251,5 +360,67 @@ int main(int argc, char **argv) uh_config_parse(); + if (!bound) { + fprintf(stderr, "Error: No sockets bound, unable to continue\n"); + 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()) { + case -1: + perror("fork()"); + exit(1); + + case 0: + /* daemon setup */ + if (chdir("/")) + perror("chdir()"); + + cur_fd = open("/dev/null", O_WRONLY); + if (cur_fd > 0) { + dup2(cur_fd, 0); + dup2(cur_fd, 1); + dup2(cur_fd, 2); + } + + break; + + default: + exit(0); + } + } + return run_server(); }