renaming of session API

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

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 16c235a..ece9b39 100644 (file)
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+#define USE_MAGIC_MIME_TYPE
 #define _GNU_SOURCE
 
 #include <stdlib.h>
@@ -27,11 +28,16 @@
 
 #include <microhttpd.h>
 
+#if defined(USE_MAGIC_MIME_TYPE)
+#include <magic.h>
+#endif
+
 #include "local-def.h"
 #include "afb-method.h"
 #include "afb-req-itf.h"
 #include "afb-hreq.h"
 #include "session.h"
+#include "verbose.h"
 
 #define SIZE_RESPONSE_BUFFER   8000
 
@@ -135,6 +141,51 @@ static int validsubpath(const char *subpath)
        return 1;
 }
 
+#if defined(USE_MAGIC_MIME_TYPE)
+
+#if !defined(MAGIC_DB)
+#define MAGIC_DB "/usr/share/misc/magic.mgc"
+#endif
+
+static magic_t lazy_libmagic()
+{
+       static int done = 0;
+       static magic_t result = NULL;
+
+       if (!done) {
+               done = 1;
+               /* MAGIC_MIME tells magic to return a mime of the file,
+                        but you can specify different things */
+               if (verbosity)
+                       printf("Loading mimetype default magic database\n");
+
+               result = magic_open(MAGIC_MIME_TYPE);
+               if (result == NULL) {
+                       fprintf(stderr,"ERROR: unable to initialize magic library\n");
+               }
+               /* Warning: should not use NULL for DB
+                               [libmagic bug wont pass efence check] */
+               else if (magic_load(result, MAGIC_DB) != 0) {
+                       fprintf(stderr,"cannot load magic database - %s\n",
+                                       magic_error(result));
+                       magic_close(result);
+                       result = NULL;
+               }
+       }
+
+       return result;
+}
+
+static const char *magic_mimetype_fd(int fd)
+{
+       magic_t lib = lazy_libmagic();
+       return lib ? magic_descriptor(lib, fd) : NULL;
+}
+
+#endif
+
+
+
 void afb_hreq_free(struct afb_hreq *hreq)
 {
        struct hreq_data *data;
@@ -269,7 +320,7 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
        if (inm && 0 == strcmp(inm, etag)) {
                /* etag ok, return NOT MODIFIED */
                close(fd);
-               if (verbose)
+               if (verbosity)
                        fprintf(stderr, "Not Modified: [%s]\n", filename);
                response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT);
                status = MHD_HTTP_NOT_MODIFIED;
@@ -287,8 +338,8 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 
 #if defined(USE_MAGIC_MIME_TYPE)
                /* set the type */
-               if (hreq->session->magic) {
-                       const char *mimetype = magic_descriptor(hreq->session->magic, fd);
+               {
+                       const char *mimetype = magic_mimetype_fd(fd);
                        if (mimetype != NULL)
                                MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
                }
@@ -319,7 +370,7 @@ int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url)
        MHD_add_response_header(response, MHD_HTTP_HEADER_LOCATION, url);
        MHD_queue_response(hreq->connection, MHD_HTTP_MOVED_PERMANENTLY, response);
        MHD_destroy_response(response);
-       if (verbose)
+       if (verbosity)
                fprintf(stderr, "redirect from [%s] to [%s]\n", hreq->url, url);
        return 1;
 }
@@ -511,7 +562,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;
 }