Improves logging

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

diff --git a/src/afb-hsrv.c b/src/afb-hsrv.c
index d235648..91dff29 100644 (file)
--- a/src/afb-hsrv.c
+++ b/src/afb-hsrv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,8 +33,9 @@
 #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"
 
@@ -54,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 {
@@ -119,6 +118,7 @@ static int access_handler(
                method = get_method(methodstr);
                method &= afb_method_get | afb_method_post;
                if (method == afb_method_none) {
+                       WARNING("Unsupported HTTP operation %s", methodstr);
                        reply_error(connection, MHD_HTTP_BAD_REQUEST);
                        return MHD_YES;
                }
@@ -126,6 +126,7 @@ static int access_handler(
                /* create the request */
                hreq = calloc(1, sizeof *hreq);
                if (hreq == NULL) {
+                       ERROR("Can't allocate 'hreq'");
                        reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
                        return MHD_YES;
                }
@@ -141,6 +142,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;
@@ -153,10 +155,15 @@ static int access_handler(
                                hreq->method = afb_method_get;
                        } else if (strcasestr(type, FORM_CONTENT) != NULL) {
                                hreq->postform = MHD_create_post_processor (connection, 65500, postproc, hreq);
-                               if (hreq->postform == NULL)
+                               if (hreq->postform == NULL) {
+                                       ERROR("Can't create POST processor");
                                        afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+                               }
+                               return MHD_YES;
+                       } else if (strcasestr(type, JSON_CONTENT) != NULL) {
                                return MHD_YES;
-                       } else if (strcasestr(type, JSON_CONTENT) == NULL) {
+                        } else {
+                               WARNING("Unsupported media type %s", type);
                                afb_hreq_reply_error(hreq, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE);
                                return MHD_YES;
                        }
@@ -167,6 +174,7 @@ static int access_handler(
        if (*upload_data_size) {
                if (hreq->postform != NULL) {
                        if (!MHD_post_process (hreq->postform, upload_data, *upload_data_size)) {
+                               ERROR("error in POST processor");
                                afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
                                return MHD_YES;
                        }
@@ -185,6 +193,7 @@ static int access_handler(
                rc = MHD_destroy_post_processor(hreq->postform);
                hreq->postform = NULL;
                if (rc == MHD_NO) {
+                       ERROR("error detected in POST processing");
                        afb_hreq_reply_error(hreq, MHD_HTTP_BAD_REQUEST);
                        return MHD_YES;
                }
@@ -217,6 +226,7 @@ static int access_handler(
        }
 
        /* no handler */
+       WARNING("Unhandled request to %s", hreq->url);
        afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
        return MHD_YES;
 }
@@ -302,19 +312,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(
@@ -333,30 +350,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, int dirfd, const char *alias, int priority, int relax)
+{
+       struct locale_root *root;
+       int rc;
+
+       root = locale_root_create_at(dirfd, alias);
+       if (root == NULL) {
+               ERROR("can't connect to directory %s: %m", alias);
+               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;