X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=e6e47d6bfb2aad29f76dd638bea0acb084747266;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=1a70fe7a951e7829173515019fd72441757c8784;hpb=5e7d680c173ddbb26db4e49f7738f82e89299362;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index 1a70fe7a..e6e47d6b 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,335 +16,894 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <stdarg.h>
 
 #include <json-c/json.h>
-#include <afb/afb-binding.h>
-
+#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE)
+#define JSON_C_TO_STRING_NOSLASHESCAPE 0
+#endif
+
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
+#include <afb/afb-binding-v3.h>
+#include <afb/afb-req-x2.h>
+
+#include "afb-api.h"
+#include "afb-apiset.h"
+#include "afb-auth.h"
+#include "afb-calls.h"
 #include "afb-context.h"
-#include "afb-xreq.h"
 #include "afb-evt.h"
+#include "afb-cred.h"
+#include "afb-hook.h"
 #include "afb-msg-json.h"
-#include "afb-subcall.h"
+#include "afb-xreq.h"
+#include "afb-error-text.h"
+
 #include "jobs.h"
 #include "verbose.h"
 
+/******************************************************************************/
 
-static struct json_object *xreq_json_cb(void *closure);
-static struct afb_arg xreq_get_cb(void *closure, const char *name);
+static void xreq_finalize(struct afb_xreq *xreq)
+{
+	if (!xreq->replied)
+		afb_xreq_reply(xreq, NULL, afb_error_text_not_replied, NULL);
+#if WITH_AFB_HOOK
+	if (xreq->hookflags)
+		afb_hook_xreq_end(xreq);
+#endif
+	if (xreq->caller)
+		afb_xreq_unhooked_unref(xreq->caller);
+	xreq->queryitf->unref(xreq);
+}
 
-static void xreq_success_cb(void *closure, struct json_object *obj, const char *info);
-static void xreq_fail_cb(void *closure, const char *status, const char *info);
+inline void afb_xreq_unhooked_addref(struct afb_xreq *xreq)
+{
+	__atomic_add_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED);
+}
 
-static const char *xreq_raw_cb(void *closure, size_t *size);
-static void xreq_send_cb(void *closure, const char *buffer, size_t size);
+inline void afb_xreq_unhooked_unref(struct afb_xreq *xreq)
+{
+	if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED))
+		xreq_finalize(xreq);
+}
 
-static void *xreq_context_get_cb(void *closure);
-static void xreq_context_set_cb(void *closure, void *value, void (*free_value)(void*));
+/******************************************************************************/
 
-static void xreq_addref_cb(void *closure);
-static void xreq_unref_cb(void *closure);
+struct json_object *afb_xreq_unhooked_json(struct afb_xreq *xreq)
+{
+	if (!xreq->json && xreq->queryitf->json)
+		xreq->json = xreq->queryitf->json(xreq);
+	return xreq->json;
+}
 
-static void xreq_session_close_cb(void *closure);
-static int xreq_session_set_LOA_cb(void *closure, unsigned level);
+static struct json_object *xreq_json_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_xreq_unhooked_json(xreq);
+}
 
-static int xreq_subscribe_cb(void *closure, struct afb_event event);
-static int xreq_unsubscribe_cb(void *closure, struct afb_event event);
+static struct afb_arg xreq_get_cb(struct afb_req_x2 *closure, const char *name)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	struct afb_arg arg;
+	struct json_object *object, *value;
+
+	if (xreq->queryitf->get)
+		arg = xreq->queryitf->get(xreq, name);
+	else {
+		object = xreq_json_cb(closure);
+		if (json_object_object_get_ex(object, name, &value)) {
+			arg.name = name;
+			arg.value = json_object_get_string(value);
+		} else {
+			arg.name = NULL;
+			arg.value = NULL;
+		}
+		arg.path = NULL;
+	}
+	return arg;
+}
+
+static void xreq_reply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *info)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+
+	if (xreq->replied) {
+		ERROR("reply called more than one time!!");
+		json_object_put(obj);
+	} else {
+		xreq->replied = 1;
+		xreq->queryitf->reply(xreq, obj, error, info);
+	}
+}
+
+static void xreq_vreply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *fmt, va_list args)
+{
+	char *info;
+	if (fmt == NULL || vasprintf(&info, fmt, args) < 0)
+		info = NULL;
+	xreq_reply_cb(closure, obj, error, info);
+	free(info);
+}
+
+static void xreq_legacy_success_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *info)
+{
+	xreq_reply_cb(closure, obj, NULL, info);
+}
+
+static void xreq_legacy_fail_cb(struct afb_req_x2 *closure, const char *status, const char *info)
+{
+	xreq_reply_cb(closure, NULL, status, info);
+}
+
+static void xreq_legacy_vsuccess_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *fmt, va_list args)
+{
+	xreq_vreply_cb(closure, obj, NULL, fmt, args);
+}
+
+static void xreq_legacy_vfail_cb(struct afb_req_x2 *closure, const char *status, const char *fmt, va_list args)
+{
+	xreq_vreply_cb(closure, NULL, status, fmt, args);
+}
+
+static void *xreq_legacy_context_get_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_context_get(&xreq->context);
+}
+
+static void xreq_legacy_context_set_cb(struct afb_req_x2 *closure, void *value, void (*free_value)(void*))
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_context_set(&xreq->context, value, free_value);
+}
+
+static struct afb_req_x2 *xreq_addref_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_xreq_unhooked_addref(xreq);
+	return closure;
+}
+
+static void xreq_unref_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_xreq_unhooked_unref(xreq);
+}
+
+static void xreq_session_close_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_context_close(&xreq->context);
+}
+
+static int xreq_session_set_LOA_cb(struct afb_req_x2 *closure, unsigned level)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_context_change_loa(&xreq->context, level);
+}
+
+static int xreq_subscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_xreq_subscribe(xreq, event);
+}
+
+static int xreq_legacy_subscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event)
+{
+	return xreq_subscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event));
+}
+
+int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
+{
+	if (xreq->replied) {
+		ERROR("request replied, subscription impossible");
+		errno = EINVAL;
+	} else {
+		if (xreq->queryitf->subscribe)
+			return xreq->queryitf->subscribe(xreq, event);
+		ERROR("no event listener, subscription impossible");
+		errno = ENOTSUP;
+	}
+	return -1;
+}
+
+static int xreq_unsubscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_xreq_unsubscribe(xreq, event);
+}
+
+static int xreq_legacy_unsubscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event)
+{
+	return xreq_unsubscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event));
+}
+
+int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
+{
+	if (xreq->replied) {
+		ERROR("request replied, unsubscription impossible");
+		errno = EINVAL;
+	} else {
+		if (xreq->queryitf->unsubscribe)
+			return xreq->queryitf->unsubscribe(xreq, event);
+		ERROR("no event listener, unsubscription impossible");
+		errno = ENOTSUP;
+	}
+	return -1;
+}
+
+static void xreq_legacy_subcall_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_legacy_subcall_v1(xreq, api, verb, args, callback, closure);
+}
+
+static void xreq_legacy_subcall_req_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x1), void *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_legacy_subcall_v2(xreq, api, verb, args, callback, closure);
+}
+
+static void xreq_legacy_subcall_request_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x2*), void *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_legacy_subcall_v3(xreq, api, verb, args, callback, closure);
+}
+
+
+static int xreq_legacy_subcallsync_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_legacy_subcall_sync(xreq, api, verb, args, result);
+}
+
+static void xreq_vverbose_cb(struct afb_req_x2 *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+	char *p;
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+
+	if (!fmt || vasprintf(&p, fmt, args) < 0)
+		vverbose(level, file, line, func, fmt, args);
+	else {
+		verbose(level, file, line, func, "[REQ/API %s] %s", xreq->request.called_api, p);
+		free(p);
+	}
+}
+
+static struct afb_stored_req *xreq_legacy_store_cb(struct afb_req_x2 *closure)
+{
+	xreq_addref_cb(closure);
+	return (struct afb_stored_req*)closure;
+}
+
+static int xreq_has_permission_cb(struct afb_req_x2 *closure, const char *permission)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_context_has_permission(&xreq->context, permission);
+}
+
+static char *xreq_get_application_id_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	struct afb_cred *cred = xreq->context.credentials;
+	return cred && cred->id ? strdup(cred->id) : NULL;
+}
+
+static void *xreq_context_make_cb(struct afb_req_x2 *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_context_make(&xreq->context, replace, create_value, free_value, create_closure);
+}
+
+static int xreq_get_uid_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	struct afb_cred *cred = xreq->context.credentials;
+	return cred && cred->id ? (int)cred->uid : -1;
+}
+
+static struct json_object *xreq_get_client_info_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	struct afb_cred *cred = xreq->context.credentials;
+	struct json_object *r = json_object_new_object();
+	if (cred && cred->id) {
+		json_object_object_add(r, "uid", json_object_new_int(cred->uid));
+		json_object_object_add(r, "gid", json_object_new_int(cred->gid));
+		json_object_object_add(r, "pid", json_object_new_int(cred->pid));
+		json_object_object_add(r, "user", json_object_new_string(cred->user));
+		json_object_object_add(r, "label", json_object_new_string(cred->label));
+		json_object_object_add(r, "id", json_object_new_string(cred->id));
+	}
+	if (xreq->context.session) {
+		json_object_object_add(r, "uuid", json_object_new_string(afb_context_uuid(&xreq->context)?:""));
+		json_object_object_add(r, "LOA", json_object_new_int(afb_context_get_loa(&xreq->context)));
+	}
+	return r;
+}
 
 static void xreq_subcall_cb(
-		void *closure,
-		const char *api,
-		const char *verb,
-		struct json_object *args,
-		void (*callback)(void*, int, struct json_object*),
-		void *cb_closure);
-
-const struct afb_req_itf xreq_itf = {
+				struct afb_req_x2 *req,
+				const char *api,
+				const char *verb,
+				struct json_object *args,
+				int flags,
+				void (*callback)(void *closure, struct json_object *object, const char *error, const char * info, struct afb_req_x2 *req),
+				void *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	afb_calls_subcall(xreq, api, verb, args, flags, callback, closure);
+}
+
+static int xreq_subcallsync_cb(
+				struct afb_req_x2 *req,
+				const char *api,
+				const char *verb,
+				struct json_object *args,
+				int flags,
+				struct json_object **object,
+				char **error,
+				char **info)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_subcall_sync(xreq, api, verb, args, flags, object, error, info);
+}
+
+/******************************************************************************/
+
+const struct afb_req_x2_itf xreq_itf = {
 	.json = xreq_json_cb,
 	.get = xreq_get_cb,
-	.success = xreq_success_cb,
-	.fail = xreq_fail_cb,
-	.raw = xreq_raw_cb,
-	.send = xreq_send_cb,
-	.context_get = xreq_context_get_cb,
-	.context_set = xreq_context_set_cb,
+	.legacy_success = xreq_legacy_success_cb,
+	.legacy_fail = xreq_legacy_fail_cb,
+	.legacy_vsuccess = xreq_legacy_vsuccess_cb,
+	.legacy_vfail = xreq_legacy_vfail_cb,
+	.legacy_context_get = xreq_legacy_context_get_cb,
+	.legacy_context_set = xreq_legacy_context_set_cb,
 	.addref = xreq_addref_cb,
 	.unref = xreq_unref_cb,
 	.session_close = xreq_session_close_cb,
 	.session_set_LOA = xreq_session_set_LOA_cb,
-	.subscribe = xreq_subscribe_cb,
-	.unsubscribe = xreq_unsubscribe_cb,
-	.subcall = xreq_subcall_cb
+	.legacy_subscribe_event_x1 = xreq_legacy_subscribe_event_x1_cb,
+	.legacy_unsubscribe_event_x1 = xreq_legacy_unsubscribe_event_x1_cb,
+	.legacy_subcall = xreq_legacy_subcall_cb,
+	.legacy_subcallsync = xreq_legacy_subcallsync_cb,
+	.vverbose = xreq_vverbose_cb,
+	.legacy_store_req = xreq_legacy_store_cb,
+	.legacy_subcall_req = xreq_legacy_subcall_req_cb,
+	.has_permission = xreq_has_permission_cb,
+	.get_application_id = xreq_get_application_id_cb,
+	.context_make = xreq_context_make_cb,
+	.subscribe_event_x2 = xreq_subscribe_event_x2_cb,
+	.unsubscribe_event_x2 = xreq_unsubscribe_event_x2_cb,
+	.legacy_subcall_request = xreq_legacy_subcall_request_cb,
+	.get_uid = xreq_get_uid_cb,
+	.reply = xreq_reply_cb,
+	.vreply = xreq_vreply_cb,
+	.get_client_info = xreq_get_client_info_cb,
+	.subcall = xreq_subcall_cb,
+	.subcallsync = xreq_subcallsync_cb,
 };
+/******************************************************************************/
+#if WITH_AFB_HOOK
 
-static struct json_object *xreq_json_cb(void *closure)
+static struct json_object *xreq_hooked_json_cb(struct afb_req_x2 *closure)
 {
-	struct afb_xreq *xreq = closure;
-	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq->query));
+	struct json_object *r = xreq_json_cb(closure);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_hook_xreq_json(xreq, r);
 }
 
-static struct afb_arg xreq_get_cb(void *closure, const char *name)
+static struct afb_arg xreq_hooked_get_cb(struct afb_req_x2 *closure, const char *name)
 {
-	struct afb_xreq *xreq = closure;
-	if (xreq->queryitf->get)
-		return xreq->queryitf->get(xreq->query, name);
-	else
-		return afb_msg_json_get_arg(xreq_json_cb(closure), name);
+	struct afb_arg r = xreq_get_cb(closure, name);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_hook_xreq_get(xreq, name, r);
 }
 
-static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
+static void xreq_hooked_reply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *info)
 {
-	struct afb_xreq *xreq = closure;
-	afb_xreq_success(xreq, obj, info);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_hook_xreq_reply(xreq, obj, error, info);
+	xreq_reply_cb(closure, obj, error, info);
 }
 
-void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
+static void xreq_hooked_vreply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *fmt, va_list args)
 {
-	if (xreq->replied) {
-		ERROR("reply called more than one time!!");
-		json_object_put(obj);
-	} else {
-		xreq->replied = 1;
-		if (xreq->queryitf->success)
-			xreq->queryitf->success(xreq->query, obj, info);
-		else
-			xreq->queryitf->reply(xreq->query, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
-	}
+	char *info;
+	if (fmt == NULL || vasprintf(&info, fmt, args) < 0)
+		info = NULL;
+	xreq_hooked_reply_cb(closure, obj, error, info);
+	free(info);
 }
 
-static void xreq_fail_cb(void *closure, const char *status, const char *info)
+static void xreq_hooked_legacy_success_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *info)
 {
-	struct afb_xreq *xreq = closure;
-	afb_xreq_fail(xreq, status, info);
+	xreq_hooked_reply_cb(closure, obj, NULL, info);
 }
 
-void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
+static void xreq_hooked_legacy_fail_cb(struct afb_req_x2 *closure, const char *status, const char *info)
 {
-	if (xreq->replied) {
-		ERROR("reply called more than one time!!");
-	} else {
-		xreq->replied = 1;
-		if (xreq->queryitf->fail)
-			xreq->queryitf->fail(xreq->query, status, info);
-		else
-			xreq->queryitf->reply(xreq->query, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
-	}
+	xreq_hooked_reply_cb(closure, NULL, status, info);
 }
 
-static const char *xreq_raw_cb(void *closure, size_t *size)
+static void xreq_hooked_legacy_vsuccess_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *fmt, va_list args)
 {
-	struct afb_xreq *xreq = closure;
-	return afb_xreq_raw(xreq, size);
+	xreq_hooked_vreply_cb(closure, obj, NULL, fmt, args);
 }
 
-const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
+static void xreq_hooked_legacy_vfail_cb(struct afb_req_x2 *closure, const char *status, const char *fmt, va_list args)
 {
-	const char *result = json_object_to_json_string(xreq_json_cb(xreq));
-	if (size != NULL)
-		*size = strlen(result);
-	return result;
+	xreq_hooked_vreply_cb(closure, NULL, status, fmt, args);
 }
 
-static void xreq_send_cb(void *closure, const char *buffer, size_t size)
+static void *xreq_hooked_legacy_context_get_cb(struct afb_req_x2 *closure)
 {
-	struct json_object *obj = json_tokener_parse(buffer);
-	if (!obj == !buffer)
-		xreq_success_cb(closure, obj, "fake send");
-	else
-		xreq_fail_cb(closure, "fake-send-failed", "fake send");
+	void *r = xreq_legacy_context_get_cb(closure);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_hook_xreq_legacy_context_get(xreq, r);
 }
 
-static void *xreq_context_get_cb(void *closure)
+static void xreq_hooked_legacy_context_set_cb(struct afb_req_x2 *closure, void *value, void (*free_value)(void*))
 {
-	struct afb_xreq *xreq = closure;
-	return afb_context_get(&xreq->context);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_hook_xreq_legacy_context_set(xreq, value, free_value);
+	xreq_legacy_context_set_cb(closure, value, free_value);
 }
 
-static void xreq_context_set_cb(void *closure, void *value, void (*free_value)(void*))
+static struct afb_req_x2 *xreq_hooked_addref_cb(struct afb_req_x2 *closure)
 {
-	struct afb_xreq *xreq = closure;
-	afb_context_set(&xreq->context, value, free_value);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_hook_xreq_addref(xreq);
+	return xreq_addref_cb(closure);
 }
 
-static void xreq_addref_cb(void *closure)
+static void xreq_hooked_unref_cb(struct afb_req_x2 *closure)
 {
-	struct afb_xreq *xreq = closure;
-	afb_xreq_addref(xreq);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_hook_xreq_unref(xreq);
+	xreq_unref_cb(closure);
 }
 
-void afb_xreq_addref(struct afb_xreq *xreq)
+static void xreq_hooked_session_close_cb(struct afb_req_x2 *closure)
 {
-	xreq->refcount++;
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	afb_hook_xreq_session_close(xreq);
+	xreq_session_close_cb(closure);
 }
 
-static void xreq_unref_cb(void *closure)
+static int xreq_hooked_session_set_LOA_cb(struct afb_req_x2 *closure, unsigned level)
 {
-	struct afb_xreq *xreq = closure;
-	afb_xreq_unref(xreq);
+	int r = xreq_session_set_LOA_cb(closure, level);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_hook_xreq_session_set_LOA(xreq, level, r);
 }
 
-void afb_xreq_unref(struct afb_xreq *xreq)
+static int xreq_hooked_subscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event)
 {
-	if (!--xreq->refcount) {
-		xreq->queryitf->unref(xreq->query);
-	}
+	int r = xreq_subscribe_event_x2_cb(closure, event);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_hook_xreq_subscribe(xreq, event, r);
 }
 
-static void xreq_session_close_cb(void *closure)
+static int xreq_hooked_legacy_subscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event)
 {
-	struct afb_xreq *xreq = closure;
-	afb_context_close(&xreq->context);
+	return xreq_hooked_subscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event));
 }
 
-static int xreq_session_set_LOA_cb(void *closure, unsigned level)
+static int xreq_hooked_unsubscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event)
 {
-	struct afb_xreq *xreq = closure;
-	return afb_context_change_loa(&xreq->context, level);
+	int r = xreq_unsubscribe_event_x2_cb(closure, event);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	return afb_hook_xreq_unsubscribe(xreq, event, r);
 }
 
-static int xreq_subscribe_cb(void *closure, struct afb_event event)
+static int xreq_hooked_legacy_unsubscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event)
 {
-	struct afb_xreq *xreq = closure;
-	return afb_xreq_subscribe(xreq, event);
+	return xreq_hooked_unsubscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event));
 }
 
-int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event event)
+static void xreq_hooked_legacy_subcall_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
 {
-	if (xreq->listener)
-		return afb_evt_add_watch(xreq->listener, event);
-	if (xreq->queryitf->subscribe)
-		return xreq->queryitf->subscribe(xreq->query, event);
-	ERROR("no event listener, subscription impossible");
-	errno = EINVAL;
-	return -1;
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	afb_calls_legacy_hooked_subcall_v1(xreq, api, verb, args, callback, closure);
 }
 
-static int xreq_unsubscribe_cb(void *closure, struct afb_event event)
+static void xreq_hooked_legacy_subcall_req_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x1), void *closure)
 {
-	struct afb_xreq *xreq = closure;
-	return afb_xreq_unsubscribe(xreq, event);
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	afb_calls_legacy_hooked_subcall_v2(xreq, api, verb, args, callback, closure);
 }
 
-int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
+static void xreq_hooked_legacy_subcall_request_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x2 *), void *closure)
 {
-	if (xreq->listener)
-		return afb_evt_remove_watch(xreq->listener, event);
-	if (xreq->queryitf->unsubscribe)
-		return xreq->queryitf->unsubscribe(xreq->query, event);
-	ERROR("no event listener, unsubscription impossible");
-	errno = EINVAL;
-	return -1;
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	afb_calls_legacy_hooked_subcall_v3(xreq, api, verb, args, callback, closure);
 }
 
-static void xreq_subcall_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+static int xreq_hooked_legacy_subcallsync_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
-	struct afb_xreq *xreq = closure;
-	if (xreq->queryitf->subcall)
-		xreq->queryitf->subcall(xreq->query, api, verb, args, callback, cb_closure);
-	else
-		afb_subcall(xreq, api, verb, args, callback, cb_closure);
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_legacy_hooked_subcall_sync(xreq, api, verb, args, result);
 }
 
-void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
+static void xreq_hooked_vverbose_cb(struct afb_req_x2 *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
 {
-	char *message;
-	va_list args;
-	va_start(args, info);
-	if (info == NULL || vasprintf(&message, info, args) < 0)
-		message = NULL;
-	va_end(args);
-	afb_xreq_success(xreq, obj, message);
-	free(message);
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	va_list ap;
+	va_copy(ap, args);
+	xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
+	afb_hook_xreq_vverbose(xreq, level, file, line, func, fmt, ap);
+	va_end(ap);
+}
+
+static struct afb_stored_req *xreq_hooked_legacy_store_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	struct afb_stored_req *r = xreq_legacy_store_cb(closure);
+	afb_hook_xreq_legacy_store(xreq, r);
+	return r;
+}
+
+static int xreq_hooked_has_permission_cb(struct afb_req_x2 *closure, const char *permission)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	int r = xreq_has_permission_cb(closure, permission);
+	return afb_hook_xreq_has_permission(xreq, permission, r);
+}
+
+static char *xreq_hooked_get_application_id_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	char *r = xreq_get_application_id_cb(closure);
+	return afb_hook_xreq_get_application_id(xreq, r);
+}
+
+static void *xreq_hooked_context_make_cb(struct afb_req_x2 *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	void *result = xreq_context_make_cb(closure, replace, create_value, free_value, create_closure);
+	return afb_hook_xreq_context_make(xreq, replace, create_value, free_value, create_closure, result);
 }
 
-void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...)
+static int xreq_hooked_get_uid_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	int r = xreq_get_uid_cb(closure);
+	return afb_hook_xreq_get_uid(xreq, r);
+}
+
+static struct json_object *xreq_hooked_get_client_info_cb(struct afb_req_x2 *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(closure);
+	struct json_object *r = xreq_get_client_info_cb(closure);
+	return afb_hook_xreq_get_client_info(xreq, r);
+}
+
+static void xreq_hooked_subcall_cb(
+				struct afb_req_x2 *req,
+				const char *api,
+				const char *verb,
+				struct json_object *args,
+				int flags,
+				void (*callback)(void *closure, struct json_object *object, const char *error, const char * info, struct afb_req_x2 *req),
+				void *closure)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	afb_calls_hooked_subcall(xreq, api, verb, args, flags, callback, closure);
+}
+
+static int xreq_hooked_subcallsync_cb(
+				struct afb_req_x2 *req,
+				const char *api,
+				const char *verb,
+				struct json_object *args,
+				int flags,
+				struct json_object **object,
+				char **error,
+				char **info)
+{
+	struct afb_xreq *xreq = xreq_from_req_x2(req);
+	return afb_calls_hooked_subcall_sync(xreq, api, verb, args, flags, object, error, info);
+}
+
+/******************************************************************************/
+
+const struct afb_req_x2_itf xreq_hooked_itf = {
+	.json = xreq_hooked_json_cb,
+	.get = xreq_hooked_get_cb,
+	.legacy_success = xreq_hooked_legacy_success_cb,
+	.legacy_fail = xreq_hooked_legacy_fail_cb,
+	.legacy_vsuccess = xreq_hooked_legacy_vsuccess_cb,
+	.legacy_vfail = xreq_hooked_legacy_vfail_cb,
+	.legacy_context_get = xreq_hooked_legacy_context_get_cb,
+	.legacy_context_set = xreq_hooked_legacy_context_set_cb,
+	.addref = xreq_hooked_addref_cb,
+	.unref = xreq_hooked_unref_cb,
+	.session_close = xreq_hooked_session_close_cb,
+	.session_set_LOA = xreq_hooked_session_set_LOA_cb,
+	.legacy_subscribe_event_x1 = xreq_hooked_legacy_subscribe_event_x1_cb,
+	.legacy_unsubscribe_event_x1 = xreq_hooked_legacy_unsubscribe_event_x1_cb,
+	.legacy_subcall = xreq_hooked_legacy_subcall_cb,
+	.legacy_subcallsync = xreq_hooked_legacy_subcallsync_cb,
+	.vverbose = xreq_hooked_vverbose_cb,
+	.legacy_store_req = xreq_hooked_legacy_store_cb,
+	.legacy_subcall_req = xreq_hooked_legacy_subcall_req_cb,
+	.has_permission = xreq_hooked_has_permission_cb,
+	.get_application_id = xreq_hooked_get_application_id_cb,
+	.context_make = xreq_hooked_context_make_cb,
+	.subscribe_event_x2 = xreq_hooked_subscribe_event_x2_cb,
+	.unsubscribe_event_x2 = xreq_hooked_unsubscribe_event_x2_cb,
+	.legacy_subcall_request = xreq_hooked_legacy_subcall_request_cb,
+	.get_uid = xreq_hooked_get_uid_cb,
+	.reply = xreq_hooked_reply_cb,
+	.vreply = xreq_hooked_vreply_cb,
+	.get_client_info = xreq_hooked_get_client_info_cb,
+	.subcall = xreq_hooked_subcall_cb,
+	.subcallsync = xreq_hooked_subcallsync_cb,
+};
+#endif
+
+/******************************************************************************/
+
+struct afb_req_x1 afb_xreq_unstore(struct afb_stored_req *sreq)
+{
+	struct afb_xreq *xreq = (struct afb_xreq *)sreq;
+#if WITH_AFB_HOOK
+	if (xreq->hookflags)
+		afb_hook_xreq_legacy_unstore(xreq);
+#endif
+	return xreq_to_req_x1(xreq);
+}
+
+struct json_object *afb_xreq_json(struct afb_xreq *xreq)
+{
+	return afb_req_x2_json(xreq_to_req_x2(xreq));
+}
+
+void afb_xreq_reply(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info)
+{
+	afb_req_x2_reply(xreq_to_req_x2(xreq), obj, error, info);
+}
+
+void afb_xreq_reply_f(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info, ...)
 {
-	char *message;
 	va_list args;
+
 	va_start(args, info);
-	if (info == NULL || vasprintf(&message, info, args) < 0)
-		message = NULL;
+	afb_req_x2_reply_v(xreq_to_req_x2(xreq), obj, error, info, args);
 	va_end(args);
-	afb_xreq_fail(xreq, status, message);
-	free(message);
 }
 
-static int xcheck(struct afb_xreq *xreq)
+const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
 {
-	int stag = xreq->sessionflags;
+	struct json_object *obj = xreq_json_cb(xreq_to_req_x2(xreq));
+	const char *result = json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE);
+	if (size != NULL)
+		*size = strlen(result);
+	return result;
+}
 
-	if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
-		if (!afb_context_check(&xreq->context)) {
-			afb_context_close(&xreq->context);
-			afb_xreq_fail_f(xreq, "failed", "invalid token's identity");
-			return 0;
-		}
-	}
+void afb_xreq_unhooked_legacy_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x2 *), void *cb_closure)
+{
+	xreq_legacy_subcall_request_cb(xreq_to_req_x2(xreq), api, verb, args, callback, cb_closure);
+}
 
-	if ((stag & AFB_SESSION_CREATE) != 0) {
-		if (afb_context_check_loa(&xreq->context, 1)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid creation state");
-			return 0;
-		}
-		afb_context_change_loa(&xreq->context, 1);
-		afb_context_refresh(&xreq->context);
-	}
+void afb_xreq_unhooked_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, int flags, void (*callback)(void*, struct json_object*, const char*, const char*, struct afb_req_x2 *), void *closure)
+{
+	xreq_subcall_cb(xreq_to_req_x2(xreq), api, verb, args, flags, callback, closure);
+}
 
-	if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
-		afb_context_refresh(&xreq->context);
+int afb_xreq_unhooked_legacy_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+	return xreq_legacy_subcallsync_cb(xreq_to_req_x2(xreq), api, verb, args, result);
+}
 
-	if ((stag & AFB_SESSION_CLOSE) != 0) {
-		afb_context_change_loa(&xreq->context, 0);
-		afb_context_close(&xreq->context);
-	}
+void afb_xreq_addref(struct afb_xreq *xreq)
+{
+	afb_req_x2_addref(xreq_to_req_x2(xreq));
+}
 
-	if ((stag & AFB_SESSION_LOA_GE) != 0) {
-		int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
-		if (!afb_context_check_loa(&xreq->context, loa)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid LOA");
-			return 0;
-		}
-	}
+void afb_xreq_unref(struct afb_xreq *xreq)
+{
+	afb_req_x2_unref(xreq_to_req_x2(xreq));
+}
 
-	if ((stag & AFB_SESSION_LOA_LE) != 0) {
-		int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
-		if (afb_context_check_loa(&xreq->context, loa + 1)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid LOA");
-			return 0;
-		}
+void afb_xreq_legacy_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x2 *), void *cb_closure)
+{
+	afb_req_x2_subcall_legacy(xreq_to_req_x2(xreq), api, verb, args, callback, cb_closure);
+}
+
+void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, int flags, void (*callback)(void*, struct json_object*, const char*, const char*, struct afb_req_x2 *), void *closure)
+{
+	afb_req_x2_subcall(xreq_to_req_x2(xreq), api, verb, args, flags, callback, closure);
+}
+
+int afb_xreq_legacy_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+	return afb_req_x2_subcall_sync_legacy(xreq_to_req_x2(xreq), api, verb, args, result);
+}
+
+int afb_xreq_reply_unknown_api(struct afb_xreq *xreq)
+{
+	afb_xreq_reply_f(xreq, NULL, afb_error_text_unknown_api, "api %s not found (for verb %s)", xreq->request.called_api, xreq->request.called_verb);
+	errno = EINVAL;
+	return -1;
+}
+
+int afb_xreq_reply_unknown_verb(struct afb_xreq *xreq)
+{
+	afb_xreq_reply_f(xreq, NULL, afb_error_text_unknown_verb, "verb %s unknown within api %s", xreq->request.called_verb, xreq->request.called_api);
+	errno = EINVAL;
+	return -1;
+}
+
+int afb_xreq_reply_invalid_token(struct afb_xreq *xreq)
+{
+	afb_xreq_reply(xreq, NULL, afb_error_text_invalid_token, "invalid token"); /* TODO: or "no token" */
+	errno = EINVAL;
+	return -1;
+}
+
+int afb_xreq_reply_insufficient_scope(struct afb_xreq *xreq, const char *scope)
+{
+	afb_xreq_reply(xreq, NULL, afb_error_text_insufficient_scope, scope ?: "insufficient scope");
+	errno = EPERM;
+	return -1;
+}
+
+#if WITH_LEGACY_BINDING_V1
+void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb)
+{
+	if (!verb)
+		afb_xreq_reply_unknown_verb(xreq);
+	else
+		if (afb_auth_check_and_set_session_x1(xreq, verb->session) >= 0)
+			verb->callback(xreq_to_req_x1(xreq));
+}
+#endif
+
+#if WITH_LEGACY_BINDING_V2
+void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb)
+{
+	if (!verb)
+		afb_xreq_reply_unknown_verb(xreq);
+	else
+		if (afb_auth_check_and_set_session_x2(xreq, verb->auth, verb->session) > 0)
+			verb->callback(xreq_to_req_x1(xreq));
+}
+#endif
+
+void afb_xreq_call_verb_v3(struct afb_xreq *xreq, const struct afb_verb_v3 *verb)
+{
+	if (!verb)
+		afb_xreq_reply_unknown_verb(xreq);
+	else
+		if (afb_auth_check_and_set_session_x2(xreq, verb->auth, verb->session) > 0)
+			verb->callback(xreq_to_req_x2(xreq));
+}
+
+void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
+{
+	memset(xreq, 0, sizeof *xreq);
+	xreq->request.itf = &xreq_itf; /* no hook by default */
+	xreq->refcount = 1;
+	xreq->queryitf = queryitf;
+}
+
+#if WITH_AFB_HOOK
+static void init_hooking(struct afb_xreq *xreq)
+{
+	afb_hook_init_xreq(xreq);
+	if (xreq->hookflags) {
+		xreq->request.itf = &xreq_hooked_itf; /* unhook the interface */
+		afb_hook_xreq_begin(xreq);
 	}
-	return 1;
 }
+#endif
 
-static void xreq_run_cb(int signum, void *arg)
+/**
+ * job callback for asynchronous and secured processing of the request.
+ */
+static void process_async(int signum, void *arg)
 {
 	struct afb_xreq *xreq = arg;
+	const struct afb_api_item *api;
 
-	if (signum == 0)
-		xreq->callback((struct afb_req){ .itf = &xreq_itf, .closure = xreq });
-	else {
-		afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
-		
+	if (signum != 0) {
+		/* emit the error (assumes that hooking is initialised) */
+		afb_xreq_reply_f(xreq, NULL, afb_error_text_aborted, "signal %s(%d) caught", strsignal(signum), signum);
+	} else {
+#if WITH_AFB_HOOK
+		/* init hooking */
+		init_hooking(xreq);
+#endif
+		/* invoke api call method to process the request */
+		api = (const struct afb_api_item*)xreq->context.api_key;
+		api->itf->call(api->closure, xreq);
 	}
-	afb_xreq_unref(xreq);
+	/* release the request */
+	afb_xreq_unhooked_unref(xreq);
 }
 
-void afb_xreq_call(struct afb_xreq *xreq)
+/**
+ * Early request failure of the request 'xreq' with, as usual, 'status' and 'info'
+ * The early failure occurs only in function 'afb_xreq_process' where normally,
+ * the hooking is not initialised. So this "early" failure takes care to initialise
+ * the hooking in first.
+ */
+static void early_failure(struct afb_xreq *xreq, const char *status, const char *info, ...)
 {
-	int rc;
-	if (xcheck(xreq)) {
-		afb_xreq_addref(xreq);
-		rc = jobs_queue(xreq->group, xreq->timeout, xreq_run_cb, xreq);
-		if (rc < 0) {
-			/* TODO: allows or not to proccess it directly as when no threading? (see above) */
-			ERROR("can't process job with threads: %m");
-			afb_xreq_fail_f(xreq, "cancelled", "not able to pipe a job for the task");
-			xreq_unref_cb(xreq);
+	va_list args;
+
+#if WITH_AFB_HOOK
+	/* init hooking */
+	init_hooking(xreq);
+#endif
+
+	/* send error */
+	va_start(args, info);
+	afb_req_x2_reply_v(xreq_to_req_x2(xreq), NULL, status, info, args);
+	va_end(args);
+}
+
+/**
+ * Enqueue a job for processing the request 'xreq' using the given 'apiset'.
+ * Errors are reported as request failures.
+ */
+void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
+{
+	const struct afb_api_item *api;
+	struct afb_xreq *caller;
+
+	/* lookup at the api */
+	xreq->apiset = apiset;
+	api = afb_apiset_lookup_started(apiset, xreq->request.called_api, 1);
+	if (!api) {
+		if (errno == ENOENT)
+			early_failure(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->request.called_api, xreq->request.called_verb);
+		else
+			early_failure(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->request.called_api);
+		goto end;
+	}
+	xreq->context.api_key = api;
+
+	/* check self locking */
+	if (api->group) {
+		caller = xreq->caller;
+		while (caller) {
+			if (((const struct afb_api_item*)caller->context.api_key)->group == api->group) {
+				/* noconcurrency lock detected */
+				ERROR("self-lock detected in call stack for API %s", xreq->request.called_api);
+				early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->request.called_api);
+				goto end;
+			}
+			caller = caller->caller;
 		}
 	}
+
+	/* queue the request job */
+	afb_xreq_unhooked_addref(xreq);
+	if (jobs_queue(api->group, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
+		/* TODO: allows or not to proccess it directly as when no threading? (see above) */
+		ERROR("can't process job with threads: %m");
+		early_failure(xreq, "cancelled", "not able to create a job for the task");
+		afb_xreq_unhooked_unref(xreq);
+	}
+end:
+	afb_xreq_unhooked_unref(xreq);
+}
+
+const char *xreq_on_behalf_cred_export(struct afb_xreq *xreq)
+{
+	return afb_context_on_behalf_export(&xreq->context);
 }