add auth support

[project/uhttpd.git] / file.c

diff --git a/file.c b/file.c
index b2cfd8d..62c8ee7 100644 (file)
--- a/file.c
+++ b/file.c
@@ -32,6 +32,7 @@
 
 static char _tag[128];
 static LIST_HEAD(index_files);
+static LIST_HEAD(dispatch_handlers);
 
 struct index_file {
        struct list_head list;
@@ -39,6 +40,7 @@ struct index_file {
 };
 
 enum file_hdr {
+       HDR_AUTHORIZATION,
        HDR_IF_MODIFIED_SINCE,
        HDR_IF_UNMODIFIED_SINCE,
        HDR_IF_MATCH,
@@ -468,7 +470,7 @@ static void uh_file_dirlist(struct client *cl, struct path_info *pi)
                        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>",
@@ -577,22 +579,11 @@ static void uh_file_data(struct client *cl, struct path_info *pi, int fd)
        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;
 
@@ -601,43 +592,104 @@ static void uh_file_request(struct client *cl, struct path_info *pi, const char
                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;