diff options
Diffstat (limited to 'src/afb-xreq.c')
| -rw-r--r-- | src/afb-xreq.c | 977 |
1 files changed, 376 insertions, 601 deletions
diff --git a/src/afb-xreq.c b/src/afb-xreq.c index 582e9b72..8f246b3c 100644 --- a/src/afb-xreq.c +++ b/src/afb-xreq.c @@ -21,22 +21,26 @@ #include <stdio.h> #include <string.h> #include <errno.h> +#include <stdarg.h> #include <json-c/json.h> + #include <afb/afb-binding-v1.h> #include <afb/afb-binding-v2.h> -#include <afb/afb-request.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-msg-json.h" #include "afb-cred.h" #include "afb-hook.h" -#include "afb-api.h" -#include "afb-api-dyn.h" -#include "afb-apiset.h" -#include "afb-auth.h" +#include "afb-msg-json.h" +#include "afb-xreq.h" + #include "jobs.h" #include "verbose.h" @@ -45,7 +49,7 @@ static void xreq_finalize(struct afb_xreq *xreq) { if (!xreq->replied) - afb_xreq_fail(xreq, "error", "no reply"); + afb_xreq_reply(xreq, NULL, "error", "no reply"); if (xreq->hookflags) afb_hook_xreq_end(xreq); if (xreq->caller) @@ -66,274 +70,22 @@ inline void afb_xreq_unhooked_unref(struct afb_xreq *xreq) /******************************************************************************/ -struct subcall -{ - struct afb_xreq xreq; - - void (*completion)(struct subcall*, int, struct json_object*); - - union { - struct { - struct jobloop *jobloop; - struct json_object *result; - int status; - }; - struct { - union { - void (*callback)(void*, int, struct json_object*); - void (*callback_req)(void*, int, struct json_object*, struct afb_req); - void (*callback_request)(void*, int, struct json_object*, struct afb_request*); - }; - void *closure; - }; - }; -}; - -static int subcall_subscribe_cb(struct afb_xreq *xreq, struct afb_eventid *eventid) -{ - struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq); - - return afb_xreq_subscribe(subcall->xreq.caller, eventid); -} - -static int subcall_unsubscribe_cb(struct afb_xreq *xreq, struct afb_eventid *eventid) -{ - struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq); - - return afb_xreq_unsubscribe(subcall->xreq.caller, eventid); -} - -static void subcall_reply_cb(struct afb_xreq *xreq, int status, struct json_object *result) -{ - struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq); - - subcall->completion(subcall, status, result); - json_object_put(result); - afb_xreq_unhooked_unref(&subcall->xreq); -} - -static void subcall_destroy_cb(struct afb_xreq *xreq) -{ - struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq); - - json_object_put(subcall->xreq.json); - afb_cred_unref(subcall->xreq.cred); - free(subcall); -} - -const struct afb_xreq_query_itf afb_xreq_subcall_itf = { - .reply = subcall_reply_cb, - .unref = subcall_destroy_cb, - .subscribe = subcall_subscribe_cb, - .unsubscribe = subcall_unsubscribe_cb -}; - -static struct subcall *subcall_alloc( - struct afb_xreq *caller, - const char *api, - const char *verb, - struct json_object *args -) -{ - struct subcall *subcall; - size_t lenapi, lenverb; - char *copy; - - lenapi = 1 + strlen(api); - lenverb = 1 + strlen(verb); - subcall = malloc(lenapi + lenverb + sizeof *subcall); - if (!subcall) - ERROR("out of memory"); - else { - copy = (char*)&subcall[1]; - memcpy(copy, api, lenapi); - api = copy; - copy = ©[lenapi]; - memcpy(copy, verb, lenverb); - verb = copy; - - afb_xreq_init(&subcall->xreq, &afb_xreq_subcall_itf); - afb_context_subinit(&subcall->xreq.context, &caller->context); - subcall->xreq.cred = afb_cred_addref(caller->cred); - subcall->xreq.json = args; - subcall->xreq.request.api = api; - subcall->xreq.request.verb = verb; - subcall->xreq.caller = caller; - afb_xreq_unhooked_addref(caller); - } - return subcall; -} - - -static void subcall_on_reply(struct subcall *subcall, int status, struct json_object *result) -{ - subcall->callback(subcall->closure, status, result); -} - -static void subcall_req_on_reply(struct subcall *subcall, int status, struct json_object *result) -{ - subcall->callback_req(subcall->closure, status, result, xreq_to_req(subcall->xreq.caller)); -} - -static void subcall_request_on_reply(struct subcall *subcall, int status, struct json_object *result) -{ - subcall->callback_request(subcall->closure, status, result, xreq_to_request(subcall->xreq.caller)); -} - -static void subcall_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result) -{ - afb_hook_xreq_subcall_result(subcall->xreq.caller, status, result); - subcall_on_reply(subcall, status, result); -} - -static void subcall_req_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result) -{ - afb_hook_xreq_subcall_req_result(subcall->xreq.caller, status, result); - subcall_req_on_reply(subcall, status, result); -} - -static void subcall_request_hooked_on_reply(struct subcall *subcall, int status, struct json_object *result) -{ - afb_hook_xreq_subcall_result(subcall->xreq.caller, status, result); - subcall_request_on_reply(subcall, status, result); -} - -static void subcall_reply_direct_cb(void *closure, int status, struct json_object *result) +struct json_object *afb_xreq_unhooked_json(struct afb_xreq *xreq) { - struct afb_xreq *xreq = closure; - - if (xreq->replied) { - ERROR("subcall replied more than one time!!"); - json_object_put(result); - } else { - xreq->replied = 1; - subcall_reply_cb(xreq, status, result); - } -} - -static void subcall_process(struct subcall *subcall, void (*completion)(struct subcall*, int, struct json_object*)) -{ - subcall->completion = completion; - if (subcall->xreq.caller->queryitf->subcall) { - subcall->xreq.caller->queryitf->subcall( - subcall->xreq.caller, subcall->xreq.request.api, subcall->xreq.request.verb, - subcall->xreq.json, subcall_reply_direct_cb, &subcall->xreq); - } else { - afb_xreq_unhooked_addref(&subcall->xreq); - afb_xreq_process(&subcall->xreq, subcall->xreq.caller->apiset); - } -} - -static void subcall(struct subcall *subcall, void (*callback)(void*, int, struct json_object*), void *cb_closure) -{ - subcall->callback = callback; - subcall->closure = cb_closure; - subcall_process(subcall, subcall_on_reply); -} - -static void subcall_req(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure) -{ - subcall->callback_req = callback; - subcall->closure = cb_closure; - subcall_process(subcall, subcall_req_on_reply); -} - -static void subcall_request(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure) -{ - subcall->callback_request = callback; - subcall->closure = cb_closure; - subcall_process(subcall, subcall_request_on_reply); -} - -static void subcall_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*), void *cb_closure) -{ - subcall->callback = callback; - subcall->closure = cb_closure; - subcall_process(subcall, subcall_hooked_on_reply); -} - -static void subcall_req_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure) -{ - subcall->callback_req = callback; - subcall->closure = cb_closure; - subcall_process(subcall, subcall_req_hooked_on_reply); -} - -static void subcall_request_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_closure) -{ - subcall->callback_request = callback; - subcall->closure = cb_closure; - subcall_process(subcall, subcall_request_hooked_on_reply); -} - -static void subcall_sync_leave(struct subcall *subcall) -{ - struct jobloop *jobloop = __atomic_exchange_n(&subcall->jobloop, NULL, __ATOMIC_RELAXED); - if (jobloop) - jobs_leave(jobloop); -} - -static void subcall_sync_reply(struct subcall *subcall, int status, struct json_object *result) -{ - subcall->status = status; - subcall->result = json_object_get(result); - subcall_sync_leave(subcall); -} - -static void subcall_sync_enter(int signum, void *closure, struct jobloop *jobloop) -{ - struct subcall *subcall = closure; - - if (!signum) { - subcall->jobloop = jobloop; - subcall->result = NULL; - subcall->status = 0; - subcall_process(subcall, subcall_sync_reply); - } else { - subcall->status = -1; - subcall_sync_leave(subcall); - } -} - -static int subcallsync(struct subcall *subcall, struct json_object **result) -{ - int rc; - - afb_xreq_unhooked_addref(&subcall->xreq); - rc = jobs_enter(NULL, 0, subcall_sync_enter, subcall); - *result = subcall->result; - if (rc < 0 || subcall->status < 0) { - *result = *result ?: afb_msg_json_internal_error(); - rc = -1; - } - afb_xreq_unhooked_unref(&subcall->xreq); - return rc; -} - -/******************************************************************************/ - -static void vinfo(void *first, void *second, const char *fmt, va_list args, void (*fun)(void*,void*,const char*)) -{ - char *info; - if (fmt == NULL || vasprintf(&info, fmt, args) < 0) - info = NULL; - fun(first, second, info); - free(info); -} - -/******************************************************************************/ - -static struct json_object *xreq_json_cb(struct afb_request *closure) -{ - struct afb_xreq *xreq = xreq_from_request(closure); if (!xreq->json && xreq->queryitf->json) xreq->json = xreq->queryitf->json(xreq); return xreq->json; } -static struct afb_arg xreq_get_cb(struct afb_request *closure, const char *name) +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 struct afb_arg xreq_get_cb(struct afb_req_x2 *closure, const char *name) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); struct afb_arg arg; struct json_object *object, *value; @@ -353,409 +105,388 @@ static struct afb_arg xreq_get_cb(struct afb_request *closure, const char *name) return arg; } -static void xreq_success_cb(struct afb_request *closure, struct json_object *obj, const char *info) +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_request(closure); + 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; - if (xreq->queryitf->success) - xreq->queryitf->success(xreq, obj, info); - else - xreq->queryitf->reply(xreq, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL)); + xreq->queryitf->reply(xreq, obj, error, info); } } -static void xreq_fail_cb(struct afb_request *closure, const char *status, const char *info) +static void xreq_vreply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *fmt, va_list args) { - struct afb_xreq *xreq = xreq_from_request(closure); + char *info; + if (fmt == NULL || vasprintf(&info, fmt, args) < 0) + info = NULL; + xreq_reply_cb(closure, obj, error, info); + free(info); +} - if (xreq->replied) { - ERROR("reply called more than one time!!"); - } else { - xreq->replied = 1; - if (xreq->queryitf->fail) - xreq->queryitf->fail(xreq, status, info); - else - xreq->queryitf->reply(xreq, -1, afb_msg_json_reply_error(status, info, &xreq->context, NULL)); - } +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_vsuccess_cb(struct afb_request *closure, struct json_object *obj, const char *fmt, va_list args) +static void xreq_legacy_fail_cb(struct afb_req_x2 *closure, const char *status, const char *info) { - vinfo(closure, obj, fmt, args, (void*)xreq_success_cb); + xreq_reply_cb(closure, NULL, status, info); } -static void xreq_vfail_cb(struct afb_request *closure, const char *status, const char *fmt, va_list args) +static void xreq_legacy_vsuccess_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *fmt, va_list args) { - vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb); + xreq_vreply_cb(closure, obj, NULL, fmt, args); } -static void *xreq_context_get_cb(struct afb_request *closure) +static void xreq_legacy_vfail_cb(struct afb_req_x2 *closure, const char *status, const char *fmt, va_list args) { - struct afb_xreq *xreq = xreq_from_request(closure); + 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_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*)) +static void xreq_legacy_context_set_cb(struct afb_req_x2 *closure, void *value, void (*free_value)(void*)) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_context_set(&xreq->context, value, free_value); } -static struct afb_request *xreq_addref_cb(struct afb_request *closure) +static struct afb_req_x2 *xreq_addref_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_xreq_unhooked_addref(xreq); return closure; } -static void xreq_unref_cb(struct afb_request *closure) +static void xreq_unref_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_xreq_unhooked_unref(xreq); } -static void xreq_session_close_cb(struct afb_request *closure) +static void xreq_session_close_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_context_close(&xreq->context); } -static int xreq_session_set_LOA_cb(struct afb_request *closure, unsigned level) +static int xreq_session_set_LOA_cb(struct afb_req_x2 *closure, unsigned level) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return afb_context_change_loa(&xreq->context, level); } -static int xreq_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid); -static int xreq_subscribe_cb(struct afb_request *closure, struct afb_event event) +static int xreq_subscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event) { - return xreq_subscribe_eventid_cb(closure, afb_event_to_eventid(event)); + struct afb_xreq *xreq = xreq_from_req_x2(closure); + return afb_xreq_subscribe(xreq, event); } -static int xreq_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid) +static int xreq_legacy_subscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event) { - struct afb_xreq *xreq = xreq_from_request(closure); - return afb_xreq_subscribe(xreq, eventid); + return xreq_subscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event)); } -int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_eventid *eventid) +int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event) { if (xreq->listener) - return afb_evt_eventid_add_watch(xreq->listener, eventid); + return afb_evt_event_x2_add_watch(xreq->listener, event); if (xreq->queryitf->subscribe) - return xreq->queryitf->subscribe(xreq, eventid); + return xreq->queryitf->subscribe(xreq, event); ERROR("no event listener, subscription impossible"); errno = EINVAL; return -1; } -static int xreq_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid); -static int xreq_unsubscribe_cb(struct afb_request *closure, struct afb_event event) +static int xreq_unsubscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event) { - return xreq_unsubscribe_eventid_cb(closure, afb_event_to_eventid(event)); + struct afb_xreq *xreq = xreq_from_req_x2(closure); + return afb_xreq_unsubscribe(xreq, event); } -static int xreq_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid) +static int xreq_legacy_unsubscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event) { - struct afb_xreq *xreq = xreq_from_request(closure); - return afb_xreq_unsubscribe(xreq, eventid); + return xreq_unsubscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event)); } -int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid) +int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event) { if (xreq->listener) - return afb_evt_eventid_remove_watch(xreq->listener, eventid); + return afb_evt_event_x2_remove_watch(xreq->listener, event); if (xreq->queryitf->unsubscribe) - return xreq->queryitf->unsubscribe(xreq, eventid); + return xreq->queryitf->unsubscribe(xreq, event); ERROR("no event listener, unsubscription impossible"); errno = EINVAL; return -1; } -static void xreq_subcall_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure) +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_request(closure); - struct subcall *sc; - - sc = subcall_alloc(xreq, api, verb, args); - if (sc == NULL) { - if (callback) - callback(cb_closure, 1, afb_msg_json_internal_error()); - json_object_put(args); - } else { - subcall(sc, callback, cb_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_subcall_req_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_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_request(closure); - struct subcall *sc; - - sc = subcall_alloc(xreq, api, verb, args); - if (sc == NULL) { - if (callback) - callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_req(xreq)); - json_object_put(args); - } else { - subcall_req(sc, callback, cb_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_subcall_request_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request*), void *cb_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_request(closure); - struct subcall *sc; - - sc = subcall_alloc(xreq, api, verb, args); - if (sc == NULL) { - if (callback) - callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_request(xreq)); - json_object_put(args); - } else { - subcall_request(sc, callback, cb_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_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result) +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) { - int rc; - struct subcall *sc; - struct afb_xreq *xreq = xreq_from_request(closure); - struct json_object *resu; - - sc = subcall_alloc(xreq, api, verb, args); - if (!sc) { - rc = -1; - resu = afb_msg_json_internal_error(); - json_object_put(args); - } else { - rc = subcallsync(sc, &resu); - } - if (result) - *result = resu; - else - json_object_put(resu); - return rc; + 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_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args) +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_request(closure); + 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.api, p); + verbose(level, file, line, func, "[REQ/API %s] %s", xreq->request.called_api, p); free(p); } } -static struct afb_stored_req *xreq_store_cb(struct afb_request *closure) +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_request *closure, const char *permission) +static int xreq_has_permission_cb(struct afb_req_x2 *closure, const char *permission) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return afb_auth_has_permission(xreq, permission); } -static char *xreq_get_application_id_cb(struct afb_request *closure) +static char *xreq_get_application_id_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return xreq->cred && xreq->cred->id ? strdup(xreq->cred->id) : NULL; } -static void *xreq_context_make_cb(struct afb_request *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure) +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_request(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_request *closure) +static int xreq_get_uid_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return xreq->cred && xreq->cred->id ? (int)xreq->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 json_object *r = json_object_new_object(); + if (xreq->cred && xreq->cred->id) { + json_object_object_add(r, "uid", json_object_new_int(xreq->cred->uid)); + json_object_object_add(r, "gid", json_object_new_int(xreq->cred->gid)); + json_object_object_add(r, "pid", json_object_new_int(xreq->cred->pid)); + json_object_object_add(r, "user", json_object_new_string(xreq->cred->user)); + json_object_object_add(r, "label", json_object_new_string(xreq->cred->label)); + json_object_object_add(r, "id", json_object_new_string(xreq->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( + 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); +} + /******************************************************************************/ -static struct json_object *xreq_hooked_json_cb(struct afb_request *closure) +static struct json_object *xreq_hooked_json_cb(struct afb_req_x2 *closure) { struct json_object *r = xreq_json_cb(closure); - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return afb_hook_xreq_json(xreq, r); } -static struct afb_arg xreq_hooked_get_cb(struct afb_request *closure, const char *name) +static struct afb_arg xreq_hooked_get_cb(struct afb_req_x2 *closure, const char *name) { struct afb_arg r = xreq_get_cb(closure, name); - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return afb_hook_xreq_get(xreq, name, r); } -static void xreq_hooked_success_cb(struct afb_request *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 = xreq_from_req_x2(closure); + afb_hook_xreq_reply(xreq, obj, error, info); + xreq_reply_cb(closure, obj, error, 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) +{ + 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_hooked_legacy_success_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *info) { - struct afb_xreq *xreq = xreq_from_request(closure); - afb_hook_xreq_success(xreq, obj, info); - xreq_success_cb(closure, obj, info); + xreq_hooked_reply_cb(closure, obj, NULL, info); } -static void xreq_hooked_fail_cb(struct afb_request *closure, const char *status, const char *info) +static void xreq_hooked_legacy_fail_cb(struct afb_req_x2 *closure, const char *status, const char *info) { - struct afb_xreq *xreq = xreq_from_request(closure); - afb_hook_xreq_fail(xreq, status, info); - xreq_fail_cb(closure, status, info); + xreq_hooked_reply_cb(closure, NULL, status, info); } -static void xreq_hooked_vsuccess_cb(struct afb_request *closure, struct json_object *obj, const char *fmt, va_list args) +static void xreq_hooked_legacy_vsuccess_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *fmt, va_list args) { - vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb); + xreq_hooked_vreply_cb(closure, obj, NULL, fmt, args); } -static void xreq_hooked_vfail_cb(struct afb_request *closure, const char *status, const char *fmt, va_list args) +static void xreq_hooked_legacy_vfail_cb(struct afb_req_x2 *closure, const char *status, const char *fmt, va_list args) { - vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb); + xreq_hooked_vreply_cb(closure, NULL, status, fmt, args); } -static void *xreq_hooked_context_get_cb(struct afb_request *closure) +static void *xreq_hooked_legacy_context_get_cb(struct afb_req_x2 *closure) { - void *r = xreq_context_get_cb(closure); - struct afb_xreq *xreq = xreq_from_request(closure); - return afb_hook_xreq_context_get(xreq, r); + 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_hooked_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*)) +static void xreq_hooked_legacy_context_set_cb(struct afb_req_x2 *closure, void *value, void (*free_value)(void*)) { - struct afb_xreq *xreq = xreq_from_request(closure); - afb_hook_xreq_context_set(xreq, value, free_value); - xreq_context_set_cb(closure, value, free_value); + 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 struct afb_request *xreq_hooked_addref_cb(struct afb_request *closure) +static struct afb_req_x2 *xreq_hooked_addref_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_hook_xreq_addref(xreq); return xreq_addref_cb(closure); } -static void xreq_hooked_unref_cb(struct afb_request *closure) +static void xreq_hooked_unref_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_hook_xreq_unref(xreq); xreq_unref_cb(closure); } -static void xreq_hooked_session_close_cb(struct afb_request *closure) +static void xreq_hooked_session_close_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); afb_hook_xreq_session_close(xreq); xreq_session_close_cb(closure); } -static int xreq_hooked_session_set_LOA_cb(struct afb_request *closure, unsigned level) +static int xreq_hooked_session_set_LOA_cb(struct afb_req_x2 *closure, unsigned level) { int r = xreq_session_set_LOA_cb(closure, level); - struct afb_xreq *xreq = xreq_from_request(closure); + struct afb_xreq *xreq = xreq_from_req_x2(closure); return afb_hook_xreq_session_set_LOA(xreq, level, r); } -static int xreq_hooked_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid); -static int xreq_hooked_subscribe_cb(struct afb_request *closure, struct afb_event event) +static int xreq_hooked_subscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event) { - return xreq_hooked_subscribe_eventid_cb(closure, afb_event_to_eventid(event)); + 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 int xreq_hooked_subscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid) +static int xreq_hooked_legacy_subscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event) { - int r = xreq_subscribe_eventid_cb(closure, eventid); - struct afb_xreq *xreq = xreq_from_request(closure); - return afb_hook_xreq_subscribe(xreq, eventid, r); + return xreq_hooked_subscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event)); } -static int xreq_hooked_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid); -static int xreq_hooked_unsubscribe_cb(struct afb_request *closure, struct afb_event event) +static int xreq_hooked_unsubscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event) { - return xreq_hooked_unsubscribe_eventid_cb(closure, afb_event_to_eventid(event)); + 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_hooked_unsubscribe_eventid_cb(struct afb_request *closure, struct afb_eventid *eventid) +static int xreq_hooked_legacy_unsubscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event) { - int r = xreq_unsubscribe_eventid_cb(closure, eventid); - struct afb_xreq *xreq = xreq_from_request(closure); - return afb_hook_xreq_unsubscribe(xreq, eventid, r); + return xreq_hooked_unsubscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event)); } -static void xreq_hooked_subcall_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure) +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) { - struct afb_xreq *xreq = xreq_from_request(closure); - struct subcall *sc; - - afb_hook_xreq_subcall(xreq, api, verb, args); - sc = subcall_alloc(xreq, api, verb, args); - if (sc == NULL) { - if (callback) - callback(cb_closure, 1, afb_msg_json_internal_error()); - json_object_put(args); - } else { - subcall_hooked(sc, callback, cb_closure); - } + struct afb_xreq *xreq = xreq_from_req_x2(req); + afb_calls_legacy_hooked_subcall_v1(xreq, api, verb, args, callback, closure); } -static void xreq_hooked_subcall_req_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req), void *cb_closure) +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 = xreq_from_request(closure); - struct subcall *sc; - - afb_hook_xreq_subcall_req(xreq, api, verb, args); - sc = subcall_alloc(xreq, api, verb, args); - if (sc == NULL) { - if (callback) - callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_req(xreq)); - json_object_put(args); - } else { - subcall_req_hooked(sc, callback, cb_closure); - } + struct afb_xreq *xreq = xreq_from_req_x2(req); + afb_calls_legacy_hooked_subcall_v2(xreq, api, verb, args, callback, closure); } -static void xreq_hooked_subcall_request_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request *), void *cb_closure) +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) { - struct afb_xreq *xreq = xreq_from_request(closure); - struct subcall *sc; - - afb_hook_xreq_subcall(xreq, api, verb, args); - sc = subcall_alloc(xreq, api, verb, args); - if (sc == NULL) { - if (callback) - callback(cb_closure, 1, afb_msg_json_internal_error(), xreq_to_request(xreq)); - json_object_put(args); - } else { - subcall_request_hooked(sc, callback, cb_closure); - } + struct afb_xreq *xreq = xreq_from_req_x2(req); + afb_calls_legacy_hooked_subcall_v3(xreq, api, verb, args, callback, closure); } -static int xreq_hooked_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result) +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) { - int r; - struct afb_xreq *xreq = xreq_from_request(closure); - afb_hook_xreq_subcallsync(xreq, api, verb, args); - r = xreq_subcallsync_cb(closure, api, verb, args, result); - return afb_hook_xreq_subcallsync_result(xreq, r, *result); + struct afb_xreq *xreq = xreq_from_req_x2(req); + return afb_calls_legacy_hooked_subcall_sync(xreq, api, verb, args, result); } -static void xreq_hooked_vverbose_cb(struct afb_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args) +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) { - struct afb_xreq *xreq = xreq_from_request(closure); + 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); @@ -763,149 +494,178 @@ static void xreq_hooked_vverbose_cb(struct afb_request *closure, int level, cons va_end(ap); } -static struct afb_stored_req *xreq_hooked_store_cb(struct afb_request *closure) +static struct afb_stored_req *xreq_hooked_legacy_store_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(closure); - struct afb_stored_req *r = xreq_store_cb(closure); - afb_hook_xreq_store(xreq, r); + 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_request *closure, const char *permission) +static int xreq_hooked_has_permission_cb(struct afb_req_x2 *closure, const char *permission) { - struct afb_xreq *xreq = xreq_from_request(closure); + 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_request *closure) +static char *xreq_hooked_get_application_id_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(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_request *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure) +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_request(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); } -static int xreq_hooked_get_uid_cb(struct afb_request *closure) +static int xreq_hooked_get_uid_cb(struct afb_req_x2 *closure) { - struct afb_xreq *xreq = xreq_from_request(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_request_itf xreq_itf = { +const struct afb_req_x2_itf xreq_itf = { .json = xreq_json_cb, .get = xreq_get_cb, - .success = xreq_success_cb, - .fail = xreq_fail_cb, - .vsuccess = xreq_vsuccess_cb, - .vfail = xreq_vfail_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, - .subcallsync = xreq_subcallsync_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, - .store = xreq_store_cb, - .subcall_req = xreq_subcall_req_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_eventid = xreq_subscribe_eventid_cb, - .unsubscribe_eventid = xreq_unsubscribe_eventid_cb, - .subcall_request = xreq_subcall_request_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, }; -const struct afb_request_itf xreq_hooked_itf = { +const struct afb_req_x2_itf xreq_hooked_itf = { .json = xreq_hooked_json_cb, .get = xreq_hooked_get_cb, - .success = xreq_hooked_success_cb, - .fail = xreq_hooked_fail_cb, - .vsuccess = xreq_hooked_vsuccess_cb, - .vfail = xreq_hooked_vfail_cb, - .context_get = xreq_hooked_context_get_cb, - .context_set = xreq_hooked_context_set_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, - .subscribe = xreq_hooked_subscribe_cb, - .unsubscribe = xreq_hooked_unsubscribe_cb, - .subcall = xreq_hooked_subcall_cb, - .subcallsync = xreq_hooked_subcallsync_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, - .store = xreq_hooked_store_cb, - .subcall_req = xreq_hooked_subcall_req_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_eventid = xreq_hooked_subscribe_eventid_cb, - .unsubscribe_eventid = xreq_hooked_unsubscribe_eventid_cb, - .subcall_request = xreq_hooked_subcall_request_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, }; /******************************************************************************/ -struct afb_req afb_xreq_unstore(struct afb_stored_req *sreq) +struct afb_req_x1 afb_xreq_unstore(struct afb_stored_req *sreq) { struct afb_xreq *xreq = (struct afb_xreq *)sreq; if (xreq->hookflags) - afb_hook_xreq_unstore(xreq); - return xreq_to_req(xreq); + afb_hook_xreq_legacy_unstore(xreq); + return xreq_to_req_x1(xreq); } struct json_object *afb_xreq_json(struct afb_xreq *xreq) { - return afb_request_json(xreq_to_request(xreq)); + return afb_req_x2_json(xreq_to_req_x2(xreq)); } -void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info) +void afb_xreq_reply(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info) { - afb_request_success(xreq_to_request(xreq), obj, info); + afb_req_x2_reply(xreq_to_req_x2(xreq), obj, error, info); } -void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...) +void afb_xreq_reply_f(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info, ...) { va_list args; va_start(args, info); - afb_request_success_v(xreq_to_request(xreq), obj, info, args); + afb_req_x2_reply_v(xreq_to_req_x2(xreq), obj, error, info, args); va_end(args); } -void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info) -{ - afb_request_fail(xreq_to_request(xreq), status, info); -} - -void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...) -{ - va_list args; - - va_start(args, info); - afb_request_fail_v(xreq_to_request(xreq), status, info, args); - va_end(args); - -} - const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size) { - struct json_object *obj = xreq_json_cb(xreq_to_request(xreq)); + struct json_object *obj = xreq_json_cb(xreq_to_req_x2(xreq)); const char *result = json_object_to_json_string(obj); if (size != NULL) *size = strlen(result); @@ -914,69 +674,79 @@ const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size) void afb_xreq_addref(struct afb_xreq *xreq) { - afb_request_addref(xreq_to_request(xreq)); + afb_req_x2_addref(xreq_to_req_x2(xreq)); } void afb_xreq_unref(struct afb_xreq *xreq) { - afb_request_unref(xreq_to_request(xreq)); + afb_req_x2_unref(xreq_to_req_x2(xreq)); +} + +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); +} + +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_unhooked_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request *), void *cb_closure) +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_request_cb(xreq_to_request(xreq), api, verb, args, callback, cb_closure); + xreq_subcall_cb(xreq_to_req_x2(xreq), api, verb, args, flags, callback, closure); } -void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_request *), void *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_request_subcall(xreq_to_request(xreq), api, verb, args, callback, cb_closure); + afb_req_x2_subcall(xreq_to_req_x2(xreq), api, verb, args, flags, callback, closure); } -int afb_xreq_unhooked_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result) +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_subcallsync_cb(xreq_to_request(xreq), api, verb, args, result); + return xreq_legacy_subcallsync_cb(xreq_to_req_x2(xreq), api, verb, args, result); } -int afb_xreq_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result) +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_request_subcall_sync(xreq_to_request(xreq), api, verb, args, result); + return afb_req_x2_subcall_sync_legacy(xreq_to_req_x2(xreq), api, verb, args, result); } static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags) { int loa; - if ((sessionflags & (AFB_SESSION_CLOSE_V1|AFB_SESSION_RENEW_V1|AFB_SESSION_CHECK_V1|AFB_SESSION_LOA_EQ_V1)) != 0) { + if ((sessionflags & (AFB_SESSION_CLOSE_X1|AFB_SESSION_RENEW_X1|AFB_SESSION_CHECK_X1|AFB_SESSION_LOA_EQ_X1)) != 0) { if (!afb_context_check(&xreq->context)) { afb_context_close(&xreq->context); - afb_xreq_fail_f(xreq, "denied", "invalid token's identity"); + afb_xreq_reply_f(xreq, NULL, "denied", "invalid token's identity"); errno = EINVAL; return -1; } } - if ((sessionflags & AFB_SESSION_LOA_GE_V1) != 0) { - loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1; + if ((sessionflags & AFB_SESSION_LOA_GE_X1) != 0) { + loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_X1) & AFB_SESSION_LOA_MASK_X1; if (!afb_context_check_loa(&xreq->context, loa)) { - afb_xreq_fail_f(xreq, "denied", "invalid LOA"); + afb_xreq_reply_f(xreq, NULL, "denied", "invalid LOA"); errno = EPERM; return -1; } } - if ((sessionflags & AFB_SESSION_LOA_LE_V1) != 0) { - loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1; + if ((sessionflags & AFB_SESSION_LOA_LE_X1) != 0) { + loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_X1) & AFB_SESSION_LOA_MASK_X1; if (afb_context_check_loa(&xreq->context, loa + 1)) { - afb_xreq_fail_f(xreq, "denied", "invalid LOA"); + afb_xreq_reply_f(xreq, NULL, "denied", "invalid LOA"); errno = EPERM; return -1; } } - if ((sessionflags & AFB_SESSION_RENEW_V1) != 0) { + if ((sessionflags & AFB_SESSION_RENEW_X1) != 0) { afb_context_refresh(&xreq->context); } - if ((sessionflags & AFB_SESSION_CLOSE_V1) != 0) { + if ((sessionflags & AFB_SESSION_CLOSE_X1) != 0) { afb_context_change_loa(&xreq->context, 0); afb_context_close(&xreq->context); } @@ -991,29 +761,29 @@ static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionfl if (sessionflags != 0) { if (!afb_context_check(&xreq->context)) { afb_context_close(&xreq->context); - afb_xreq_fail_f(xreq, "denied", "invalid token's identity"); + afb_xreq_reply_f(xreq, NULL, "denied", "invalid token's identity"); errno = EINVAL; return -1; } } - loa = (int)(sessionflags & AFB_SESSION_LOA_MASK_V2); + loa = (int)(sessionflags & AFB_SESSION_LOA_MASK_X2); if (loa && !afb_context_check_loa(&xreq->context, loa)) { - afb_xreq_fail_f(xreq, "denied", "invalid LOA"); + afb_xreq_reply_f(xreq, NULL, "denied", "invalid LOA"); errno = EPERM; return -1; } if (auth && !afb_auth_check(xreq, auth)) { - afb_xreq_fail_f(xreq, "denied", "authorisation refused"); + afb_xreq_reply_f(xreq, NULL, "denied", "authorisation refused"); errno = EPERM; return -1; } - if ((sessionflags & AFB_SESSION_REFRESH_V2) != 0) { + if ((sessionflags & AFB_SESSION_REFRESH_X2) != 0) { afb_context_refresh(&xreq->context); } - if ((sessionflags & AFB_SESSION_CLOSE_V2) != 0) { + if ((sessionflags & AFB_SESSION_CLOSE_X2) != 0) { afb_context_close(&xreq->context); } @@ -1023,55 +793,55 @@ static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionfl void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb) { if (!verb) - afb_xreq_fail_unknown_verb(xreq); + afb_xreq_reply_unknown_verb(xreq); else if (!xreq_session_check_apply_v1(xreq, verb->session)) - verb->callback(xreq_to_req(xreq)); + verb->callback(xreq_to_req_x1(xreq)); } void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb) { if (!verb) - afb_xreq_fail_unknown_verb(xreq); + afb_xreq_reply_unknown_verb(xreq); else if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth)) - verb->callback(xreq_to_req(xreq)); + verb->callback(xreq_to_req_x1(xreq)); } -void afb_xreq_call_verb_vdyn(struct afb_xreq *xreq, const struct afb_api_dyn_verb *verb) +void afb_xreq_call_verb_v3(struct afb_xreq *xreq, const struct afb_verb_v3 *verb) { if (!verb) - afb_xreq_fail_unknown_verb(xreq); + afb_xreq_reply_unknown_verb(xreq); else if (xreq_session_check_apply_v2(xreq, verb->session, verb->auth) >= 0) - verb->callback(xreq_to_request(xreq)); + 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_hooked_itf; /* hook by default */ + xreq->request.itf = &xreq_itf; /* no hook by default */ xreq->refcount = 1; xreq->queryitf = queryitf; } -void afb_xreq_fail_unknown_api(struct afb_xreq *xreq) +void afb_xreq_reply_unknown_api(struct afb_xreq *xreq) { - afb_xreq_fail_f(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->request.api, xreq->request.verb); + afb_xreq_reply_f(xreq, NULL, "unknown-api", "api %s not found (for verb %s)", xreq->request.called_api, xreq->request.called_verb); } -void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq) +void afb_xreq_reply_unknown_verb(struct afb_xreq *xreq) { - afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->request.verb, xreq->request.api); + afb_xreq_reply_f(xreq, NULL, "unknown-verb", "verb %s unknown within api %s", xreq->request.called_verb, xreq->request.called_api); } static void init_hooking(struct afb_xreq *xreq) { afb_hook_init_xreq(xreq); - if (xreq->hookflags) + if (xreq->hookflags) { + xreq->request.itf = &xreq_hooked_itf; /* unhook the interface */ afb_hook_xreq_begin(xreq); - else - xreq->request.itf = &xreq_itf; /* unhook the interface */ + } } /** @@ -1080,16 +850,16 @@ static void init_hooking(struct afb_xreq *xreq) static void process_async(int signum, void *arg) { struct afb_xreq *xreq = arg; - const struct afb_api *api; + const struct afb_api_item *api; if (signum != 0) { /* emit the error (assumes that hooking is initialised) */ - afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum); + afb_xreq_reply_f(xreq, NULL, "aborted", "signal %s(%d) caught", strsignal(signum), signum); } else { /* init hooking */ init_hooking(xreq); - /* invoke api call method to process the reqiest */ - api = (const struct afb_api*)xreq->context.api_key; + /* invoke api call method to process the request */ + api = (const struct afb_api_item*)xreq->context.api_key; api->itf->call(api->closure, xreq); } /* release the request */ @@ -1111,7 +881,7 @@ static void early_failure(struct afb_xreq *xreq, const char *status, const char /* send error */ va_start(args, info); - afb_request_fail_v(xreq_to_request(xreq), status, info, args); + afb_req_x2_reply_v(xreq_to_req_x2(xreq), NULL, status, info, args); va_end(args); } @@ -1121,17 +891,17 @@ static void early_failure(struct afb_xreq *xreq, const char *status, const char */ void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset) { - const struct afb_api *api; + 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.api, 1); + 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.api, xreq->request.verb); + 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.api); + early_failure(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->request.called_api); goto end; } xreq->context.api_key = api; @@ -1140,10 +910,10 @@ void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset) if (api->group) { caller = xreq->caller; while (caller) { - if (((const struct afb_api *)caller->context.api_key)->group == api->group) { + 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.api); - early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->request.api); + 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; @@ -1162,3 +932,8 @@ end: afb_xreq_unhooked_unref(xreq); } +const char *xreq_on_behalf_cred_export(struct afb_xreq *xreq) +{ + return xreq->caller ? afb_cred_export(xreq->cred) : NULL; +} + |