locale-root: improves the API

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

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index f514c97..361d13f 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,10 +30,12 @@
 #include <systemd/sd-event.h>
 
 #include "afb-method.h"
+#include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-hsrv.h"
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
 #include "verbose.h"
+#include "locale-root.h"
 
 #include "afb-common.h"
 
@@ -53,10 +55,8 @@ struct hsrv_handler {
 };
 
 struct hsrv_alias {
-       const char *alias;
-       const char *directory;
-       size_t lendir;
-       int dirfd;
+       struct locale_root *root;
+       int relax;
 };
 
 struct afb_hsrv {
@@ -130,6 +130,7 @@ static int access_handler(
                }
 
                /* init the request */
+               hreq->refcount = 1;
                hreq->hsrv = hsrv;
                hreq->cacheTimeout = hsrv->cache_to;
                hreq->reqid = ++global_reqids;
@@ -139,6 +140,7 @@ static int access_handler(
                hreq->connection = connection;
                hreq->method = method;
                hreq->version = version;
+               hreq->lang = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
                hreq->tail = hreq->url = url;
                hreq->lentail = hreq->lenurl = strlen(url);
                *recordreq = hreq;
@@ -154,7 +156,9 @@ static int access_handler(
                                if (hreq->postform == NULL)
                                        afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
                                return MHD_YES;
-                       } else if (strcasestr(type, JSON_CONTENT) == NULL) {
+                       } else if (strcasestr(type, JSON_CONTENT) != NULL) {
+                               return MHD_YES;
+                        } else {
                                afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
                                return MHD_YES;
                        }
@@ -228,7 +232,7 @@ static void end_handler(void *cls, struct MHD_Connection *connection, void **rec
        hreq = *recordreq;
        if (hreq->upgrade)
                MHD_suspend_connection (connection);
-       afb_hreq_free(hreq);
+       afb_hreq_unref(hreq);
 }
 
 void run_micro_httpd(struct afb_hsrv *hsrv)
@@ -300,19 +304,26 @@ static struct hsrv_handler *new_handler(
 
 static int handle_alias(struct afb_hreq *hreq, void *data)
 {
+       int rc;
        struct hsrv_alias *da = data;
+       struct locale_search *search;
 
        if (hreq->method != afb_method_get) {
+               if (da->relax)
+                       return 0;
                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;
+       search = locale_root_search(da->root, hreq->lang, 0);
+       rc = afb_hreq_reply_locale_file_if_exist(hreq, search, &hreq->tail[1]);
+       locale_search_unref(search);
+       if (rc == 0) {
+               if (da->relax)
+                       return 0;
+               afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
        }
-
-       return afb_hreq_reply_file(hreq, da->dirfd, &hreq->tail[1]);
+       return 1;
 }
 
 int afb_hsrv_add_handler(
@@ -331,30 +342,39 @@ int afb_hsrv_add_handler(
        return 1;
 }
 
-int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority)
+int afb_hsrv_add_alias_root(struct afb_hsrv *hsrv, const char *prefix, struct locale_root *root, int priority, int relax)
 {
        struct hsrv_alias *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(hsrv, prefix, handle_alias, da, priority))
+               da->root = root;
+               da->relax = relax;
+               if (afb_hsrv_add_handler(hsrv, prefix, handle_alias, da, priority)) {
+                       locale_root_addref(root);
                        return 1;
+               }
                free(da);
        }
-       close(dirfd);
        return 0;
 }
 
+int afb_hsrv_add_alias(struct afb_hsrv *hsrv, const char *prefix, const char *alias, int priority, int relax)
+{
+       struct locale_root *root;
+       int rc;
+
+       root = locale_root_create_at(AT_FDCWD, alias);
+       if (root == NULL) {
+               /* TODO message */
+               rc = 0;
+       } else {
+               rc = afb_hsrv_add_alias_root(hsrv, prefix, root, priority, relax);
+               locale_root_unref(root);
+       }
+       return rc;
+}
+
 int afb_hsrv_set_cache_timeout(struct afb_hsrv *hsrv, int duration)
 {
        int rc;
@@ -386,14 +406,14 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
                MHD_OPTION_END);        /* options-end */
 
        if (httpd == NULL) {
-               fprintf(stderr, "Error: httpStart invalid httpd port: %d", (int)port);
+               ERROR("httpStart invalid httpd port: %d", (int)port);
                return 0;
        }
 
        info = MHD_get_daemon_info(httpd, MHD_DAEMON_INFO_EPOLL_FD_LINUX_ONLY);
        if (info == NULL) {
                MHD_stop_daemon(httpd);
-               fprintf(stderr, "Error: httpStart no pollfd");
+               ERROR("httpStart no pollfd");
                return 0;
        }
 
@@ -401,7 +421,7 @@ int afb_hsrv_start(struct afb_hsrv *hsrv, uint16_t port, unsigned int connection
        if (rc < 0) {
                MHD_stop_daemon(httpd);
                errno = -rc;
-               fprintf(stderr, "Error: connection to events for httpd failed");
+               ERROR("connection to events for httpd failed");
                return 0;
        }