char *host = NULL;
char *port = arg;
char *s;
+ int l;
s = strrchr(arg, ':');
if (s) {
*s = 0;
}
+ if (host && *host == '[') {
+ l = strlen(host);
+ if (l >= 2) {
+ host[l-1] = 0;
+ host++;
+ }
+ }
+
return uh_socket_bind(host, port, tls);
}
" -L file Lua handler script, omit to disable Lua\n"
#endif
#ifdef HAVE_UBUS
- " -u string URL prefix for HTTP/JSON handler\n"
+ " -u string URL prefix for UBUS via JSON-RPC handler\n"
" -U file Override ubus socket path\n"
+ " -a Do not authenticate JSON-RPC requests against UBUS session api\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"
+ " -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"
return 1;
}
-static void init_defaults(void)
+static void init_defaults_pre(void)
{
conf.script_timeout = 60;
conf.network_timeout = 30;
conf.realm = "Protected Area";
conf.cgi_prefix = "/cgi-bin";
conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin";
+}
+static void init_defaults_post(void)
+{
uh_index_add("index.html");
uh_index_add("index.htm");
uh_index_add("default.html");
uh_index_add("default.htm");
+
+ if (conf.cgi_prefix) {
+ char *str = malloc(strlen(conf.docroot) + strlen(conf.cgi_prefix) + 1);
+ strcpy(str, conf.docroot);
+ strcat(str, conf.cgi_prefix);
+ conf.cgi_docroot_path = str;
+ };
}
static void fixup_prefix(char *str)
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;
+
+#ifdef HAVE_TLS
int n_tls = 0;
+ const char *tls_key = NULL, *tls_crt = NULL;
+#endif
BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);
uh_dispatch_add(&cgi_dispatch);
- init_defaults();
+ init_defaults_pre();
signal(SIGPIPE, SIG_IGN);
- while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) {
- bool tls = false;
-
+ while ((ch = getopt(argc, argv, "afSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:N:x:i:t:k:T:A:u:U:")) != -1) {
switch(ch) {
+#ifdef HAVE_TLS
+ case 'C':
+ tls_crt = optarg;
+ break;
+
+ case 'K':
+ tls_key = optarg;
+ break;
+
case 's':
n_tls++;
- tls = true;
/* fall through */
+#else
+ case 'C':
+ case 'K':
+ case 's':
+ fprintf(stderr, "uhttpd: TLS support not compiled, "
+ "ignoring -%c\n", opt);
+ break;
+#endif
case 'p':
- bound += add_listener_arg(optarg, tls);
+ bound += add_listener_arg(optarg, (ch == 's'));
break;
case 'h':
}
printf("%s", port);
+ return 0;
break;
/* basic auth realm */
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;
case 'L':
conf.lua_handler = optarg;
break;
+#else
+ case 'l':
+ case 'L':
+ fprintf(stderr, "uhttpd: Lua support not compiled, "
+ "ignoring -%c\n", opt);
+ break;
#endif
#ifdef HAVE_UBUS
+ case 'a':
+ conf.ubus_noauth = 1;
+ break;
+
case 'u':
conf.ubus_prefix = optarg;
break;
case 'U':
conf.ubus_socket = optarg;
break;
+#else
+ case 'a':
+ case 'u':
+ case 'U':
+ fprintf(stderr, "uhttpd: UBUS support not compiled, "
+ "ignoring -%c\n", opt);
+ break;
#endif
default:
return usage(argv[0]);
uh_config_parse();
+ if (!conf.docroot) {
+ if (!realpath(".", uh_buf)) {
+ fprintf(stderr, "Error: Unable to determine work dir\n");
+ return 1;
+ }
+ conf.docroot = strdup(uh_buf);
+ }
+
+ init_defaults_post();
+
if (!bound) {
fprintf(stderr, "Error: No sockets bound, unable to continue\n");
return 1;
}
+#ifdef HAVE_TLS
if (n_tls) {
if (!tls_crt || !tls_key) {
fprintf(stderr, "Please specify a certificate and "
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
}
+#endif
#ifdef HAVE_LUA
if (conf.lua_handler || conf.lua_prefix) {