" -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"
" -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"
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)
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);
};
}
len = strlen(str) - 1;
- while (len > 0 && str[len] == '/')
+ while (len >= 0 && str[len] == '/')
len--;
str[len + 1] = 0;
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;
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':
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':
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, '=');
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 '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: