proc: expose HTTP Origin header in process environment

[project/uhttpd.git] / main.c

diff --git a/main.c b/main.c
index 3013dab..fb27665 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,22 +1,25 @@
 /*
  * uhttpd - Tiny single-threaded httpd
  *
 /*
  * uhttpd - Tiny single-threaded httpd
  *

- *   Copyright (C) 2010-2012 Jo-Philipp Wich <xm@subsignal.org>
- *   Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org>
+ *   Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>

  *
  *

- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 
  */
 

+#define _BSD_SOURCE
+#define _GNU_SOURCE
+#define _XOPEN_SOURCE  700

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>


@@ -29,12 +32,15 @@
 #include <libubox/usock.h>
 
 #include "uhttpd.h"
 #include <libubox/usock.h>
 
 #include "uhttpd.h"

+#include "tls.h"

 
 

+char uh_buf[4096];

 
 static int run_server(void)
 {
        uloop_init();
        uh_setup_listeners();
 
 static int run_server(void)
 {
        uloop_init();
        uh_setup_listeners();

+       uh_plugin_post_init();

        uloop_run();
 
        return 0;
        uloop_run();
 
        return 0;


@@ -79,20 +85,14 @@ static void uh_config_parse(void)
 
                        conf.error_handler = strdup(col1);
                }
 
                        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;
 
                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);
        }
 
        fclose(c);


@@ -103,6 +103,7 @@ static int add_listener_arg(char *arg, bool tls)
        char *host = NULL;
        char *port = arg;
        char *s;
        char *host = NULL;
        char *port = arg;
        char *s;

+       int l;

 
        s = strrchr(arg, ':');
        if (s) {
 
        s = strrchr(arg, ':');
        if (s) {


@@ -111,6 +112,14 @@ static int add_listener_arg(char *arg, bool tls)
                *s = 0;
        }
 
                *s = 0;
        }
 

+       if (host && *host == '[') {
+               l = strlen(host);
+               if (l >= 2) {
+                       host[l-1] = 0;
+                       host++;
+               }
+       }
+

        return uh_socket_bind(host, port, tls);
 }
 
        return uh_socket_bind(host, port, tls);
 }
 


@@ -125,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"
                "       -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"
 #endif
                "       -h directory    Specify the document root, default is '.'\n"
                "       -E string       Use given virtual URL as 404 error handler\n"


@@ -132,23 +142,24 @@ static int usage(const char *name)
                "       -S              Do not follow symbolic links outside of the docroot\n"
                "       -D              Do not allow directory listings, send 403 instead\n"
                "       -R              Enable RFC1918 filter\n"
                "       -S              Do not follow symbolic links outside of the docroot\n"
                "       -D              Do not allow directory listings, send 403 instead\n"
                "       -R              Enable RFC1918 filter\n"

-               "       -n count        Maximum allowed number of concurrent requests\n"
+               "       -n count        Maximum allowed number of concurrent script requests\n"
+               "       -N count        Maximum allowed number of concurrent connections\n"

 #ifdef HAVE_LUA
                "       -l string       URL prefix for Lua handler, default is '/lua'\n"
                "       -L file         Lua handler script, omit to disable Lua\n"
 #endif
 #ifdef HAVE_UBUS
 #ifdef HAVE_LUA
                "       -l string       URL prefix for Lua handler, default is '/lua'\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"
                "       -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
 #endif

-#ifdef HAVE_CGI

                "       -x string       URL prefix for CGI handler, default is '/cgi-bin'\n"
                "       -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"
                "       -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"
                "       -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"
                "       -T seconds      Network timeout in seconds, default is 30\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"
                "       -d string       URL decode given string\n"
                "       -r string       Specify basic auth realm\n"
                "       -m string       MD5 crypt given string\n"


@@ -157,49 +168,117 @@ static int usage(const char *name)
        return 1;
 }
 
        return 1;
 }
 

-static void init_defaults(void)
+static void init_defaults_pre(void)

 {
        conf.script_timeout = 60;
        conf.network_timeout = 30;
 {
        conf.script_timeout = 60;
        conf.network_timeout = 30;

-       conf.http_keepalive = 0; /* fixme */
-       conf.max_requests = 3;
+       conf.http_keepalive = 20;
+       conf.max_script_requests = 3;
+       conf.max_connections = 100;

        conf.realm = "Protected Area";
        conf.cgi_prefix = "/cgi-bin";
        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");
        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)
+{
+       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)
 {
 }
 
 int main(int argc, char **argv)
 {

+       struct alias *alias;

        bool nofork = false;
        char *port;
        int opt, ch;
        int cur_fd;
        int bound = 0;
        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

 
 

-       init_defaults();
-       signal(SIGPIPE, SIG_IGN);
+       BUILD_BUG_ON(sizeof(uh_buf) < PATH_MAX);

 
 

-       while ((ch = getopt(argc, argv, "fSDRC:K:E:I:p:s:h:c:l:L:d:r:m:n:x:i:t:T:A:u:U:")) != -1) {
-               bool tls = false;
+       uh_dispatch_add(&cgi_dispatch);
+       init_defaults_pre();
+       signal(SIGPIPE, SIG_IGN);

 
 

+       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) {
                switch(ch) {

+#ifdef HAVE_TLS
+               case 'C':
+                       tls_crt = optarg;
+                       break;
+
+               case 'K':
+                       tls_key = optarg;
+                       break;
+
+               case 'q':
+                       conf.tls_redirect = 1;
+                       break;
+

                case 's':
                case 's':

-                       tls = true;
+                       n_tls++;

                        /* fall through */
                        /* fall through */

+#else
+               case 'C':
+               case 'K':
+               case 'q':
+               case 's':
+                       fprintf(stderr, "uhttpd: TLS support not compiled, "
+                                       "ignoring -%c\n", ch);
+                       break;
+#endif

                case 'p':
                case 'p':

-                       bound += add_listener_arg(optarg, tls);
+                       optarg = strdup(optarg);
+                       bound += add_listener_arg(optarg, (ch == 's'));

                        break;
 
                case 'h':
                        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);
                        }
                                fprintf(stderr, "Error: Invalid directory %s: %s\n",
                                                optarg, strerror(errno));
                                exit(1);
                        }

+                       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':
                        break;
 
                case 'E':


@@ -233,7 +312,42 @@ int main(int argc, char **argv)
                        break;
 
                case 'n':
                        break;
 
                case 'n':

-                       conf.max_requests = atoi(optarg);
+                       conf.max_script_requests = atoi(optarg);
+                       break;
+
+               case 'N':
+                       conf.max_connections = atoi(optarg);
+                       break;
+
+               case 'x':
+                       fixup_prefix(optarg);
+                       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",
+                                               optarg);
+                               exit(1);
+                       }
+
+                       *port++ = 0;
+                       uh_interpreter_add(optarg, port);

                        break;
 
                case 't':
                        break;
 
                case 't':


@@ -244,6 +358,10 @@ int main(int argc, char **argv)
                        conf.network_timeout = atoi(optarg);
                        break;
 
                        conf.network_timeout = atoi(optarg);
                        break;
 

+               case 'k':
+                       conf.http_keepalive = atoi(optarg);
+                       break;
+

                case 'A':
                        conf.tcp_keepalive = atoi(optarg);
                        break;
                case 'A':
                        conf.tcp_keepalive = atoi(optarg);
                        break;


@@ -253,6 +371,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'd':
                        break;
 
                case 'd':

+                       optarg = strdup(optarg);

                        port = alloca(strlen(optarg) + 1);
                        if (!port)
                                return -1;
                        port = alloca(strlen(optarg) + 1);
                        if (!port)
                                return -1;


@@ -269,6 +388,7 @@ int main(int argc, char **argv)
                        }
 
                        printf("%s", port);
                        }
 
                        printf("%s", port);

+                       return 0;

                        break;
 
                /* basic auth realm */
                        break;
 
                /* basic auth realm */


@@ -287,6 +407,46 @@ int main(int argc, char **argv)
                        conf.file = optarg;
                        break;
 
                        conf.file = optarg;
                        break;
 

+#ifdef HAVE_LUA
+               case 'l':
+                       conf.lua_prefix = optarg;
+                       break;
+
+               case 'L':
+                       conf.lua_handler = optarg;
+                       break;
+#else
+               case 'l':
+               case 'L':
+                       fprintf(stderr, "uhttpd: Lua support not compiled, "
+                                       "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", ch);
+                       break;
+#endif

                default:
                        return usage(argv[0]);
                }
                default:
                        return usage(argv[0]);
                }


@@ -294,11 +454,49 @@ int main(int argc, char **argv)
 
        uh_config_parse();
 
 
        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;
        }
 
        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 "
+                                       "a key file to enable SSL support\n");
+                       return 1;
+               }
+
+               if (uh_tls_init(tls_key, tls_crt))
+                   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
+#ifdef HAVE_UBUS
+       if (conf.ubus_prefix && uh_plugin_init("uhttpd_ubus.so"))
+               return 1;
+#endif
+

        /* fork (if not disabled) */
        if (!nofork) {
                switch (fork()) {
        /* fork (if not disabled) */
        if (!nofork) {
                switch (fork()) {