fix file posting

[src/app-framework-binder.git] / src / afb-hreq.c

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 087a27c..5ac4584 100644 (file)
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -55,9 +55,9 @@ static const char token_cookie[] = "token";
 struct hreq_data {
        struct hreq_data *next;
        char *key;
-       int file;
        size_t length;
        char *value;
+       char *path;
 };
 
 static struct afb_arg req_get(struct afb_hreq *hreq, const char *name);
@@ -184,7 +184,34 @@ static const char *magic_mimetype_fd(int fd)
 
 #endif
 
-
+static const char *mimetype_fd_name(int fd, const char *filename)
+{
+       const char *result = NULL;
+
+#if defined(INFER_EXTENSION)
+       const char *extension = strrchr(filename, '.');
+       if (extension) {
+               static const char *const known[][2] = {
+                       { ".js", "text/javascript" },
+                       { ".html", "text/html" },
+                       { NULL, NULL }
+               };
+               int i = 0;
+               while (known[i][0]) {
+                       if (!strcasecmp(extension, known[i][0])) {
+                               result = known[i][1];
+                               break;
+                       }
+                       i++;
+               }
+       }
+#endif
+#if defined(USE_MAGIC_MIME_TYPE)
+       if (result == NULL)
+               result = magic_mimetype_fd(fd);
+#endif
+       return result;
+}
 
 void afb_hreq_free(struct afb_hreq *hreq)
 {
@@ -257,6 +284,7 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
        char etag[1 + 2 * sizeof(int)];
        const char *inm;
        struct MHD_Response *response;
+       const char *mimetype;
 
        /* Opens the file or directory */
        if (filename[0]) {
@@ -336,14 +364,10 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
                response = MHD_create_response_from_fd((size_t) st.st_size, fd);
                status = MHD_HTTP_OK;
 
-#if defined(USE_MAGIC_MIME_TYPE)
                /* set the type */
-               {
-                       const char *mimetype = magic_mimetype_fd(fd);
-                       if (mimetype != NULL)
-                               MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
-               }
-#endif
+               mimetype = mimetype_fd_name(fd, filename);
+               if (mimetype != NULL)
+                       MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
        }
 
        /* fills the value and send */
@@ -391,23 +415,11 @@ const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name)
        return MHD_lookup_connection_value(hreq->connection, MHD_HEADER_KIND, name);
 }
 
-void afb_hreq_post_end(struct afb_hreq *hreq)
-{
-       struct hreq_data *data = hreq->data;
-       while(data) {
-               if (data->file > 0) {
-                       close(data->file);
-                       data->file = -1;
-               }
-               data = data->next;
-       }
-}
-
 int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data, size_t size)
 {
        void *p;
        struct hreq_data *hdat = get_data(hreq, key, 1);
-       if (hdat->file) {
+       if (hdat->path != NULL) {
                return 0;
        }
        p = realloc(hdat->value, hdat->length + size + 1);
@@ -421,38 +433,55 @@ int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data,
        return 1;
 }
 
+static int opentempfile(char **path)
+{
+       int fd;
+       char *fname;
+
+       fname = strdup("XXXXXX"); /* TODO improve the path */
+       if (fname == NULL)
+               return -1;
+
+       fd = mkostemp(fname, O_CLOEXEC|O_WRONLY);
+       if (fd < 0)
+               free(fname);
+       else
+               *path = fname;
+       return fd;
+}
+
 int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *file, const char *data, size_t size)
 {
+       int fd;
+       ssize_t sz;
        struct hreq_data *hdat = get_data(hreq, key, 1);
 
-       /* continuation with reopening */
-       if (hdat->file < 0) {
-               hdat->file = open(hdat->value, O_WRONLY|O_APPEND);
-               if (hdat->file == 0) {
-                       hdat->file = dup(0);
-                       close(0);
-               }
-               if (hdat->file <= 0)
+fprintf(stderr, "%s=%s %s=%s %s\n",key,hdat->key,file,hdat->value,hdat->path);
+       if (hdat->value == NULL) {
+               hdat->value = strdup(file);
+               if (hdat->value == NULL)
                        return 0;
+               fd = opentempfile(&hdat->path);
+       } else if (strcmp(hdat->value, file) || hdat->path == NULL) {
+               return 0;
+       } else {
+               fd = open(hdat->path, O_WRONLY|O_APPEND);
        }
-       if (hdat->file > 0) {
-               write(hdat->file, data, size);
-               return 1;
+       if (fd < 0)
+               return 0;
+       while (size) {
+               sz = write(fd, data, size);
+               if (sz >= 0) {
+                       hdat->length += (size_t)sz;
+                       size -= (size_t)sz;
+                       data += sz;
+               } else if (errno != EINTR)
+                       break;
        }
-
-       /* creation */
-       /* TODO */
-       return 0;
-       
+       close(fd);
+       return !size;
 }
 
-int afb_hreq_is_argument_a_file(struct afb_hreq *hreq, const char *key)
-{
-       struct hreq_data *hdat = get_data(hreq, key, 0);
-       return hdat != NULL && hdat->file != 0;
-}
-
-
 struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
 {
        return (struct afb_req){ .itf = &afb_hreq_itf, .data = hreq };
@@ -466,14 +495,14 @@ static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
                        .name = hdat->key,
                        .value = hdat->value,
                        .size = hdat->length,
-                       .is_file = (hdat->file != 0)
+                       .path = hdat->path
                };
                
        return (struct afb_arg){
                .name = name,
                .value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name),
                .size = 0,
-               .is_file = 0
+               .path = NULL
        };
 }
 
@@ -492,7 +521,7 @@ static int _iterargs_(struct iterdata *id, enum MHD_ValueKind kind, const char *
                .name = key,
                .value = value,
                .size = 0,
-               .is_file = 0
+               .path = NULL
        });
 }
 
@@ -505,7 +534,7 @@ static void req_iterate(struct afb_hreq *hreq, int (*iterator)(void *closure, st
                        .name = hdat->key,
                        .value = hdat->value,
                        .size = hdat->length,
-                       .is_file = (hdat->file != 0)}))
+                       .path = hdat->path}))
                        return;
                hdat = hdat->next;
        }
@@ -562,7 +591,7 @@ struct AFB_clientCtx *afb_hreq_context(struct afb_hreq *hreq)
                        uuid = afb_hreq_get_argument(hreq, uuid_arg);
                if (uuid == NULL)
                        uuid = afb_hreq_get_cookie(hreq, uuid_cookie);
-               hreq->context = ctxClientGet(uuid);
+               hreq->context = ctxClientGetForUuid(uuid);
        }
        return hreq->context;
 }