Changeset 20884

Timestamp:

2010-04-15T21:53:29+02:00 (8 years ago)

Author:

jow

Message:

[backfire] merge r20883

Location:

branches/backfire/package/uhttpd

Files:

• Makefile (modified) (1 diff)
• files/uhttpd.config (modified) (1 diff)
• files/uhttpd.init (modified) (1 diff)
• src/uhttpd-file.c (modified) (1 diff)
• src/uhttpd-mimetypes.h (modified) (1 diff)
• src/uhttpd-utils.c (modified) (4 diffs)
• src/uhttpd.c (modified) (12 diffs)
• src/uhttpd.h (modified) (2 diffs)

branches/backfire/package/uhttpd/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=uhttpd
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

branches/backfire/package/uhttpd/files/uhttpd.config

@@ -30 +30 @@
         # CGI/Lua timeout, if the called script does not
         # write data within the given amount of seconds,
-        # the server will temrinate the request with
+        # the server will terminate the request with
         # 504 Gateway Timeout response.
         option script_timeout   60
+
+        # Network timeout, if the current connection is
+        # blocked for the specified amount of seconds,
+        # the server will terminate the associated
+        # request process.
+        option network_timeout  30
 
         # Basic auth realm, defaults to local hostname

branches/backfire/package/uhttpd/files/uhttpd.init

@@ -59 +59 @@
         append_arg "$cfg" lua_handler "-L"
         append_arg "$cfg" script_timeout "-t"
+        append_arg "$cfg" network_timeout "-T"
 
         config_get http "$cfg" listen_http

branches/backfire/package/uhttpd/src/uhttpd-file.c

@@ -30 +30 @@
 {
         struct mimetype *m = &uh_mime_types[0];
-        char *p, *pd, *ps;
-
-        ps = strrchr(path, '/');
-        pd = strrchr(path, '.');
-
-        /* use either slash or dot as separator, whatever comes last */
-        p = (ps && pd && (ps > pd)) ? ps : pd;
-
-        if( (p != NULL) && (*(++p) != 0) )
-        {
-                while( m->extn )
-                {
-                        if( ! strcasecmp(p, m->extn) )
+        char *e;
+
+        while( m->extn )
+        {
+                e = &path[strlen(path)-1];
+
+                while( e >= path )
+                {
+                        if( (*e == '.') && !strcasecmp(&e[1], m->extn) )
                                 return m->mime;
 
-                        m++;
-                }
+                        e--;
+                }
+
+                m++;
         }
 

branches/backfire/package/uhttpd/src/uhttpd-mimetypes.h

@@ -21 +21 @@
 static struct mimetype uh_mime_types[] = {
 
-        { "txt",    "text/plain" },
-        { "log",    "text/plain" },
-        { "js",     "text/javascript" },
-        { "css",    "text/css" },
-        { "htm",    "text/html" },
-        { "html",   "text/html" },
-        { "diff",   "text/x-patch" },
-        { "patch",  "text/x-patch" },
-        { "c",      "text/x-csrc" },
-        { "h",      "text/x-chdr" },
-        { "o",      "text/x-object" },
-        { "ko",     "text/x-object" },
+        { "txt",     "text/plain" },
+        { "log",     "text/plain" },
+        { "js",      "text/javascript" },
+        { "css",     "text/css" },
+        { "htm",     "text/html" },
+        { "html",    "text/html" },
+        { "diff",    "text/x-patch" },
+        { "patch",   "text/x-patch" },
+        { "c",       "text/x-csrc" },
+        { "h",       "text/x-chdr" },
+        { "o",       "text/x-object" },
+        { "ko",      "text/x-object" },
 
-        { "bmp",    "image/bmp" },
-        { "gif",    "image/gif" },
-        { "png",    "image/png" },
-        { "jpg",    "image/jpeg" },
-        { "jpeg",   "image/jpeg" },
-        { "svg",    "image/svg+xml" },
+        { "bmp",     "image/bmp" },
+        { "gif",     "image/gif" },
+        { "png",     "image/png" },
+        { "jpg",     "image/jpeg" },
+        { "jpeg",    "image/jpeg" },
+        { "svg",     "image/svg+xml" },
 
-        { "zip",    "application/zip" },
-        { "pdf",    "application/pdf" },
-        { "xml",    "application/xml" },
-        { "xsl",    "application/xml" },
-        { "doc",    "application/msword" },
-        { "ppt",    "application/vnd.ms-powerpoint" },
-        { "xls",    "application/vnd.ms-excel" },
-        { "odt",    "application/vnd.oasis.opendocument.text" },
-        { "odp",    "application/vnd.oasis.opendocument.presentation" },
-        { "pl",     "application/x-perl" },
-        { "sh",     "application/x-shellscript" },
-        { "php",    "application/x-php" },
-        { "deb",    "application/x-deb" },
-        { "iso",    "application/x-cd-image" },
-        { "tgz",    "application/x-compressed-tar" },
-        { "gz",     "application/x-gzip" },
-        { "bz2",    "application/x-bzip" },
-        { "tar",    "application/x-tar" },
-        { "rar",    "application/x-rar-compressed" },
+        { "zip",     "application/zip" },
+        { "pdf",     "application/pdf" },
+        { "xml",     "application/xml" },
+        { "xsl",     "application/xml" },
+        { "doc",     "application/msword" },
+        { "ppt",     "application/vnd.ms-powerpoint" },
+        { "xls",     "application/vnd.ms-excel" },
+        { "odt",     "application/vnd.oasis.opendocument.text" },
+        { "odp",     "application/vnd.oasis.opendocument.presentation" },
+        { "pl",      "application/x-perl" },
+        { "sh",      "application/x-shellscript" },
+        { "php",     "application/x-php" },
+        { "deb",     "application/x-deb" },
+        { "iso",     "application/x-cd-image" },
+        { "tar.gz",  "application/x-compressed-tar" },
+        { "tgz",     "application/x-compressed-tar" },
+        { "gz",      "application/x-gzip" },
+        { "tar.bz2", "application/x-bzip-compressed-tar" },
+        { "tbz",     "application/x-bzip-compressed-tar" },
+        { "bz2",     "application/x-bzip" },
+        { "tar",     "application/x-tar" },
+        { "rar",     "application/x-rar-compressed" },
 
-        { "mp3",    "audio/mpeg" },
-        { "ogg",    "audio/x-vorbis+ogg" },
-        { "wav",    "audio/x-wav" },
+        { "mp3",     "audio/mpeg" },
+        { "ogg",     "audio/x-vorbis+ogg" },
+        { "wav",     "audio/x-wav" },
 
-        { "mpg",    "video/mpeg" },
-        { "mpeg",   "video/mpeg" },
-        { "avi",    "video/x-msvideo" },
+        { "mpg",     "video/mpeg" },
+        { "mpeg",    "video/mpeg" },
+        { "avi",     "video/x-msvideo" },
 
-        { "README", "text/plain" },
-        { "log",    "text/plain" },
-        { "cfg",    "text/plain" },
-        { "conf",   "text/plain" },
+        { "README",  "text/plain" },
+        { "log",     "text/plain" },
+        { "cfg",     "text/plain" },
+        { "conf",    "text/plain" },
 
         { NULL, NULL }

branches/backfire/package/uhttpd/src/uhttpd-utils.c

@@ -117 +117 @@
         FD_SET(cl->socket, &writer);
 
-        timeout.tv_sec = 0;
-        timeout.tv_usec = 500000;
+        timeout.tv_sec = cl->server->conf->network_timeout;
+        timeout.tv_usec = 0;
 
         if( select(cl->socket + 1, NULL, &writer, NULL, &timeout) > 0 )
@@ -377 +377 @@
 }
 
+static char * canonpath(const char *path, char *path_resolved)
+{
+        char path_copy[PATH_MAX];
+        char *path_cpy = path_copy;
+        char *path_res = path_resolved;
+
+        struct stat s;
+
+
+        /* relative -> absolute */
+        if( *path != '/' )
+        {
+                getcwd(path_copy, PATH_MAX);
+                strncat(path_copy, "/", PATH_MAX - strlen(path_copy));
+                strncat(path_copy, path, PATH_MAX - strlen(path_copy));
+        }
+        else
+        {
+                strncpy(path_copy, path, PATH_MAX);
+        }
+
+        /* normalize */
+        while( (*path_cpy != '\0') && (path_cpy < (path_copy + PATH_MAX - 2)) )
+        {
+                if( *path_cpy == '/' )
+                {
+                        /* skip repeating / */
+                        if( path_cpy[1] == '/' )
+                        {
+                                path_cpy++;
+                                continue;
+                        }
+
+                        /* /./ or /../ */
+                        else if( path_cpy[1] == '.' )
+                        {
+                                /* skip /./ */
+                                if( (path_cpy[2] == '/') || (path_cpy[2] == '\0') )
+                                {
+                                        path_cpy += 2;
+                                        continue;
+                                }
+
+                                /* collapse /x/../ */
+                                else if( path_cpy[2] == '.' )
+                                {
+                                        while( (path_res > path_resolved) && (*--path_res != '/') )
+                                                ;
+
+                                        path_cpy += 3;
+                                        continue;
+                                }
+                        }
+                }
+
+                *path_res++ = *path_cpy++;
+        }
+
+        /* remove trailing slash if not root / */
+        if( (path_res > (path_resolved+1)) && (path_res[-1] == '/') )
+                path_res--;
+        else if( path_res == path_resolved )
+                *path_res++ = '/';
+
+        *path_res = '\0';
+
+        /* test access */
+        if( !stat(path_resolved, &s) && (s.st_mode & S_IROTH) )
+                return path_resolved;
+
+        return NULL;
+}
 
 struct path_info * uh_path_lookup(struct client *cl, const char *url)
@@ -388 +460 @@
         char *pathptr = NULL;
 
+        int no_sym = cl->server->conf->no_symlinks;
         int i = 0;
         struct stat s;
@@ -433 +506 @@
                         memcpy(path_info, buffer, min(i + 1, sizeof(path_info) - 1));
 
-                        if( realpath(path_info, path_phys) )
-                        {
+                        if( no_sym ? realpath(path_info, path_phys)
+                                   : canonpath(path_info, path_phys)
+                        ) {
                                 memset(path_info, 0, sizeof(path_info));
                                 memcpy(path_info, &buffer[i],

branches/backfire/package/uhttpd/src/uhttpd.c

@@ -417 +417 @@
         int new_fd, cur_fd, max_fd = 0;
 
+#ifdef HAVE_TLS
         int tls = 0;
         int keys = 0;
+#endif
+
         int bound = 0;
         int nofork = 0;
@@ -427 +430 @@
         char *port = NULL;
 
-        /* library handles */
-        void *tls_lib;
-        void *lua_lib;
+#if defined(HAVE_TLS) || defined(HAVE_LUA)
+        /* library handle */
+        void *lib;
+#endif
 
         /* clear the master and temp sets */
@@ -467 +471 @@
 #ifdef HAVE_TLS
         /* load TLS plugin */
-        if( ! (tls_lib = dlopen("uhttpd_tls.so", RTLD_LAZY | RTLD_GLOBAL)) )
+        if( ! (lib = dlopen("uhttpd_tls.so", RTLD_LAZY | RTLD_GLOBAL)) )
         {
                 fprintf(stderr,
@@ -477 +481 @@
         {
                 /* resolve functions */
-                if( !(conf.tls_init   = dlsym(tls_lib, "uh_tls_ctx_init"))      ||
-                    !(conf.tls_cert   = dlsym(tls_lib, "uh_tls_ctx_cert"))      ||
-                    !(conf.tls_key    = dlsym(tls_lib, "uh_tls_ctx_key"))       ||
-                    !(conf.tls_free   = dlsym(tls_lib, "uh_tls_ctx_free"))      ||
-                        !(conf.tls_accept = dlsym(tls_lib, "uh_tls_client_accept")) ||
-                        !(conf.tls_close  = dlsym(tls_lib, "uh_tls_client_close"))  ||
-                        !(conf.tls_recv   = dlsym(tls_lib, "uh_tls_client_recv"))   ||
-                        !(conf.tls_send   = dlsym(tls_lib, "uh_tls_client_send"))
+                if( !(conf.tls_init   = dlsym(lib, "uh_tls_ctx_init"))      ||
+                    !(conf.tls_cert   = dlsym(lib, "uh_tls_ctx_cert"))      ||
+                    !(conf.tls_key    = dlsym(lib, "uh_tls_ctx_key"))       ||
+                    !(conf.tls_free   = dlsym(lib, "uh_tls_ctx_free"))      ||
+                        !(conf.tls_accept = dlsym(lib, "uh_tls_client_accept")) ||
+                        !(conf.tls_close  = dlsym(lib, "uh_tls_client_close"))  ||
+                        !(conf.tls_recv   = dlsym(lib, "uh_tls_client_recv"))   ||
+                        !(conf.tls_send   = dlsym(lib, "uh_tls_client_send"))
                 ) {
                         fprintf(stderr,
@@ -502 +506 @@
 #endif
 
-        while( (opt = getopt(argc, argv, "fC:K:p:s:h:c:l:L:d:r:m:x:t:")) > 0 )
+        while( (opt = getopt(argc, argv, "fSC:K:p:s:h:c:l:L:d:r:m:x:t:T:")) > 0 )
         {
                 switch(opt)
@@ -593 +597 @@
                                 break;
 
+                        /* don't follow symlinks */
+                        case 'S':
+                                conf.no_symlinks = 1;
+                                break;
+
 #ifdef HAVE_CGI
                         /* cgi prefix */
@@ -618 +627 @@
                                 break;
 #endif
+
+                        /* network timeout */
+                        case 'T':
+                                conf.network_timeout = atoi(optarg);
+                                break;
 
                         /* no fork */
@@ -664 +678 @@
 #endif
                                         "       -h directory    Specify the document root, default is '.'\n"
+                                        "       -S              Do not follow symbolic links outside of the docroot\n"
 #ifdef HAVE_LUA
                                         "       -l string       URL prefix for Lua handler, default is '/lua'\n"
@@ -674 +689 @@
                                         "       -t seconds      CGI and Lua script timeout in seconds, default is 60\n"
 #endif
+                                        "       -T seconds      Network timeout in seconds, default is 30\n"
                                         "       -d string       URL decode given string\n"
                                         "       -r string       Specify basic auth realm\n"
@@ -713 +729 @@
         uh_config_parse(conf.file);
 
+        /* default network timeout */
+        if( conf.network_timeout <= 0 )
+                conf.network_timeout = 30;
+
 #if defined(HAVE_CGI) || defined(HAVE_LUA)
         /* default script timeout */
@@ -727 +747 @@
 #ifdef HAVE_LUA
         /* load Lua plugin */
-        if( ! (lua_lib = dlopen("uhttpd_lua.so", RTLD_LAZY | RTLD_GLOBAL)) )
+        if( ! (lib = dlopen("uhttpd_lua.so", RTLD_LAZY | RTLD_GLOBAL)) )
         {
                 fprintf(stderr,
@@ -737 +757 @@
         {
                 /* resolve functions */
-                if( !(conf.lua_init    = dlsym(lua_lib, "uh_lua_init"))    ||
-                    !(conf.lua_close   = dlsym(lua_lib, "uh_lua_close"))   ||
-                    !(conf.lua_request = dlsym(lua_lib, "uh_lua_request"))
+                if( !(conf.lua_init    = dlsym(lib, "uh_lua_init"))    ||
+                    !(conf.lua_close   = dlsym(lib, "uh_lua_close"))   ||
+                    !(conf.lua_request = dlsym(lib, "uh_lua_request"))
                 ) {
                         fprintf(stderr,

branches/backfire/package/uhttpd/src/uhttpd.h

@@ -33 +33 @@
 #include <netdb.h>
 #include <ctype.h>
-
+#include <errno.h>
 #include <dlfcn.h>
 
@@ -65 +65 @@
         char *realm;
         char *file;
+        int no_symlinks;
+        int network_timeout;
 #ifdef HAVE_CGI
         char *cgi_prefix;