* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#define _DEFAULT_SOURCE
#define _BSD_SOURCE
#define _GNU_SOURCE
#define _XOPEN_SOURCE 700
#include <signal.h>
#include <libubox/usock.h>
+#include <libubox/utils.h>
#include "uhttpd.h"
#include "tls.h"
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);
}
" -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"
+ " -q Redirect all HTTP requests to HTTPS\n"
#endif
" -h directory Specify the document root, default is '.'\n"
" -E string Use given virtual URL as 404 error handler\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 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"
+ " -X Enable CORS HTTP headers on JSON-RPC api\n"
#endif
" -x string URL prefix for CGI handler, default is '/cgi-bin'\n"
+ " -y alias[=path] URL alias handle\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";
+ INIT_LIST_HEAD(&conf.cgi_alias);
+ INIT_LIST_HEAD(&conf.lua_prefix);
+}
+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;
+ conf.cgi_prefix_len = strlen(conf.cgi_prefix);
+ };
}
static void fixup_prefix(char *str)
len = strlen(str) - 1;
- while (len > 0 && str[len] == '/')
+ while (len >= 0 && str[len] == '/')
len--;
str[len + 1] = 0;
}
+static void add_lua_prefix(const char *prefix, const char *handler) {
+ struct lua_prefix *p;
+ char *pprefix, *phandler;
+
+ p = calloc_a(sizeof(*p),
+ &pprefix, strlen(prefix) + 1,
+ &phandler, strlen(handler) + 1);
+
+ if (!p)
+ return;
+
+ p->prefix = strcpy(pprefix, prefix);
+ p->handler = strcpy(phandler, handler);
+
+ list_add_tail(&p->list, &conf.lua_prefix);
+}
+
int main(int argc, char **argv)
{
+ struct alias *alias;
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
+#ifdef HAVE_LUA
+ const char *lua_prefix = NULL, *lua_handler = 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) {
+ while ((ch = getopt(argc, argv, "A:aC:c:Dd:E:fh:H:I:i:K:k:L:l:m:N:n:p:qRr:Ss:T:t:U:u:Xx:y:")) != -1) {
switch(ch) {
#ifdef HAVE_TLS
case 'C':
tls_key = optarg;
break;
+ case 'q':
+ conf.tls_redirect = 1;
+ break;
+
case 's':
n_tls++;
/* fall through */
#else
case 'C':
case 'K':
+ case 'q':
case 's':
fprintf(stderr, "uhttpd: TLS support not compiled, "
- "ignoring -%c\n", opt);
+ "ignoring -%c\n", ch);
break;
#endif
case 'p':
+ optarg = strdup(optarg);
bound += add_listener_arg(optarg, (ch == 's'));
break;
conf.docroot = strdup(uh_buf);
break;
+ case 'H':
+ if (uh_handler_add(optarg)) {
+ fprintf(stderr, "Error: Failed to load handler script %s\n",
+ optarg);
+ exit(1);
+ }
+ break;
+
case 'E':
if (optarg[0] != '/') {
fprintf(stderr, "Error: Invalid error handler: %s\n",
conf.cgi_prefix = optarg;
break;
+ case 'y':
+ alias = calloc(1, sizeof(*alias));
+ if (!alias) {
+ fprintf(stderr, "Error: failed to allocate alias\n");
+ exit(1);
+ }
+ alias->alias = strdup(optarg);
+ alias->path = strchr(alias->alias, '=');
+ if (alias->path)
+ *alias->path++ = 0;
+ list_add(&alias->list, &conf.cgi_alias);
+ break;
+
case 'i':
+ optarg = strdup(optarg);
port = strchr(optarg, '=');
if (optarg[0] != '.' || !port) {
fprintf(stderr, "Error: Invalid interpreter: %s\n",
break;
case 'd':
+ optarg = strdup(optarg);
port = alloca(strlen(optarg) + 1);
if (!port)
return -1;
}
printf("%s", port);
+ return 0;
break;
/* basic auth realm */
#ifdef HAVE_LUA
case 'l':
- conf.lua_prefix = optarg;
- break;
-
case 'L':
- conf.lua_handler = optarg;
+ if (ch == 'l') {
+ if (lua_prefix)
+ fprintf(stderr, "uhttpd: Ignoring previous -%c %s\n",
+ ch, lua_prefix);
+
+ lua_prefix = optarg;
+ }
+ else {
+ if (lua_handler)
+ fprintf(stderr, "uhttpd: Ignoring previous -%c %s\n",
+ ch, lua_handler);
+
+ lua_handler = optarg;
+ }
+
+ if (lua_prefix && lua_handler) {
+ add_lua_prefix(lua_prefix, lua_handler);
+ lua_prefix = NULL;
+ lua_handler = NULL;
+ }
+
break;
#else
case 'l':
case 'L':
fprintf(stderr, "uhttpd: Lua support not compiled, "
- "ignoring -%c\n", opt);
+ "ignoring -%c\n", ch);
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;
+
+ case 'X':
+ conf.ubus_cors = 1;
+ break;
#else
+ case 'a':
case 'u':
case 'U':
+ case 'X':
fprintf(stderr, "uhttpd: UBUS support not compiled, "
- "ignoring -%c\n", opt);
+ "ignoring -%c\n", ch);
break;
#endif
default:
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;
#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;
+ if (lua_handler || lua_prefix) {
+ fprintf(stderr, "Need handler and prefix to enable Lua support\n");
+ return 1;
}
+
+ if (!list_empty(&conf.lua_prefix) && uh_plugin_init("uhttpd_lua.so"))
+ return 1;
#endif
#ifdef HAVE_UBUS
if (conf.ubus_prefix && uh_plugin_init("uhttpd_ubus.so"))
projects / project / uhttpd.git / blobdiff