#include "uhttpd.h"
#include "mimetypes.h"
-static char _tag[128];
static LIST_HEAD(index_files);
+static LIST_HEAD(dispatch_handlers);
struct index_file {
struct list_head list;
};
enum file_hdr {
+ HDR_AUTHORIZATION,
HDR_IF_MODIFIED_SINCE,
HDR_IF_UNMODIFIED_SINCE,
HDR_IF_MATCH,
continue;
strcpy(pathptr, idx->name);
- if (!stat(path_phys, &s) && (s.st_mode & S_IFREG))
+ if (!stat(path_phys, &s) && (s.st_mode & S_IFREG)) {
+ memcpy(&p.stat, &s, sizeof(p.stat));
break;
+ }
*pathptr = 0;
}
return p.phys ? &p : NULL;
}
-#ifdef __APPLE__
-time_t timegm (struct tm *tm);
-#endif
-
static const char * uh_file_mime_lookup(const char *path)
{
struct mimetype *m = &uh_mime_types[0];
return "application/octet-stream";
}
-static const char * uh_file_mktag(struct stat *s)
+static const char * uh_file_mktag(struct stat *s, char *buf)
{
- snprintf(_tag, sizeof(_tag), "\"%x-%x-%x\"",
+ snprintf(buf, sizeof(buf), "\"%x-%x-%x\"",
(unsigned int) s->st_ino,
(unsigned int) s->st_size,
(unsigned int) s->st_mtime);
- return _tag;
+ return buf;
}
static time_t uh_file_date2unix(const char *date)
return 0;
}
-static char * uh_file_unix2date(time_t ts)
+static char * uh_file_unix2date(time_t ts, char *buf, int len)
{
struct tm *t = gmtime(&ts);
- strftime(_tag, sizeof(_tag), "%a, %d %b %Y %H:%M:%S GMT", t);
+ strftime(buf, len, "%a, %d %b %Y %H:%M:%S GMT", t);
- return _tag;
+ return buf;
}
static char *uh_file_header(struct client *cl, int idx)
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));
+ ustream_printf(cl->us, "ETag: %s\r\n", uh_file_mktag(s, buf));
ustream_printf(cl->us, "Last-Modified: %s\r\n",
- uh_file_unix2date(s->st_mtime));
+ uh_file_unix2date(s->st_mtime, buf, sizeof(buf)));
}
- ustream_printf(cl->us, "Date: %s\r\n", uh_file_unix2date(time(NULL)));
+ ustream_printf(cl->us, "Date: %s\r\n",
+ uh_file_unix2date(time(NULL), buf, sizeof(buf)));
}
static void uh_file_response_200(struct client *cl, struct stat *s)
static bool uh_file_if_match(struct client *cl, struct stat *s)
{
- const char *tag = uh_file_mktag(s);
+ char buf[128];
+ const char *tag = uh_file_mktag(s, 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)
{
- const char *tag = uh_file_mktag(s);
+ char buf[128];
+ const char *tag = uh_file_mktag(s, buf);
char *hdr = uh_file_header(cl, HDR_IF_NONE_MATCH);
char *p;
int i;
{
int i;
int count = 0;
- char filename[PATH_MAX];
+ char *filename = uh_buf;
char *pathptr;
struct dirent **files = NULL;
struct stat s;
+ char buf[128];
uh_file_response_200(cl, NULL);
ustream_printf(cl->us, "Content-Type: text/html\r\n\r\n");
if ((count = scandir(pi->phys, &files, uh_file_scandir_filter_dir,
alphasort)) > 0)
{
- memset(filename, 0, sizeof(filename));
- memcpy(filename, pi->phys, sizeof(filename));
- pathptr = &filename[strlen(filename)];
+ int len;
+
+ strcpy(filename, pi->phys);
+ len = strlen(filename);
+ pathptr = filename + len;
+ len = PATH_MAX - len;
/* list subdirs */
for (i = 0; i < count; i++) {
- strncat(filename, files[i]->d_name,
- sizeof(filename) - strlen(files[i]->d_name));
+ 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>/"
+ "<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),
+ uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
s.st_size / 1024.0);
*pathptr = 0;
/* list files */
for (i = 0; i < count; i++) {
- strncat(filename, files[i]->d_name,
- sizeof(filename) - strlen(files[i]->d_name));
+ snprintf(pathptr, len, "%s", files[i]->d_name);
if (!stat(filename, &s) &&
!(s.st_mode & S_IFDIR) && (s.st_mode & S_IROTH))
"<br /></small></li>",
pi->name, files[i]->d_name,
files[i]->d_name,
- uh_file_unix2date(s.st_mtime),
+ uh_file_unix2date(s.st_mtime, buf, sizeof(buf)),
uh_file_mime_lookup(filename),
s.st_size / 1024.0);
file_write_cb(cl);
}
-static void uh_file_request(struct client *cl, struct path_info *pi, const char *url)
+static void uh_file_request(struct client *cl, const char *url,
+ struct path_info *pi, struct blob_attr **tb)
{
- static const struct blobmsg_policy hdr_policy[__HDR_MAX] = {
- [HDR_IF_MODIFIED_SINCE] = { "if-modified-since", BLOBMSG_TYPE_STRING },
- [HDR_IF_UNMODIFIED_SINCE] = { "if-unmodified-since", BLOBMSG_TYPE_STRING },
- [HDR_IF_MATCH] = { "if-match", BLOBMSG_TYPE_STRING },
- [HDR_IF_NONE_MATCH] = { "if-none-match", BLOBMSG_TYPE_STRING },
- [HDR_IF_RANGE] = { "if-range", BLOBMSG_TYPE_STRING },
- };
- struct blob_attr *tb[__HDR_MAX];
int fd;
- blobmsg_parse(hdr_policy, __HDR_MAX, tb, blob_data(cl->hdr.head), blob_len(cl->hdr.head));
-
- cl->dispatch.file.hdr = tb;
-
if (!(pi->stat.st_mode & S_IROTH))
goto error;
if (fd < 0)
goto error;
+ cl->dispatch.file.hdr = tb;
uh_file_data(cl, pi, fd);
- } else if ((pi->stat.st_mode & S_IFDIR)) {
+ cl->dispatch.file.hdr = NULL;
+ return;
+ }
+
+ if ((pi->stat.st_mode & S_IFDIR)) {
if (conf.no_dirlists)
goto error;
uh_file_dirlist(cl, pi);
- } else {
- goto error;
+ return;
}
- return;
-
error:
uh_client_error(cl, 403, "Forbidden",
"You don't have permission to access %s on this server.",
url);
}
+void uh_dispatch_add(struct dispatch_handler *d)
+{
+ list_add_tail(&d->list, &dispatch_handlers);
+}
+
+static struct dispatch_handler *
+dispatch_find(const char *url, struct path_info *pi)
+{
+ struct dispatch_handler *d;
+
+ list_for_each_entry(d, &dispatch_handlers, list) {
+ if (pi) {
+ if (d->check_url)
+ continue;
+
+ if (d->check_path(pi, url))
+ return d;
+ } else {
+ if (d->check_path)
+ continue;
+
+ if (d->check_url(url))
+ return d;
+ }
+ }
+
+ return NULL;
+}
+
static bool __handle_file_request(struct client *cl, const char *url)
{
+ static const struct blobmsg_policy hdr_policy[__HDR_MAX] = {
+ [HDR_AUTHORIZATION] = { "authorization", BLOBMSG_TYPE_STRING },
+ [HDR_IF_MODIFIED_SINCE] = { "if-modified-since", BLOBMSG_TYPE_STRING },
+ [HDR_IF_UNMODIFIED_SINCE] = { "if-unmodified-since", BLOBMSG_TYPE_STRING },
+ [HDR_IF_MATCH] = { "if-match", BLOBMSG_TYPE_STRING },
+ [HDR_IF_NONE_MATCH] = { "if-none-match", BLOBMSG_TYPE_STRING },
+ [HDR_IF_RANGE] = { "if-range", BLOBMSG_TYPE_STRING },
+ };
+ struct dispatch_handler *d;
+ struct blob_attr *tb[__HDR_MAX];
struct path_info *pi;
pi = uh_path_lookup(cl, url);
if (!pi)
return false;
- if (!pi->redirected) {
- uh_file_request(cl, pi, url);
- cl->dispatch.file.hdr = NULL;
- }
+ if (pi->redirected)
+ return true;
+
+ blobmsg_parse(hdr_policy, __HDR_MAX, tb, blob_data(cl->hdr.head), blob_len(cl->hdr.head));
+ if (tb[HDR_AUTHORIZATION])
+ pi->auth = blobmsg_data(tb[HDR_AUTHORIZATION]);
+
+ if (!uh_auth_check(cl, pi))
+ return true;
+
+ d = dispatch_find(url, pi);
+ if (d)
+ d->handle_request(cl, url, pi);
+ else
+ uh_file_request(cl, url, pi, tb);
return true;
}
-void uh_handle_file_request(struct client *cl)
+void uh_handle_request(struct client *cl)
{
- if (__handle_file_request(cl, cl->request.url) ||
+ struct dispatch_handler *d;
+ const char *url = cl->request.url;
+
+ 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))
return;
projects / project / uhttpd.git / blobdiff