[toolchain/uClibc] backport upstream fix for dst computation

[openwrt.git] / package / uhttpd / src / uhttpd-utils.c

diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/uhttpd/src/uhttpd-utils.c
index 8a06c93..a47f175 100644 (file)
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@@ -124,7 +124,7 @@ int select_intr(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t)
 }
 
 
 }
 
 

-int uh_tcp_send(struct client *cl, const char *buf, int len)
+int uh_tcp_send_lowlevel(struct client *cl, const char *buf, int len)

 {
        fd_set writer;
        struct timeval timeout;
 {
        fd_set writer;
        struct timeval timeout;


@@ -135,21 +135,28 @@ int uh_tcp_send(struct client *cl, const char *buf, int len)
        timeout.tv_sec = cl->server->conf->network_timeout;
        timeout.tv_usec = 0;
 
        timeout.tv_sec = cl->server->conf->network_timeout;
        timeout.tv_usec = 0;
 

-       if( select(cl->socket + 1, NULL, &writer, NULL, &timeout) > 0 )
-       {
-#ifdef HAVE_TLS
-               if( cl->tls )
-                       return cl->server->conf->tls_send(cl, (void *)buf, len);
-               else
-#endif
-                       return send(cl->socket, buf, len, 0);
-       }
+       if (select(cl->socket + 1, NULL, &writer, NULL, &timeout) > 0)
+               return send(cl->socket, buf, len, 0);

 
        return -1;
 }
 
 
        return -1;
 }
 

+int uh_tcp_send(struct client *cl, const char *buf, int len)
+{
+#ifdef HAVE_TLS
+       if (cl->tls)
+               return cl->server->conf->tls_send(cl, (void *)buf, len);
+       else
+#endif
+               return uh_tcp_send_lowlevel(cl, buf, len);
+}
+

 int uh_tcp_peek(struct client *cl, char *buf, int len)
 {
 int uh_tcp_peek(struct client *cl, char *buf, int len)
 {

+       /* sanity check, prevent overflowing peek buffer */
+       if (len > sizeof(cl->peekbuf))
+               return -1;
+

        int sz = uh_tcp_recv(cl, buf, len);
 
        /* store received data in peek buffer */
        int sz = uh_tcp_recv(cl, buf, len);
 
        /* store received data in peek buffer */


@@ -162,33 +169,51 @@ int uh_tcp_peek(struct client *cl, char *buf, int len)
        return sz;
 }
 
        return sz;
 }
 

+int uh_tcp_recv_lowlevel(struct client *cl, char *buf, int len)
+{
+       fd_set reader;
+       struct timeval timeout;
+
+       FD_ZERO(&reader);
+       FD_SET(cl->socket, &reader);
+
+       timeout.tv_sec  = cl->server->conf->network_timeout;
+       timeout.tv_usec = 0;
+
+       if (select(cl->socket + 1, &reader, NULL, NULL, &timeout) > 0)
+               return recv(cl->socket, buf, len, 0);
+
+       return -1;
+}
+

 int uh_tcp_recv(struct client *cl, char *buf, int len)
 {
        int sz = 0;
        int rsz = 0;
 
        /* first serve data from peek buffer */
 int uh_tcp_recv(struct client *cl, char *buf, int len)
 {
        int sz = 0;
        int rsz = 0;
 
        /* first serve data from peek buffer */

-       if( cl->peeklen > 0 )
+       if (cl->peeklen > 0)

        {
                sz = min(cl->peeklen, len);
                len -= sz; cl->peeklen -= sz;
        {
                sz = min(cl->peeklen, len);
                len -= sz; cl->peeklen -= sz;

-

                memcpy(buf, cl->peekbuf, sz);
                memmove(cl->peekbuf, &cl->peekbuf[sz], cl->peeklen);
        }
 
        /* caller wants more */
                memcpy(buf, cl->peekbuf, sz);
                memmove(cl->peekbuf, &cl->peekbuf[sz], cl->peeklen);
        }
 
        /* caller wants more */

-       if( len > 0 )
+       if (len > 0)

        {
 #ifdef HAVE_TLS
        {
 #ifdef HAVE_TLS

-               if( cl->tls )
+               if (cl->tls)

                        rsz = cl->server->conf->tls_recv(cl, (void *)&buf[sz], len);
                else
 #endif
                        rsz = cl->server->conf->tls_recv(cl, (void *)&buf[sz], len);
                else
 #endif

-                       rsz = recv(cl->socket, (void *)&buf[sz], len, 0);
+                       rsz = uh_tcp_recv_lowlevel(cl, (void *)&buf[sz], len);
+
+               if (rsz < 0)
+                       return rsz;

 
 

-               if( (sz == 0) || (rsz > 0) )
-                       sz += rsz;
+               sz += rsz;

        }
 
        return sz;
        }
 
        return sz;


@@ -233,7 +258,7 @@ int uh_http_sendc(struct client *cl, const char *data, int len)
 
        if( len > 0 )
        {
 
        if( len > 0 )
        {

-               clen = snprintf(chunk, sizeof(chunk), "%X\r\n", len);
+               clen = snprintf(chunk, sizeof(chunk), "%X\r\n", len);

                ensure_ret(uh_tcp_send(cl, chunk, clen));
                ensure_ret(uh_tcp_send(cl, data, len));
                ensure_ret(uh_tcp_send(cl, "\r\n", 2));
                ensure_ret(uh_tcp_send(cl, chunk, clen));
                ensure_ret(uh_tcp_send(cl, data, len));
                ensure_ret(uh_tcp_send(cl, "\r\n", 2));


@@ -474,6 +499,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
        char *docroot = cl->server->conf->docroot;
        char *pathptr = NULL;
 
        char *docroot = cl->server->conf->docroot;
        char *pathptr = NULL;
 

+       int slash = 0;

        int no_sym = cl->server->conf->no_symlinks;
        int i = 0;
        struct stat s;
        int no_sym = cl->server->conf->no_symlinks;
        int i = 0;
        struct stat s;


@@ -516,7 +542,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
        }
 
        /* create canon path */
        }
 
        /* create canon path */

-       for( i = strlen(buffer); i >= 0; i-- )
+       for( i = strlen(buffer), slash = (buffer[max(0, i-1)] == '/'); i >= 0; i-- )

        {
                if( (buffer[i] == 0) || (buffer[i] == '/') )
                {
        {
                if( (buffer[i] == 0) || (buffer[i] == '/') )
                {


@@ -567,7 +593,23 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
                        memcpy(buffer, path_phys, sizeof(buffer));
                        pathptr = &buffer[strlen(buffer)];
 
                        memcpy(buffer, path_phys, sizeof(buffer));
                        pathptr = &buffer[strlen(buffer)];
 

-                       if( cl->server->conf->index_file )
+                       /* if requested url resolves to a directory and a trailing slash
+                          is missing in the request url, redirect the client to the same
+                          url with trailing slash appended */
+                       if( !slash )
+                       {
+                               uh_http_sendf(cl, NULL,
+                                       "HTTP/1.1 302 Found\r\n"
+                                       "Location: %s%s%s\r\n"
+                                       "Connection: close\r\n\r\n",
+                                               &path_phys[strlen(docroot)],
+                                               p.query ? "?" : "",
+                                               p.query ? p.query : ""
+                               );
+
+                               p.redirected = 1;
+                       }
+                       else if( cl->server->conf->index_file )

                        {
                                strncat(buffer, cl->server->conf->index_file, sizeof(buffer));
 
                        {
                                strncat(buffer, cl->server->conf->index_file, sizeof(buffer));
 


@@ -610,7 +652,10 @@ struct auth_realm * uh_auth_add(char *path, char *user, char *pass)
 {
        struct auth_realm *new = NULL;
        struct passwd *pwd;
 {
        struct auth_realm *new = NULL;
        struct passwd *pwd;

+
+#ifdef HAVE_SHADOW

        struct spwd *spwd;
        struct spwd *spwd;

+#endif

 
        if((new = (struct auth_realm *)malloc(sizeof(struct auth_realm))) != NULL)
        {
 
        if((new = (struct auth_realm *)malloc(sizeof(struct auth_realm))) != NULL)
        {


@@ -625,6 +670,7 @@ struct auth_realm * uh_auth_add(char *path, char *user, char *pass)
                /* given password refers to a passwd entry */
                if( (strlen(pass) > 3) && !strncmp(pass, "$p$", 3) )
                {
                /* given password refers to a passwd entry */
                if( (strlen(pass) > 3) && !strncmp(pass, "$p$", 3) )
                {

+#ifdef HAVE_SHADOW

                        /* try to resolve shadow entry */
                        if( ((spwd = getspnam(&pass[3])) != NULL) && spwd->sp_pwdp )
                        {
                        /* try to resolve shadow entry */
                        if( ((spwd = getspnam(&pass[3])) != NULL) && spwd->sp_pwdp )
                        {


@@ -632,8 +678,11 @@ struct auth_realm * uh_auth_add(char *path, char *user, char *pass)
                                        min(strlen(spwd->sp_pwdp), sizeof(new->pass) - 1));
                        }
 
                                        min(strlen(spwd->sp_pwdp), sizeof(new->pass) - 1));
                        }
 

+                       else
+#endif
+

                        /* try to resolve passwd entry */
                        /* try to resolve passwd entry */

-                       else if( ((pwd = getpwnam(&pass[3])) != NULL) && pwd->pw_passwd &&
+                       if( ((pwd = getpwnam(&pass[3])) != NULL) && pwd->pw_passwd &&

                                (pwd->pw_passwd[0] != '!') && (pwd->pw_passwd[0] != 0)
                        ) {
                                memcpy(new->pass, pwd->pw_passwd,
                                (pwd->pw_passwd[0] != '!') && (pwd->pw_passwd[0] != 0)
                        ) {
                                memcpy(new->pass, pwd->pw_passwd,


@@ -728,19 +777,14 @@ int uh_auth_check(
                                        req->realm = realm;
                                        break;
                                }
                                        req->realm = realm;
                                        break;
                                }

-
-                               realm = NULL;

                        }
 
                        /* found a realm matching the username */
                        if( realm )
                        {
                        }
 
                        /* found a realm matching the username */
                        if( realm )
                        {

-                               /* is a crypt passwd */
-                               if( realm->pass[0] == '$' )
-                                       pass = crypt(pass, realm->pass);
-

                                /* check user pass */
                                /* check user pass */

-                               if( !strcmp(pass, realm->pass) )
+                               if (!strcmp(pass, realm->pass) ||
+                                   !strcmp(crypt(pass, realm->pass), realm->pass))

                                        return 1;
                        }
                }
                                        return 1;
                        }
                }