/*
* 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 _DARWIN_C_SOURCE
#define _XOPEN_SOURCE 700
#include <sys/types.h>
#include <sys/dir.h>
#include <time.h>
#include <strings.h>
+#include <dirent.h>
#include <libubox/blobmsg.h>
exists = !!canonpath(uh_buf, path_phys);
uh_buf[i] = ch;
+ if (!exists)
+ continue;
+
+ /* test current path */
+ if (stat(path_phys, &p.stat))
+ continue;
+
snprintf(path_info, sizeof(path_info), "%s", uh_buf + i);
break;
}
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;
static const char * uh_file_mime_lookup(const char *path)
{
- struct mimetype *m = &uh_mime_types[0];
+ const struct mimetype *m = &uh_mime_types[0];
const char *e;
while (m->extn) {
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);
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)));
}
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;
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;
return true;
}
+static int dirent_cmp(const struct dirent **a, const struct dirent **b)
+{
+ bool dir_a = !!((*a)->d_type & DT_DIR);
+ bool dir_b = !!((*b)->d_type & DT_DIR);
+
+ /* directories first */
+ if (dir_a != dir_b)
+ return dir_b - dir_a;
+
+ return alphasort(a, b);
+}
-static int uh_file_scandir_filter_dir(const struct dirent *e)
+static void list_entries(struct client *cl, struct dirent **files, int count,
+ const char *path, char *local_path)
{
- return strcmp(e->d_name, ".") ? 1 : 0;
+ const char *suffix = "/";
+ const char *type = "directory";
+ unsigned int mode = S_IXOTH;
+ struct stat s;
+ char *file;
+ char buf[128];
+ int i;
+
+ file = local_path + strlen(local_path);
+ for (i = 0; i < count; i++) {
+ const char *name = files[i]->d_name;
+ bool dir = !!(files[i]->d_type & DT_DIR);
+
+ if (name[0] == '.' && name[1] == 0)
+ continue;
+
+ sprintf(file, "%s", name);
+ if (stat(local_path, &s))
+ continue;
+
+ if (!dir) {
+ suffix = "";
+ mode = S_IROTH;
+ type = uh_file_mime_lookup(local_path);
+ }
+
+ if (!(s.st_mode & mode))
+ continue;
+
+ uh_chunk_printf(cl,
+ "<li><strong><a href='%s%s%s'>%s</a>%s"
+ "</strong><br /><small>modified: %s"
+ "<br />%s - %.02f kbyte<br />"
+ "<br /></small></li>",
+ path, name, suffix,
+ name, suffix,
+ uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
+ type, s.st_size / 1024.0);
+
+ *file = 0;
+ free(files[i]);
+ }
}
static void uh_file_dirlist(struct client *cl, struct path_info *pi)
{
- int i;
- int count = 0;
- char *filename = uh_buf;
- char *pathptr;
struct dirent **files = NULL;
- struct stat s;
- char buf[128];
+ int count = 0;
uh_file_response_200(cl, NULL);
ustream_printf(cl->us, "Content-Type: text/html\r\n\r\n");
"<body><h1>Index of %s</h1><hr /><ol>",
pi->name, pi->name);
- if ((count = scandir(pi->phys, &files, uh_file_scandir_filter_dir,
- alphasort)) > 0)
- {
- int len;
-
- strcpy(filename, pi->phys);
- len = strlen(filename);
- pathptr = filename + len;
- len = PATH_MAX - len;
-
- /* list subdirs */
- for (i = 0; i < count; i++) {
- snprintf(pathptr, len, "%s", files[i]->d_name);
-
- if (!stat(filename, &s) &&
- (s.st_mode & S_IFDIR) && (s.st_mode & S_IXOTH))
- uh_chunk_printf(cl,
- "<li><strong><a href='%s%s/'>%s</a>/"
- "</strong><br /><small>modified: %s"
- "<br />directory - %.02f kbyte<br />"
- "<br /></small></li>",
- pi->name, files[i]->d_name,
- files[i]->d_name,
- uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
- s.st_size / 1024.0);
-
- *pathptr = 0;
- }
-
- /* list files */
- for (i = 0; i < count; i++) {
- snprintf(pathptr, len, "%s", files[i]->d_name);
-
- if (!stat(filename, &s) &&
- !(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH))
- uh_chunk_printf(cl,
- "<li><strong><a href='%s%s'>%s</a>"
- "</strong><br /><small>modified: %s"
- "<br />%s - %.02f kbyte<br />"
- "<br /></small></li>",
- pi->name, files[i]->d_name,
- files[i]->d_name,
- uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
- uh_file_mime_lookup(filename),
- s.st_size / 1024.0);
-
- *pathptr = 0;
- }
+ count = scandir(pi->phys, &files, NULL, dirent_cmp);
+ if (count > 0) {
+ strcpy(uh_buf, pi->phys);
+ list_entries(cl, files, count, pi->name, uh_buf);
}
+ free(files);
uh_chunk_printf(cl, "</ol><hr /></body></html>");
uh_request_done(cl);
-
- if (files)
- {
- for (i = 0; i < count; i++)
- free(files[i]);
-
- free(files);
- }
}
static void file_write_cb(struct client *cl)
return NULL;
}
-static bool __handle_file_request(struct client *cl, const char *url)
+static bool __handle_file_request(struct client *cl, char *url)
{
static const struct blobmsg_policy hdr_policy[__HDR_MAX] = {
[HDR_AUTHORIZATION] = { "authorization", BLOBMSG_TYPE_STRING },
void uh_handle_request(struct client *cl)
{
+ struct http_request *req = &cl->request;
struct dispatch_handler *d;
- const char *url = blobmsg_data(blob_data(cl->hdr.head));;
+ 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);
return;
}
- if (__handle_file_request(cl, url) ||
- __handle_file_request(cl, conf.error_handler))
+ if (__handle_file_request(cl, url))
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);
}
projects / project / uhttpd.git / blobdiff