/*
- * 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");
#include "afb-method.h"
#include "afb-context.h"
+#include "afb-xreq.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"
-
-
#define JSON_CONTENT "application/json"
#define FORM_CONTENT MHD_HTTP_POST_ENCODING_MULTIPART_FORMDATA
};
struct hsrv_alias {
- const char *alias;
- const char *directory;
- size_t lendir;
- int dirfd;
+ struct locale_root *root;
+ int relax;
};
struct afb_hsrv {
char *cache_to;
};
-static int global_reqids = 0;
-
static void reply_error(struct MHD_Connection *connection, unsigned int status)
{
struct MHD_Response *response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
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;
}
/* create the request */
- hreq = calloc(1, sizeof *hreq);
+ hreq = afb_hreq_create();
if (hreq == NULL) {
+ ERROR("Can't allocate 'hreq'");
reply_error(connection, MHD_HTTP_INTERNAL_SERVER_ERROR);
return MHD_YES;
}
/* init the request */
- hreq->refcount = 1;
hreq->hsrv = hsrv;
hreq->cacheTimeout = hsrv->cache_to;
- hreq->reqid = ++global_reqids;
- hreq->scanned = 0;
- hreq->suspended = 0;
- hreq->replied = 0;
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;
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;
}
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;
}
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;
}
}
/* no handler */
+ WARNING("Unhandled request to %s", hreq->url);
afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND);
return MHD_YES;
}
struct afb_hreq *hreq;
hreq = *recordreq;
- if (hreq->upgrade)
- MHD_suspend_connection (connection);
- afb_hreq_unref(hreq);
+ if (hreq) {
+ afb_hreq_unref(hreq);
+ }
}
void run_micro_httpd(struct afb_hsrv *hsrv)
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(
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;
const union MHD_DaemonInfo *info;
httpd = MHD_start_daemon(
- MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
+ MHD_USE_EPOLL | MHD_ALLOW_UPGRADE | MHD_USE_TCP_FASTOPEN | MHD_USE_DEBUG | MHD_USE_SUSPEND_RESUME,
port, /* port */
new_client_handler, NULL, /* Tcp Accept call back + extra attribute */
access_handler, hsrv, /* Http Request Call back + extra attribute */
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;
}
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;
}