uhttpd/file: fix string out of buffer range on uh_defer_script

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index f9ea76196ec1706553fab7a1adc9741ca45cb2ff..c755df6a70bf0be74f2cfffb85a2fadf306024df 100644 (file)
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -33,6 +33,9 @@
 #include <libubus.h>
 #include <json-c/json.h>
 #endif
+#ifdef HAVE_UCODE
+#include <ucode/vm.h>
+#endif
 #ifdef HAVE_TLS
 #include <libubox/ustream-ssl.h>
 #endif
@@ -52,6 +55,22 @@ struct alias {
        char *path;
 };
 
+struct lua_prefix {
+       struct list_head list;
+       const char *handler;
+       const char *prefix;
+       void *ctx;
+};
+
+#ifdef HAVE_UCODE
+struct ucode_prefix {
+       struct list_head list;
+       const char *handler;
+       const char *prefix;
+       uc_vm_t ctx;
+};
+#endif
+
 struct config {
        const char *docroot;
        const char *realm;
@@ -60,10 +79,9 @@ struct config {
        const char *cgi_prefix;
        const char *cgi_docroot_path;
        const char *cgi_path;
-       const char *lua_handler;
-       const char *lua_prefix;
        const char *ubus_prefix;
        const char *ubus_socket;
+       const char *dirlist_charset;
        int no_symlinks;
        int no_dirlists;
        int network_timeout;
@@ -77,7 +95,12 @@ struct config {
        int ubus_noauth;
        int ubus_cors;
        int cgi_prefix_len;
+       int events_retry;
        struct list_head cgi_alias;
+       struct list_head lua_prefix;
+#ifdef HAVE_UCODE
+       struct list_head ucode_prefix;
+#endif
 };
 
 struct auth_realm {
@@ -92,6 +115,9 @@ enum http_method {
        UH_HTTP_MSG_POST,
        UH_HTTP_MSG_HEAD,
        UH_HTTP_MSG_OPTIONS,
+       UH_HTTP_MSG_PUT,
+       UH_HTTP_MSG_PATCH,
+       UH_HTTP_MSG_DELETE,
 };
 
 enum http_version {
@@ -146,7 +172,6 @@ struct path_info {
        const char *name;
        const char *info;
        const char *query;
-       const char *auth;
        bool redirected;
        struct stat stat;
        const struct interpreter *ip;
@@ -201,6 +226,7 @@ struct dispatch_ubus {
        struct json_tokener *jstok;
        struct json_object *jsobj;
        struct json_object *jsobj_cur;
+       char *url_path;
        int post_len;
 
        uint32_t obj;
@@ -210,6 +236,9 @@ struct dispatch_ubus {
        bool req_pending;
        bool array;
        int array_idx;
+       bool legacy; /* Got legacy request => use legacy reply */
+
+       struct ubus_subscriber sub;
 };
 #endif
 
@@ -224,6 +253,7 @@ struct dispatch {
        void (*req_free)(struct client *cl);
 
        bool data_blocked;
+       bool no_cache;
 
        union {
                struct {
@@ -258,6 +288,7 @@ struct client {
        struct uh_addr srv_addr, peer_addr;
 
        struct blob_buf hdr;
+       struct blob_buf hdr_response;
        struct dispatch dispatch;
 };
 
@@ -298,7 +329,8 @@ void uh_client_read_cb(struct client *cl);
 void uh_client_notify_state(struct client *cl);
 
 void uh_auth_add(const char *path, const char *user, const char *pass);
-bool uh_auth_check(struct client *cl, struct path_info *pi);
+bool uh_auth_check(struct client *cl, const char *path, const char *auth,
+                   char **uptr, char **pptr);
 
 void uh_close_listen_fds(void);
 void uh_close_fds(void);