* 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>
#include <libubox/usock.h>
#include "uhttpd.h"
+#include "tls.h"
+char uh_buf[4096];
static int run_server(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);
" -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"
{
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");
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, *tls_crt;
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);
switch(ch) {
case 's':
+ n_tls++;
tls = true;
/* fall through */
case 'p':
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':
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;
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
default:
return usage(argv[0]);
}
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
+
/* fork (if not disabled) */
if (!nofork) {
switch (fork()) {