more simplification
[src/app-framework-binder.git] / src / afb-hsrv.c
index a358cbd..efbb935 100644 (file)
 
 #include <microhttpd.h>
 
-#include "local-def.h"
 #include "afb-method.h"
 #include "afb-hreq.h"
-#include "afb-websock.h"
-#include "afb-apis.h"
+#include "afb-hsrv.h"
 #include "afb-req-itf.h"
 #include "verbose.h"
 #include "utils-upoll.h"
 
+
 #define JSON_CONTENT  "application/json"
 #define FORM_CONTENT  MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
 
 
-struct afb_hsrv_handler {
-       struct afb_hsrv_handler *next;
+struct hsrv_handler {
+       struct hsrv_handler *next;
        const char *prefix;
        size_t length;
        int (*handler) (struct afb_hreq *, void *);
@@ -48,179 +47,23 @@ struct afb_hsrv_handler {
        int priority;
 };
 
-struct afb_diralias {
+struct hsrv_alias {
        const char *alias;
        const char *directory;
        size_t lendir;
        int dirfd;
 };
 
-static struct upoll *upoll = NULL;
-
-int afb_hreq_one_page_api_redirect(
-               struct afb_hreq *hreq,
-               void *data)
-{
-       size_t plen;
-       char *url;
-
-       if (hreq->lentail >= 2 && hreq->tail[1] == '#')
-               return 0;
-       /*
-        * Here we have for example:
-        *    url  = "/pre/dir/page"   lenurl = 13
-        *    tail =     "/dir/page"   lentail = 9
-        *
-        * We will produce "/pre/#!dir/page"
-        *
-        * Let compute plen that include the / at end (for "/pre/")
-        */
-       plen = hreq->lenurl - hreq->lentail + 1;
-       url = alloca(hreq->lenurl + 3);
-       memcpy(url, hreq->url, plen);
-       url[plen++] = '#';
-       url[plen++] = '!';
-       memcpy(&url[plen], &hreq->tail[1], hreq->lentail);
-       return afb_hreq_redirect_to(hreq, url);
-}
-
-static struct afb_hsrv_handler *new_handler(
-               struct afb_hsrv_handler *head,
-               const char *prefix,
-               int (*handler) (struct afb_hreq *, void *),
-               void *data,
-               int priority)
-{
-       struct afb_hsrv_handler *link, *iter, *previous;
-       size_t length;
-
-       /* get the length of the prefix without its leading / */
-       length = strlen(prefix);
-       while (length && prefix[length - 1] == '/')
-               length--;
-
-       /* allocates the new link */
-       link = malloc(sizeof *link);
-       if (link == NULL)
-               return NULL;
-
-       /* initialize it */
-       link->prefix = prefix;
-       link->length = length;
-       link->handler = handler;
-       link->data = data;
-       link->priority = priority;
-
-       /* adds it */
-       previous = NULL;
-       iter = head;
-       while (iter && (priority < iter->priority || (priority == iter->priority && length <= iter->length))) {
-               previous = iter;
-               iter = iter->next;
-       }
-       link->next = iter;
-       if (previous == NULL)
-               return link;
-       previous->next = link;
-       return head;
-}
-
-int afb_hsrv_add_handler(
-               AFB_session * session,
-               const char *prefix,
-               int (*handler) (struct afb_hreq *, void *),
-               void *data,
-               int priority)
-{
-       struct afb_hsrv_handler *head;
-
-       head = new_handler(session->handlers, prefix, handler, data, priority);
-       if (head == NULL)
-               return 0;
-       session->handlers = head;
-       return 1;
-}
-
-static int afb_hreq_websocket_switch(struct afb_hreq *hreq, void *data)
-{
-       int later;
-
-       afb_hreq_context(hreq);
-       if (hreq->lentail != 0 || !afb_websock_check(hreq, &later))
-               return 0;
-
-       if (!later) {
-               struct afb_websock *ws = afb_websock_create(hreq->connection);
-               if (ws == NULL) {
-                       /* TODO */
-               } else {
-                       /* TODO */
-               }
-       }
-       return 1;
-}
-
-static int afb_hreq_rest_api(struct afb_hreq *hreq, void *data)
-{
-       const char *api, *verb;
-       size_t lenapi, lenverb;
-       struct AFB_clientCtx *context;
-
-       api = &hreq->tail[strspn(hreq->tail, "/")];
-       lenapi = strcspn(api, "/");
-       verb = &api[lenapi];
-       verb = &verb[strspn(verb, "/")];
-       lenverb = strcspn(verb, "/");
-
-       if (!(*api && *verb && lenapi && lenverb))
-               return 0;
-
-       context = afb_hreq_context(hreq);
-       return afb_apis_handle(afb_hreq_to_req(hreq), context, api, lenapi, verb, lenverb);
-}
-
-static int handle_alias(struct afb_hreq *hreq, void *data)
-{
-       struct afb_diralias *da = data;
-
-       if (hreq->method != afb_method_get) {
-               afb_hreq_reply_error(hreq, MHD_HTTP_METHOD_NOT_ALLOWED);
-               return 1;
-       }
-
-       if (!afb_hreq_valid_tail(hreq)) {
-               afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
-               return 1;
-       }
+struct afb_hsrv {
+       unsigned refcount;
+       struct hsrv_handler *handlers;
+       struct MHD_Daemon *httpd;
+       struct upoll *upoll;
+       char *cache_to;
+};
 
-       return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
-}
 
-int afb_hsrv_add_alias(AFB_session * session, const char *prefix, const char *alias, int priority)
-{
-       struct afb_diralias *da;
-       int dirfd;
-
-       dirfd = open(alias, O_PATH|O_DIRECTORY);
-       if (dirfd < 0) {
-               /* TODO message */
-               return 0;
-       }
-       da = malloc(sizeof *da);
-       if (da != NULL) {
-               da->alias = prefix;
-               da->directory = alias;
-               da->lendir = strlen(da->directory);
-               da->dirfd = dirfd;
-               if (afb_hsrv_add_handler(session, prefix, handle_alias, da, priority))
-                       return 1;
-               free(da);
-       }
-       close(dirfd);
-       return 0;
-}
-
-void afb_hsrv_reply_error(struct MHD_Connection *connection, unsigned int status)
+static void reply_error(struct MHD_Connection *connection, unsigned int status)
 {
        char *buffer;
        int length;
@@ -268,11 +111,11 @@ static int access_handler(
        int rc;
        struct afb_hreq *hreq;
        enum afb_method method;
-       AFB_session *session;
-       struct afb_hsrv_handler *iter;
+       struct afb_hsrv *hsrv;
+       struct hsrv_handler *iter;
        const char *type;
 
-       session = cls;
+       hsrv = cls;
        hreq = *recordreq;
        if (hreq == NULL) {
                /* create the request */
@@ -288,7 +131,7 @@ static int access_handler(
                        goto bad_request;
 
                /* init the request */
-               hreq->session = cls;
+               hreq->cacheTimeout = hsrv->cache_to;
                hreq->connection = connection;
                hreq->method = method;
                hreq->version = version;
@@ -305,8 +148,9 @@ static int access_handler(
                                hreq->postform = MHD_create_post_processor (connection, 65500, postproc, hreq);
                                if (hreq->postform == NULL)
                                        goto internal_error;
+                               return MHD_YES;
                        } else if (strcasestr(type, JSON_CONTENT) == NULL) {
-                               afb_hsrv_reply_error(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
+                               reply_error(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
                                return MHD_YES;
                        }
                }
@@ -326,7 +170,6 @@ static int access_handler(
        }
 
        /* flush the data */
-       afb_hreq_post_end(hreq);
        if (hreq->postform != NULL) {
                rc = MHD_destroy_post_processor(hreq->postform);
                hreq->postform = NULL;
@@ -335,7 +178,7 @@ static int access_handler(
        }
 
        /* search an handler for the request */
-       iter = session->handlers;
+       iter = hsrv->handlers;
        while (iter) {
                if (afb_hreq_unprefix(hreq, iter->prefix, iter->length)) {
                        if (iter->handler(hreq, iter->data))
@@ -351,11 +194,11 @@ static int access_handler(
        return MHD_YES;
 
 bad_request:
-       afb_hsrv_reply_error(connection, MHD_HTTP_BAD_REQUEST);
+       reply_error(connection, MHD_HTTP_BAD_REQUEST);
        return MHD_YES;
 
 internal_error:
-       afb_hsrv_reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
+       reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
        return MHD_YES;
 }
 
@@ -366,7 +209,8 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
        struct afb_hreq *hreq;
 
        hreq = *recordreq;
-
+       if (hreq->upgrade)
+               MHD_suspend_connection (connection);
        afb_hreq_free(hreq);
 }
 
@@ -375,96 +219,135 @@ static int new_client_handler(void *cls, const struct sockaddr *addr, socklen_t
        return MHD_YES;
 }
 
-#if defined(USE_MAGIC_MIME_TYPE)
+static struct hsrv_handler *new_handler(
+               struct hsrv_handler *head,
+               const char *prefix,
+               int (*handler) (struct afb_hreq *, void *),
+               void *data,
+               int priority)
+{
+       struct hsrv_handler *link, *iter, *previous;
+       size_t length;
+
+       /* get the length of the prefix without its leading / */
+       length = strlen(prefix);
+       while (length && prefix[length - 1] == '/')
+               length--;
+
+       /* allocates the new link */
+       link = malloc(sizeof *link);
+       if (link == NULL)
+               return NULL;
+
+       /* initialize it */
+       link->prefix = prefix;
+       link->length = length;
+       link->handler = handler;
+       link->data = data;
+       link->priority = priority;
 
-#if !defined(MAGIC_DB)
-#define MAGIC_DB "/usr/share/misc/magic.mgc"
-#endif
+       /* adds it */
+       previous = NULL;
+       iter = head;
+       while (iter && (priority < iter->priority || (priority == iter->priority && length <= iter->length))) {
+               previous = iter;
+               iter = iter->next;
+       }
+       link->next = iter;
+       if (previous == NULL)
+               return link;
+       previous->next = link;
+       return head;
+}
 
-static int init_lib_magic (AFB_session *session)
+static int handle_alias(struct afb_hreq *hreq, void *data)
 {
-       /* 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");
+       struct hsrv_alias *da = data;
 
-       session->magic = magic_open(MAGIC_MIME_TYPE);
-       if (session->magic == NULL) {
-               fprintf(stderr,"ERROR: unable to initialize magic library\n");
-               return 0;
+       if (hreq->method != afb_method_get) {
+               afb_hreq_reply_error(hreq, MHD_HTTP_METHOD_NOT_ALLOWED);
+               return 1;
        }
 
-       /* Warning: should not use NULL for DB [libmagic bug wont pass efence check] */
-       if (magic_load(session->magic, MAGIC_DB) != 0) {
-               fprintf(stderr,"cannot load magic database - %s\n", magic_error(session->magic));
-               magic_close(session->magic);
-               session->magic = NULL;
-               return 0;
+       if (!afb_hreq_valid_tail(hreq)) {
+               afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
+               return 1;
        }
 
-       return 1;
+       return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
 }
-#endif
 
-static int my_default_init(AFB_session * session)
+int afb_hsrv_add_handler(
+               struct afb_hsrv *hsrv,
+               const char *prefix,
+               int (*handler) (struct afb_hreq *, void *),
+               void *data,
+               int priority)
 {
-       int idx;
-
-       if (!afb_hsrv_add_handler(session, session->config->rootapi, afb_hreq_websocket_switch, NULL, 20))
-               return 0;
+       struct hsrv_handler *head;
 
-       if (!afb_hsrv_add_handler(session, session->config->rootapi, afb_hreq_rest_api, NULL, 10))
+       head = new_handler(hsrv->handlers, prefix, handler, data, priority);
+       if (head == NULL)
                return 0;
+       hsrv->handlers = head;
+       return 1;
+}
 
-       for (idx = 0; session->config->aliasdir[idx].url != NULL; idx++)
-               if (!afb_hsrv_add_alias (session, session->config->aliasdir[idx].url, session->config->aliasdir[idx].path, 0))
-                       return 0;
+int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority)
+{
+       struct hsrv_alias *da;
+       int dirfd;
 
-       if (!afb_hsrv_add_alias(session, "", session->config->rootdir, -10))
+       dirfd = open(alias, O_PATH|O_DIRECTORY);
+       if (dirfd < 0) {
+               /* TODO message */
                return 0;
+       }
+       da = malloc(sizeof *da);
+       if (da != NULL) {
+               da->alias = prefix;
+               da->directory = alias;
+               da->lendir = strlen(da->directory);
+               da->dirfd = dirfd;
+               if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority))
+                       return 1;
+               free(da);
+       }
+       close(dirfd);
+       return 0;
+}
 
-       if (!afb_hsrv_add_handler(session, session->config->rootbase, afb_hreq_one_page_api_redirect, NULL, -20))
-               return 0;
+int afb_hsrv_set_cache_timeout(struct afb_hsrv *hsrv, int duration)
+{
+       int rc;
+       char *dur;
 
-#if defined(USE_MAGIC_MIME_TYPE)
-       /*TBD open libmagic cache [fail to pass EFENCE check (allocating 0 bytes)] */
-       init_lib_magic (session);
-#endif
+       rc = asprintf(&dur, "%d", duration);
+       if (rc < 0)
+               return 0;
 
+       free(hsrv->cache_to);
+       hsrv->cache_to = dur;
        return 1;
 }
 
-/* infinite loop */
-static void hsrv_handle_event(struct MHD_Daemon *httpd)
-{
-       MHD_run(httpd);
-}
-
-int afb_hsrv_start(AFB_session * session)
+int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection_timeout)
 {
+       struct upoll *upoll;
        struct MHD_Daemon *httpd;
        const union MHD_DaemonInfo *info;
 
-       if (!my_default_init(session)) {
-               printf("Error: initialisation of httpd failed");
-               return 0;
-       }
-
-       if (verbosity) {
-               printf("AFB:notice Waiting port=%d rootdir=%s\n", session->config->httpdPort, session->config->rootdir);
-               printf("AFB:notice Browser URL= http:/*localhost:%d\n", session->config->httpdPort);
-       }
-
        httpd = MHD_start_daemon(
                MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
-               (uint16_t) session->config->httpdPort,  /* port */
+               port,                           /* port */
                new_client_handler, NULL,       /* Tcp Accept call back + extra attribute */
-               access_handler, session,        /* Http Request Call back + extra attribute */
-               MHD_OPTION_NOTIFY_COMPLETED, end_handler, session,
-               MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int)15,        /* 15 seconds */
+               access_handler, hsrv,   /* Http Request Call back + extra attribute */
+               MHD_OPTION_NOTIFY_COMPLETED, end_handler, hsrv,
+               MHD_OPTION_CONNECTION_TIMEOUT, connection_timeout,
                MHD_OPTION_END);        /* options-end */
 
        if (httpd == NULL) {
-               printf("Error: httpStart invalid httpd port: %d", session->config->httpdPort);
+               printf("Error: httpStart invalid httpd port: %d", (int)port);
                return 0;
        }
 
@@ -481,19 +364,37 @@ int afb_hsrv_start(AFB_session * session)
                fprintf(stderr, "Error: connection to upoll of httpd failed");
                return 0;
        }
-       upoll_on_readable(upoll, (void*)hsrv_handle_event);
+       upoll_on_readable(upoll, (void*)MHD_run);
 
-       session->httpd = httpd;
+       hsrv->httpd = httpd;
+       hsrv->upoll = upoll;
        return 1;
 }
 
-void afb_hsrv_stop(AFB_session * session)
+void afb_hsrv_stop(struct afb_hsrv *hsrv)
+{
+       if (hsrv->upoll)
+               upoll_close(hsrv->upoll);
+       hsrv->upoll = NULL;
+       if (hsrv->httpd != NULL)
+               MHD_stop_daemon(hsrv->httpd);
+       hsrv->httpd = NULL;
+}
+
+struct afb_hsrv *afb_hsrv_create()
+{
+       struct afb_hsrv *result = calloc(1, sizeof(struct afb_hsrv));
+       if (result != NULL)
+               result->refcount = 1;
+       return result;
+}
+
+void afb_hsrv_put(struct afb_hsrv *hsrv)
 {
-       if (upoll)
-               upoll_close(upoll);
-       upoll = NULL;
-       if (session->httpd != NULL)
-               MHD_stop_daemon(session->httpd);
-       session->httpd = NULL;
+       assert(hsrv->refcount != 0);
+       if (!--hsrv->refcount) {
+               afb_hsrv_stop(hsrv);
+               free(hsrv);
+       }
 }