fix file etag buffer length

[project/uhttpd.git] / file.c

diff --git a/file.c b/file.c
index a6350eb3607a46c1d9143a0c655e5a74a4839fd4..c769c0a0a6b6bdf4b1fdb576d7813b206b99bd38 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1,20 +1,20 @@
 /*
  * 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
@@ -179,6 +179,10 @@ uh_path_lookup(struct client *cl, const char *url)
                if (!exists)
                        continue;
 
+               /* test current path */
+               if (stat(path_phys, &p.stat))
+                       continue;
+
                snprintf(path_info, sizeof(path_info), "%s", uh_buf + i);
                break;
        }
@@ -189,10 +193,6 @@ uh_path_lookup(struct client *cl, const char *url)
             path_phys[docroot_len] != '/'))
                return NULL;
 
-       /* test current path */
-       if (stat(path_phys, &p.stat))
-               return NULL;
-
        /* is a regular file */
        if (p.stat.st_mode & S_IFREG) {
                p.root = docroot;
@@ -274,9 +274,9 @@ static const char * uh_file_mime_lookup(const char *path)
        return "application/octet-stream";
 }
 
-static const char * uh_file_mktag(struct stat *s, char *buf)
+static const char * uh_file_mktag(struct stat *s, char *buf, int len)
 {
-       snprintf(buf, sizeof(buf), "\"%x-%x-%x\"",
+       snprintf(buf, len, "\"%x-%x-%x\"",
                         (unsigned int) s->st_ino,
                         (unsigned int) s->st_size,
                         (unsigned int) s->st_mtime);
@@ -318,7 +318,7 @@ static void uh_file_response_ok_hdrs(struct client *cl, struct stat *s)
        char buf[128];
 
        if (s) {
-               ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf));
+               ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf, sizeof(buf)));
                ustream_printf(cl->us, "Last-Modified: %s\r\n",
                               uh_file_unix2date(s->st_mtime, buf, sizeof(buf)));
        }
@@ -347,7 +347,7 @@ static void uh_file_response_412(struct client *cl)
 static bool uh_file_if_match(struct client *cl, struct stat *s)
 {
        char buf[128];
-       const char *tag = uh_file_mktag(s, buf);
+       const char *tag = uh_file_mktag(s, buf, sizeof(buf));
        char *hdr = uh_file_header(cl, HDR_IF_MATCH);
        char *p;
        int i;
@@ -388,7 +388,7 @@ static int uh_file_if_modified_since(struct client *cl, struct stat *s)
 static int uh_file_if_none_match(struct client *cl, struct stat *s)
 {
        char buf[128];
-       const char *tag = uh_file_mktag(s, buf);
+       const char *tag = uh_file_mktag(s, buf, sizeof(buf));
        char *hdr = uh_file_header(cl, HDR_IF_NONE_MATCH);
        char *p;
        int i;
@@ -686,10 +686,12 @@ static bool __handle_file_request(struct client *cl, char *url)
 
 void uh_handle_request(struct client *cl)
 {
+       struct http_request *req = &cl->request;
        struct dispatch_handler *d;
        char *url = blobmsg_data(blob_data(cl->hdr.head));;
        char *error_handler;
 
+       req->redirect_status = 200;
        d = dispatch_find(url, NULL);
        if (d) {
                d->handle_request(cl, url, NULL);
@@ -699,10 +701,13 @@ void uh_handle_request(struct client *cl)
        if (__handle_file_request(cl, url))
                return;
 
-       error_handler = alloca(strlen(conf.error_handler) + 1);
-       strcpy(error_handler, conf.error_handler);
-       if (__handle_file_request(cl, error_handler))
-               return;
+       req->redirect_status = 404;
+       if (conf.error_handler) {
+               error_handler = alloca(strlen(conf.error_handler) + 1);
+               strcpy(error_handler, conf.error_handler);
+               if (__handle_file_request(cl, error_handler))
+                       return;
+       }
 
        uh_client_error(cl, 404, "Not Found", "The requested URL %s was not found on this server.", url);
 }