X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=main.c;h=fb2766576e8f84890dac44a9208cfaad3add0769;hp=ce51db9b801093b7a56dd5027848dcb70c8fd8ae;hb=HEAD;hpb=d518cb32327492ad73c4583bb69d1d678410a631 diff --git a/main.c b/main.c index ce51db9..fb27665 100644 --- a/main.c +++ b/main.c @@ -134,6 +134,7 @@ static int usage(const char *name) " -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" @@ -151,8 +152,10 @@ static int usage(const char *name) " -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" @@ -165,7 +168,7 @@ static int usage(const char *name) return 1; } -static void init_defaults(void) +static void init_defaults_pre(void) { conf.script_timeout = 60; conf.network_timeout = 30; @@ -175,11 +178,24 @@ static void init_defaults(void) conf.realm = "Protected Area"; conf.cgi_prefix = "/cgi-bin"; conf.cgi_path = "/sbin:/usr/sbin:/bin:/usr/bin"; + INIT_LIST_HEAD(&conf.cgi_alias); +} +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) @@ -191,7 +207,7 @@ 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; @@ -199,12 +215,12 @@ static void fixup_prefix(char *str) 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; @@ -213,10 +229,10 @@ int main(int argc, char **argv) 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, "afSDRC: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': @@ -227,18 +243,24 @@ int main(int argc, char **argv) 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; @@ -251,6 +273,14 @@ int main(int argc, char **argv) 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", @@ -294,7 +324,21 @@ int main(int argc, char **argv) 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", @@ -327,6 +371,7 @@ int main(int argc, char **argv) break; case 'd': + optarg = strdup(optarg); port = alloca(strlen(optarg) + 1); if (!port) return -1; @@ -343,6 +388,7 @@ int main(int argc, char **argv) } printf("%s", port); + return 0; break; /* basic auth realm */ @@ -373,7 +419,7 @@ int main(int argc, char **argv) case 'l': case 'L': fprintf(stderr, "uhttpd: Lua support not compiled, " - "ignoring -%c\n", opt); + "ignoring -%c\n", ch); break; #endif #ifdef HAVE_UBUS @@ -388,12 +434,17 @@ int main(int argc, char **argv) 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: @@ -403,11 +454,6 @@ int main(int argc, char **argv) uh_config_parse(); - if (!bound) { - fprintf(stderr, "Error: No sockets bound, unable to continue\n"); - return 1; - } - if (!conf.docroot) { if (!realpath(".", uh_buf)) { fprintf(stderr, "Error: Unable to determine work dir\n"); @@ -416,6 +462,13 @@ int main(int argc, char **argv) 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) {