X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=a4ccf6767de6528c91044ef1ca2effba5db767b3;hb=c44a48f295de04e4d0385b05d1afd93fac898d10;hp=506091cbb3ed7fc2989f06f35f3be7f5b31bc921;hpb=c95f72616f59a317f72c58c0e5664992504a48e5;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 506091cb..a4ccf676 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.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");
@@ -16,39 +16,89 @@
  */
 
 #define _GNU_SOURCE
-#include <microhttpd.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <assert.h>
-#include <poll.h>
+#include <errno.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
-#include "../include/local-def.h"
+#include <microhttpd.h>
+#include <json-c/json.h>
+
+#if defined(USE_MAGIC_MIME_TYPE)
+#include <magic.h>
+#endif
+
 #include "afb-method.h"
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
+#include "afb-msg-json.h"
+#include "afb-context.h"
 #include "afb-hreq.h"
+#include "afb-subcall.h"
+#include "session.h"
+#include "verbose.h"
+
+#define SIZE_RESPONSE_BUFFER   8192
 
 static char empty_string[] = "";
 
+static const char long_key_for_uuid[] = "x-afb-uuid";
+static const char short_key_for_uuid[] = "uuid";
+
+static const char long_key_for_token[] = "x-afb-token";
+static const char short_key_for_token[] = "token";
+
+static const char long_key_for_reqid[] = "x-afb-reqid";
+static const char short_key_for_reqid[] = "reqid";
+
+static char *cookie_name = NULL;
+static char *cookie_setter = NULL;
+static char *tmp_pattern = NULL;
+
+/*
+ * Structure for storing key/values read from POST requests
+ */
 struct hreq_data {
-	struct hreq_data *next;
-	char *key;
-	int file;
-	size_t length;
-	char *value;
+	struct hreq_data *next;	/* chain to next data */
+	char *key;		/* key name */
+	size_t length;		/* length of the value (used for appending) */
+	char *value;		/* the value (or original filename) */
+	char *path;		/* path of the file saved */
 };
 
-static struct afb_arg getarg(struct afb_hreq *hreq, const char *name);
-static void iterargs(struct afb_hreq *hreq, int (*iterator)(void *closure, struct afb_arg arg), void *closure);
-
-static const struct afb_req_itf afb_hreq_itf = {
-	.get = (void*)getarg,
-	.iterate = (void*)iterargs
+static struct json_object *req_json(struct afb_hreq *hreq);
+static struct afb_arg req_get(struct afb_hreq *hreq, const char *name);
+static void req_fail(struct afb_hreq *hreq, const char *status, const char *info);
+static void req_success(struct afb_hreq *hreq, json_object *obj, const char *info);
+static const char *req_raw(struct afb_hreq *hreq, size_t *size);
+static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size);
+static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event);
+static void req_subcall(struct afb_hreq *hreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure);
+
+const struct afb_req_itf afb_hreq_req_itf = {
+	.json = (void*)req_json,
+	.get = (void*)req_get,
+	.success = (void*)req_success,
+	.fail = (void*)req_fail,
+	.raw = (void*)req_raw,
+	.send = (void*)req_send,
+	.context_get = (void*)afb_context_get,
+	.context_set = (void*)afb_context_set,
+	.addref = (void*)afb_hreq_addref,
+	.unref = (void*)afb_hreq_unref,
+	.session_close = (void*)afb_context_close,
+	.session_set_LOA = (void*)afb_context_change_loa,
+	.subscribe = (void*)req_subscribe_unsubscribe_error,
+	.unsubscribe = (void*)req_subscribe_unsubscribe_error,
+	.subcall = (void*)req_subcall
 };
 
 static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create)
 {
 	struct hreq_data *data = hreq->data;
-	if (key == NULL)
-		key = empty_string;
 	while (data != NULL) {
 		if (!strcasecmp(data->key, key))
 			return data;
@@ -107,8 +157,178 @@ static int validsubpath(const char *subpath)
 	return 1;
 }
 
+static void afb_hreq_reply_v(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, va_list args)
+{
+	char *cookie;
+	const char *k, *v;
+
+	if (hreq->replied != 0)
+		return;
+
+	k = va_arg(args, const char *);
+	while (k != NULL) {
+		v = va_arg(args, const char *);
+		MHD_add_response_header(response, k, v);
+		k = va_arg(args, const char *);
+	}
+	v = afb_context_sent_uuid(&hreq->context);
+	if (v != NULL && asprintf(&cookie, cookie_setter, v) > 0) {
+		MHD_add_response_header(response, MHD_HTTP_HEADER_SET_COOKIE, cookie);
+		free(cookie);
+	}
+	MHD_queue_response(hreq->connection, status, response);
+	MHD_destroy_response(response);
+
+	hreq->replied = 1;
+	if (hreq->suspended != 0) {
+		extern void run_micro_httpd(struct afb_hsrv *hsrv);
+		MHD_resume_connection (hreq->connection);
+		hreq->suspended = 0;
+		run_micro_httpd(hreq->hsrv);
+	}
+}
+
+void afb_hreq_reply(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, ...)
+{
+	va_list args;
+	va_start(args, response);
+	afb_hreq_reply_v(hreq, status, response, args);
+	va_end(args);
+}
+
+void afb_hreq_reply_empty(struct afb_hreq *hreq, unsigned status, ...)
+{
+	va_list args;
+	va_start(args, status);
+	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT), args);
+	va_end(args);
+}
+
+void afb_hreq_reply_static(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...)
+{
+	va_list args;
+	va_start(args, buffer);
+	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, (char*)buffer, MHD_RESPMEM_PERSISTENT), args);
+	va_end(args);
+}
+
+void afb_hreq_reply_copy(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...)
+{
+	va_list args;
+	va_start(args, buffer);
+	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, (char*)buffer, MHD_RESPMEM_MUST_COPY), args);
+	va_end(args);
+}
+
+void afb_hreq_reply_free(struct afb_hreq *hreq, unsigned status, size_t size, char *buffer, ...)
+{
+	va_list args;
+	va_start(args, buffer);
+	afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, buffer, MHD_RESPMEM_MUST_FREE), args);
+	va_end(args);
+}
+
+#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 */
+		INFO("Loading mimetype default magic database");
+		result = magic_open(MAGIC_MIME_TYPE);
+		if (result == NULL) {
+			ERROR("unable to initialize magic library");
+		}
+		/* Warning: should not use NULL for DB
+				[libmagic bug wont pass efence check] */
+		else if (magic_load(result, MAGIC_DB) != 0) {
+			ERROR("cannot load magic database: %s", 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
+
+static const char *mimetype_fd_name(int fd, const char *filename)
+{
+	const char *result = NULL;
+
+#if defined(INFER_EXTENSION)
+	const char *extension = strrchr(filename, '.');
+	if (extension) {
+		static const char *const known[][2] = {
+			{ ".js",   "text/javascript" },
+			{ ".html", "text/html" },
+			{ ".css",  "text/css" },
+			{ NULL, NULL }
+		};
+		int i = 0;
+		while (known[i][0]) {
+			if (!strcasecmp(extension, known[i][0])) {
+				result = known[i][1];
+				break;
+			}
+			i++;
+		}
+	}
+#endif
+#if defined(USE_MAGIC_MIME_TYPE)
+	if (result == NULL)
+		result = magic_mimetype_fd(fd);
+#endif
+	return result;
+}
+
+void afb_hreq_addref(struct afb_hreq *hreq)
+{
+	hreq->refcount++;
+}
+
+void afb_hreq_unref(struct afb_hreq *hreq)
+{
+	struct hreq_data *data;
+
+	if (hreq == NULL || --hreq->refcount)
+		return;
+
+	if (hreq->postform != NULL)
+		MHD_destroy_post_processor(hreq->postform);
+	for (data = hreq->data; data; data = hreq->data) {
+		hreq->data = data->next;
+		if (data->path) {
+			unlink(data->path);
+			free(data->path);
+		}
+		free(data->key);
+		free(data->value);
+		free(data);
+	}
+	afb_context_disconnect(&hreq->context);
+	json_object_put(hreq->json);
+	free(hreq);
+}
+
 /*
- * Removes the 'prefix' of 'length' frome the tail of 'hreq'
+ * Removes the 'prefix' of 'length' from the tail of 'hreq'
  * if and only if the prefix exists and is terminated by a leading
  * slash
  */
@@ -136,20 +356,23 @@ int afb_hreq_valid_tail(struct afb_hreq *hreq)
 
 void afb_hreq_reply_error(struct afb_hreq *hreq, unsigned int status)
 {
-	char *buffer;
-	int length;
-	struct MHD_Response *response;
+	afb_hreq_reply_empty(hreq, status, NULL);
+}
 
-	length = asprintf(&buffer, "<html><body>error %u</body></html>", status);
-	if (length > 0)
-		response = MHD_create_response_from_buffer((unsigned)length, buffer, MHD_RESPMEM_MUST_FREE);
-	else {
-		buffer = "<html><body>error</body></html>";
-		response = MHD_create_response_from_buffer(strlen(buffer), buffer, MHD_RESPMEM_PERSISTENT);
-	}
-	if (!MHD_queue_response(hreq->connection, status, response))
-		fprintf(stderr, "Failed to reply error code %u", status);
-	MHD_destroy_response(response);
+int afb_hreq_redirect_to_ending_slash_if_needed(struct afb_hreq *hreq)
+{
+	char *tourl;
+
+	if (hreq->url[hreq->lenurl - 1] == '/')
+		return 0;
+
+	/* the redirect is needed for reliability of relative path */
+	tourl = alloca(hreq->lenurl + 2);
+	memcpy(tourl, hreq->url, hreq->lenurl);
+	tourl[hreq->lenurl] = '/';
+	tourl[hreq->lenurl + 1] = 0;
+	afb_hreq_redirect_to(hreq, tourl, 1);
+	return 1;
 }
 
 int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *filename)
@@ -158,17 +381,26 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 	int fd;
 	unsigned int status;
 	struct stat st;
-	char etag[1 + 2 * sizeof(int)];
+	char etag[1 + 2 * 8];
 	const char *inm;
 	struct MHD_Response *response;
+	const char *mimetype;
 
 	/* Opens the file or directory */
-	fd = openat(dirfd, filename, O_RDONLY);
-	if (fd < 0) {
-		if (errno == ENOENT)
-			return 0;
-		afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
-		return 1;
+	if (filename[0]) {
+		fd = openat(dirfd, filename, O_RDONLY);
+		if (fd < 0) {
+			if (errno == ENOENT)
+				return 0;
+			afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN);
+			return 1;
+		}
+	} else {
+		fd = dup(dirfd);
+		if (fd < 0) {
+			afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+			return 1;
+		}
 	}
 
 	/* Retrieves file's status */
@@ -180,15 +412,17 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 
 	/* serve directory */
 	if (S_ISDIR(st.st_mode)) {
-		if (hreq->url[hreq->lenurl - 1] != '/') {
-			/* the redirect is needed for reliability of relative path */
-			char *tourl = alloca(hreq->lenurl + 2);
-			memcpy(tourl, hreq->url, hreq->lenurl);
-			tourl[hreq->lenurl] = '/';
-			tourl[hreq->lenurl + 1] = 0;
-			rc = afb_hreq_redirect_to(hreq, tourl);
-		} else {
-			rc = afb_hreq_reply_file_if_exist(hreq, fd, "index.html");
+		rc = afb_hreq_redirect_to_ending_slash_if_needed(hreq);
+		if (rc == 0) {
+			static const char *indexes[] = { "index.html", NULL };
+			int i = 0;
+			while (indexes[i] != NULL) {
+				if (faccessat(fd, indexes[i], R_OK, 0) == 0) {
+					rc = afb_hreq_reply_file_if_exist(hreq, fd, indexes[i]);
+					break;
+				}
+				i++;
+			}
 		}
 		close(fd);
 		return rc;
@@ -216,8 +450,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)
-			fprintf(stderr, "Not Modified: [%s]\n", filename);
+		DEBUG("Not Modified: [%s]", filename);
 		response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT);
 		status = MHD_HTTP_NOT_MODIFIED;
 	} else {
@@ -232,21 +465,17 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f
 		response = MHD_create_response_from_fd((size_t) st.st_size, fd);
 		status = MHD_HTTP_OK;
 
-#if defined(USE_MAGIC_MIME_TYPE)
 		/* set the type */
-		if (hreq->session->magic) {
-			const char *mimetype = magic_descriptor(hreq->session->magic, fd);
-			if (mimetype != NULL)
-				MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
-		}
-#endif
+		mimetype = mimetype_fd_name(fd, filename);
+		if (mimetype != NULL)
+			MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype);
 	}
 
 	/* fills the value and send */
-	MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, hreq->session->cacheTimeout);
-	MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etag);
-	MHD_queue_response(hreq->connection, status, response);
-	MHD_destroy_response(response);
+	afb_hreq_reply(hreq, status, response,
+			MHD_HTTP_HEADER_CACHE_CONTROL, hreq->cacheTimeout,
+			MHD_HTTP_HEADER_ETAG, etag,
+			NULL);
 	return 1;
 }
 
@@ -258,19 +487,105 @@ int afb_hreq_reply_file(struct afb_hreq *hreq, int dirfd, const char *filename)
 	return 1;
 }
 
-int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url)
+struct _mkq_ {
+	int count;
+	size_t length;
+	size_t alloc;
+	char *text;
+};
+
+static void _mkq_add_(struct _mkq_ *mkq, char value)
 {
-	struct MHD_Response *response;
+	char *text = mkq->text;
+	if (text != NULL) {
+		if (mkq->length == mkq->alloc) {
+			mkq->alloc += 100;
+			text = realloc(text, mkq->alloc);
+			if (text == NULL) {
+				free(mkq->text);
+				mkq->text = NULL;
+				return;
+			}
+			mkq->text = text;
+		}
+		text[mkq->length++] = value;
+	}
+}
 
-	response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT);
-	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)
-		fprintf(stderr, "redirect from [%s] to [%s]\n", hreq->url, url);
+static void _mkq_add_hex_(struct _mkq_ *mkq, char value)
+{
+	_mkq_add_(mkq, (char)(value < 10 ? value + '0' : value + 'A' - 10));
+}
+
+static void _mkq_add_esc_(struct _mkq_ *mkq, char value)
+{
+	_mkq_add_(mkq, '%');
+	_mkq_add_hex_(mkq, (char)((value >> 4) & 15));
+	_mkq_add_hex_(mkq, (char)(value & 15));
+}
+
+static void _mkq_add_char_(struct _mkq_ *mkq, char value)
+{
+	if (value <= ' ' || value >= 127)
+		_mkq_add_esc_(mkq, value);
+	else
+		switch(value) {
+		case '=':
+		case '&':
+		case '%':
+			_mkq_add_esc_(mkq, value);
+			break;
+		default:
+			_mkq_add_(mkq, value);
+		}
+}
+
+static void _mkq_append_(struct _mkq_ *mkq, const char *value)
+{
+	while(*value)
+		_mkq_add_char_(mkq, *value++);
+}
+
+static int _mkquery_(struct _mkq_ *mkq, enum MHD_ValueKind kind, const char *key, const char *value)
+{
+	_mkq_add_(mkq, mkq->count++ ? '&' : '?');
+	_mkq_append_(mkq, key);
+	if (value != NULL) {
+		_mkq_add_(mkq, '=');
+		_mkq_append_(mkq, value);
+	}
 	return 1;
 }
 
+static char *url_with_query(struct afb_hreq *hreq, const char *url)
+{
+	struct _mkq_ mkq;
+
+	mkq.count = 0;
+	mkq.length = strlen(url);
+	mkq.alloc = mkq.length + 1000;
+	mkq.text = malloc(mkq.alloc);
+	if (mkq.text != NULL) {
+		strcpy(mkq.text, url);
+		MHD_get_connection_values(hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_mkquery_, &mkq);
+		_mkq_add_(&mkq, 0);
+	}
+	return mkq.text;
+}
+
+void afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url, int add_query_part)
+{
+	const char *to;
+	char *wqp;
+
+	wqp = add_query_part ? url_with_query(hreq, url) : NULL;
+	to = wqp ? : url;
+	afb_hreq_reply_static(hreq, MHD_HTTP_MOVED_PERMANENTLY, 0, NULL,
+			MHD_HTTP_HEADER_LOCATION, to, NULL);
+	DEBUG("redirect from [%s] to [%s]", hreq->url, url);
+	free(wqp);
+}
+
 const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name)
 {
 	return MHD_lookup_connection_value(hreq->connection, MHD_COOKIE_KIND, name);
@@ -287,23 +602,11 @@ const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name)
 	return MHD_lookup_connection_value(hreq->connection, MHD_HEADER_KIND, name);
 }
 
-void afb_hreq_post_end(struct afb_hreq *hreq)
-{
-	struct hreq_data *data = hreq->data;
-	while(data) {
-		if (data->file > 0) {
-			close(data->file);
-			data->file = -1;
-		}
-		data = data->next;
-	}
-}
-
 int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data, size_t size)
 {
 	void *p;
 	struct hreq_data *hdat = get_data(hreq, key, 1);
-	if (hdat->file) {
+	if (hdat->path != NULL) {
 		return 0;
 	}
 	p = realloc(hdat->value, hdat->length + size + 1);
@@ -317,132 +620,252 @@ int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data,
 	return 1;
 }
 
-int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *file, const char *data, size_t size)
+int afb_hreq_init_download_path(const char *directory)
 {
-	struct hreq_data *hdat = get_data(hreq, key, 1);
+	struct stat st;
+	size_t n;
+	char *p;
 
-	/* continuation with reopening */
-	if (hdat->file < 0) {
-		hdat->file = open(hdat->value, O_WRONLY|O_APPEND);
-		if (hdat->file == 0) {
-			hdat->file = dup(0);
-			close(0);
-		}
-		if (hdat->file <= 0)
-			return 0;
+	if (access(directory, R_OK|W_OK)) {
+		/* no read/write access */
+		return -1;
 	}
-	if (hdat->file > 0) {
-		write(hdat->file, data, size);
-		return 1;
+	if (stat(directory, &st)) {
+		/* can't get info */
+		return -1;
 	}
-
-	/* creation */
-	/* TODO */
+	if (!S_ISDIR(st.st_mode)) {
+		/* not a directory */
+		errno = ENOTDIR;
+		return -1;
+	}
+	n = strlen(directory);
+	while(n > 1 && directory[n-1] == '/') n--;
+	p = malloc(n + 8);
+	if (p == NULL) {
+		/* can't allocate memory */
+		errno = ENOMEM;
+		return -1;
+	}
+	memcpy(p, directory, n);
+	p[n++] = '/';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n++] = 'X';
+	p[n] = 0;
+	free(tmp_pattern);
+	tmp_pattern = p;
 	return 0;
-	
 }
 
-int afb_hreq_is_argument_a_file(struct afb_hreq *hreq, const char *key)
+static int opentempfile(char **path)
 {
-	struct hreq_data *hdat = get_data(hreq, key, 0);
-	return hdat != NULL && hdat->file != 0;
-}
-
-
-struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
-{
-	return (struct afb_req){ .itf = &afb_hreq_itf, .data = hreq };
+	int fd;
+	char *fname;
+
+	fname = strdup(tmp_pattern ? : "XXXXXX"); /* TODO improve the path */
+	if (fname == NULL)
+		return -1;
+
+	fd = mkostemp(fname, O_CLOEXEC|O_WRONLY);
+	if (fd < 0)
+		free(fname);
+	else
+		*path = fname;
+	return fd;
 }
 
-struct iterator_data
+int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *file, const char *data, size_t size)
 {
-	struct afb_hreq *hreq;
-	int (*iterator)(void *closure, const char *key, const char *value, int isfile);
-	void *closure;
-};
+	int fd;
+	ssize_t sz;
+	struct hreq_data *hdat = get_data(hreq, key, 1);
 
-static int itargs(struct iterator_data *id, enum MHD_ValueKind kind, const char *key, const char *value)
-{
-	if (get_data(id->hreq, key, 0))
-		return 1;
-	return id->iterator(id->closure, key, value, 0);
+	if (hdat->value == NULL) {
+		hdat->value = strdup(file);
+		if (hdat->value == NULL)
+			return 0;
+		fd = opentempfile(&hdat->path);
+	} else if (strcmp(hdat->value, file) || hdat->path == NULL) {
+		return 0;
+	} else {
+		fd = open(hdat->path, O_WRONLY|O_APPEND);
+	}
+	if (fd < 0)
+		return 0;
+	while (size) {
+		sz = write(fd, data, size);
+		if (sz >= 0) {
+			hdat->length += (size_t)sz;
+			size -= (size_t)sz;
+			data += sz;
+		} else if (errno != EINTR)
+			break;
+	}
+	close(fd);
+	return !size;
 }
 
-void afb_hreq_iterate_arguments(struct afb_hreq *hreq, int (*iterator)(void *closure, const char *key, const char *value, int isfile), void *closure)
+struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
 {
-	struct iterator_data id = { .hreq = hreq, .iterator = iterator, .closure = closure };
-	struct hreq_data *data = hreq->data;
-	while (data) {
-		if (!iterator(closure, data->key, data->value, !!data->file))
-			return;
-		data = data->next;
-	}
-	MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)itargs, &id);
+	return (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq };
 }
 
-static struct afb_arg getarg(struct afb_hreq *hreq, const char *name)
+static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
 {
+	const char *value;
 	struct hreq_data *hdat = get_data(hreq, name, 0);
 	if (hdat)
 		return (struct afb_arg){
 			.name = hdat->key,
 			.value = hdat->value,
-			.size = hdat->length,
-			.is_file = (hdat->file != 0)
+			.path = hdat->path
 		};
-		
+
+	value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name);
 	return (struct afb_arg){
-		.name = name,
-		.value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name),
-		.size = 0,
-		.is_file = 0
+		.name = value == NULL ? NULL : name,
+		.value = value,
+		.path = NULL
 	};
 }
 
-struct iterdata
+static int _iterargs_(struct json_object *obj, enum MHD_ValueKind kind, const char *key, const char *value)
 {
-	struct afb_hreq *hreq;
-	int (*iterator)(void *closure, struct afb_arg arg);
-	void *closure;
-};
+	json_object_object_add(obj, key, value ? json_object_new_string(value) : NULL);
+	return 1;
+}
 
-static int _iterargs_(struct iterdata *id, enum MHD_ValueKind kind, const char *key, const char *value)
+static struct json_object *req_json(struct afb_hreq *hreq)
 {
-	if (get_data(id->hreq, key, 0))
-		return 1;
-	return id->iterator(id->closure, (struct afb_arg){
-		.name = key,
-		.value = value,
-		.size = 0,
-		.is_file = 0
-	});
+	struct hreq_data *hdat;
+	struct json_object *obj, *val;
+
+	obj = hreq->json;
+	if (obj == NULL) {
+		hreq->json = obj = json_object_new_object();
+		if (obj == NULL) {
+		} else {
+			MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_iterargs_, obj);
+			for (hdat = hreq->data ; hdat ; hdat = hdat->next) {
+				if (hdat->path == NULL)
+					val = hdat->value ? json_object_new_string(hdat->value) : NULL;
+				else {
+					val = json_object_new_object();
+					if (val == NULL) {
+					} else {
+						json_object_object_add(val, "file", json_object_new_string(hdat->value));
+						json_object_object_add(val, "path", json_object_new_string(hdat->path));
+					}
+				}
+				json_object_object_add(obj, hdat->key, val);
+			}
+		}
+	}
+	return obj;
 }
 
-static void iterargs(struct afb_hreq *hreq, int (*iterator)(void *closure, struct afb_arg arg), void *closure)
+static const char *req_raw(struct afb_hreq *hreq, size_t *size)
 {
-	struct iterdata id = { .hreq = hreq, .iterator = iterator, .closure = closure };
-	struct hreq_data *hdat = hreq->data;
-	while (hdat) {
-		if (!iterator(closure, (struct afb_arg){
-			.name = hdat->key,
-			.value = hdat->value,
-			.size = hdat->length,
-			.is_file = (hdat->file != 0)}))
-			return;
-		hdat = hdat->next;
-	}
-	MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_iterargs_, &id);
+	const char *result = json_object_get_string(req_json(hreq));
+	*size = result ? strlen(result) : 0;
+	return result;
 }
 
-void afb_hreq_drop_data(struct afb_hreq *hreq)
+static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size)
 {
-	struct hreq_data *data = hreq->data;
-	while (data) {
-		hreq->data = data->next;
-		free(data->key);
-		free(data->value);
-		free(data);
-		data = hreq->data;
-	}
+	afb_hreq_reply_copy(hreq, MHD_HTTP_OK, size, buffer, NULL);
 }
 
+static ssize_t send_json_cb(json_object *obj, uint64_t pos, char *buf, size_t max)
+{
+	ssize_t len = stpncpy(buf, json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN)+pos, max) - buf;
+	return len ? : (ssize_t)MHD_CONTENT_READER_END_OF_STREAM;
+}
+
+static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp)
+{
+	struct json_object *reply;
+	const char *reqid;
+	struct MHD_Response *response;
+
+	reqid = afb_hreq_get_argument(hreq, long_key_for_reqid);
+	if (reqid == NULL)
+		reqid = afb_hreq_get_argument(hreq, short_key_for_reqid);
+
+	reply = afb_msg_json_reply(status, info, resp, &hreq->context, reqid);
+
+	response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string_ext(reply, JSON_C_TO_STRING_PLAIN)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
+	afb_hreq_reply(hreq, retcode, response, NULL);
+}
+
+static void req_fail(struct afb_hreq *hreq, const char *status, const char *info)
+{
+	req_reply(hreq, MHD_HTTP_OK, status, info, NULL);
+}
+
+static void req_success(struct afb_hreq *hreq, json_object *obj, const char *info)
+{
+	req_reply(hreq, MHD_HTTP_OK, "success", info, obj);
+}
+
+static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event)
+{
+	errno = EINVAL;
+	return -1;
+}
+
+static void req_subcall(struct afb_hreq *hreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
+{
+	afb_subcall(&hreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq });
+}
+
+int afb_hreq_init_context(struct afb_hreq *hreq)
+{
+	const char *uuid;
+	const char *token;
+
+	if (hreq->context.session != NULL)
+		return 0;
+
+	uuid = afb_hreq_get_header(hreq, long_key_for_uuid);
+	if (uuid == NULL)
+		uuid = afb_hreq_get_argument(hreq, long_key_for_uuid);
+	if (uuid == NULL)
+		uuid = afb_hreq_get_cookie(hreq, cookie_name);
+	if (uuid == NULL)
+		uuid = afb_hreq_get_argument(hreq, short_key_for_uuid);
+
+	token = afb_hreq_get_header(hreq, long_key_for_token);
+	if (token == NULL)
+		token = afb_hreq_get_argument(hreq, long_key_for_token);
+	if (token == NULL)
+		token = afb_hreq_get_argument(hreq, short_key_for_token);
+
+	return afb_context_connect(&hreq->context, uuid, token);
+}
+
+int afb_hreq_init_cookie(int port, const char *path, int maxage)
+{
+	int rc;
+
+	free(cookie_name);
+	free(cookie_setter);
+	cookie_name = NULL;
+	cookie_setter = NULL;
+
+	path = path ? : "/";
+	rc = asprintf(&cookie_name, "%s-%d", long_key_for_uuid, port);
+	if (rc < 0)
+		return 0;
+	rc = asprintf(&cookie_setter, "%s=%%s; Path=%s; Max-Age=%d; HttpOnly",
+			cookie_name, path, maxage);
+	if (rc < 0)
+		return 0;
+	return 1;
+}
+
+