*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdlib.h>
#include <stdio.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-context.h"
#include "afb-xreq.h"
/******************************************************************************/
-static inline void xreq_addref(struct afb_xreq *xreq)
+static void xreq_finalize(struct afb_xreq *xreq)
+{
+ if (!xreq->replied)
+ afb_xreq_fail(xreq, "error", "no reply");
+ if (xreq->hookflags)
+ afb_hook_xreq_end(xreq);
+ if (xreq->caller)
+ afb_xreq_unhooked_unref(xreq->caller);
+ xreq->queryitf->unref(xreq);
+}
+
+inline void afb_xreq_unhooked_addref(struct afb_xreq *xreq)
{
__atomic_add_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED);
}
-static inline void xreq_unref(struct afb_xreq *xreq)
+inline void afb_xreq_unhooked_unref(struct afb_xreq *xreq)
{
- if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
- if (!xreq->replied)
- afb_xreq_fail(xreq, "error", "no reply");
- if (xreq->hookflags)
- afb_hook_xreq_end(xreq);
- xreq->queryitf->unref(xreq);
- }
+ if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED))
+ xreq_finalize(xreq);
}
/******************************************************************************/
-extern const struct afb_req_itf xreq_itf;
-extern const struct afb_req_itf xreq_hooked_itf;
+static inline struct afb_request *to_request(struct afb_xreq *xreq)
+{
+ return &xreq->request;
+}
static inline struct afb_req to_req(struct afb_xreq *xreq)
{
- return (struct afb_req){ .itf = xreq->hookflags ? &xreq_hooked_itf : &xreq_itf, .closure = xreq };
+ return (struct afb_req){ .itf = xreq->request.itf, .closure = &xreq->request };
+}
+
+static inline struct afb_xreq *from_request(struct afb_request *request)
+{
+ return CONTAINER_OF(struct afb_xreq, request, request);
}
/******************************************************************************/
struct subcall
{
struct afb_xreq xreq;
- struct afb_xreq *caller;
- void (*callback)(void*, int, struct json_object*);
- void *closure;
+
+ void (*completion)(struct subcall*, int, struct json_object*);
+
union {
struct {
struct jobloop *jobloop;
void (*callback2)(void*, int, struct json_object*, struct afb_req);
};
void *closure;
- } hooked;
+ };
};
};
-static int subcall_subscribe(struct afb_xreq *xreq, struct afb_event event)
+static int subcall_subscribe_cb(struct afb_xreq *xreq, struct afb_event event)
{
struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
- return afb_xreq_subscribe(subcall->caller, event);
+ return afb_xreq_subscribe(subcall->xreq.caller, event);
}
-static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
+static int subcall_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event event)
{
struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
- return afb_xreq_unsubscribe(subcall->caller, event);
+ return afb_xreq_unsubscribe(subcall->xreq.caller, event);
}
-static void subcall_reply(struct afb_xreq *xreq, int status, struct json_object *obj)
+static void subcall_reply_cb(struct afb_xreq *xreq, int status, struct json_object *result)
{
struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
- if (subcall->callback)
- subcall->callback(subcall->closure, status, obj);
- json_object_put(obj);
+ subcall->completion(subcall, status, result);
+ json_object_put(result);
+ afb_xreq_unhooked_unref(&subcall->xreq);
}
-static void subcall_destroy(struct afb_xreq *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);
- xreq_unref(subcall->caller);
free(subcall);
}
const struct afb_xreq_query_itf afb_xreq_subcall_itf = {
- .reply = subcall_reply,
- .unref = subcall_destroy,
- .subscribe = subcall_subscribe,
- .unsubscribe = subcall_unsubscribe
+ .reply = subcall_reply_cb,
+ .unref = subcall_destroy_cb,
+ .subscribe = subcall_subscribe_cb,
+ .unsubscribe = subcall_unsubscribe_cb
};
static struct subcall *subcall_alloc(
subcall->xreq.json = args;
subcall->xreq.api = api;
subcall->xreq.verb = verb;
- subcall->caller = caller;
- xreq_addref(caller);
+ subcall->xreq.caller = caller;
+ afb_xreq_unhooked_addref(caller);
}
return subcall;
}
-static void subcall_process(struct subcall *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->callback2(subcall->closure, status, result, to_req(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_reply_direct_cb(void *closure, int status, struct json_object *result)
+{
+ 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.api, subcall->xreq.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->callback2 = callback;
+ subcall->closure = cb_closure;
+ subcall_process(subcall, subcall_req_on_reply);
+}
+
+static void subcall_hooked(struct subcall *subcall, void (*callback)(void*, int, struct json_object*), void *cb_closure)
{
- if (subcall->caller->queryitf->subcall) {
- subcall->caller->queryitf->subcall(
- subcall->caller, subcall->xreq.api, subcall->xreq.verb,
- subcall->xreq.json, subcall->callback, subcall->closure);
- xreq_unref(&subcall->xreq);
- } else
- afb_xreq_process(&subcall->xreq, subcall->caller->apiset);
+ 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->callback2 = callback;
+ subcall->closure = cb_closure;
+ subcall_process(subcall, subcall_req_hooked_on_reply);
}
static void subcall_sync_leave(struct subcall *subcall)
jobs_leave(jobloop);
}
-static void subcall_sync_reply(void *closure, int status, struct json_object *obj)
+static void subcall_sync_reply(struct subcall *subcall, int status, struct json_object *result)
{
- struct subcall *subcall = closure;
-
subcall->status = status;
- subcall->result = json_object_get(obj);
+ subcall->result = json_object_get(result);
subcall_sync_leave(subcall);
}
if (!signum) {
subcall->jobloop = jobloop;
- subcall_process(subcall);
+ 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*))
/******************************************************************************/
-static struct json_object *xreq_json_cb(void *closure)
+static struct json_object *xreq_json_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_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(void *closure, const char *name)
+static struct afb_arg xreq_get_cb(struct afb_request *closure, const char *name)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct afb_arg arg;
struct json_object *object, *value;
return arg;
}
-static void xreq_success_cb(void *closure, struct json_object *obj, const char *info)
+static void xreq_success_cb(struct afb_request *closure, struct json_object *obj, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
if (xreq->replied) {
ERROR("reply called more than one time!!");
}
}
-static void xreq_fail_cb(void *closure, const char *status, const char *info)
+static void xreq_fail_cb(struct afb_request *closure, const char *status, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
if (xreq->replied) {
ERROR("reply called more than one time!!");
}
}
-static void xreq_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
+static void xreq_vsuccess_cb(struct afb_request *closure, struct json_object *obj, const char *fmt, va_list args)
{
vinfo(closure, obj, fmt, args, (void*)xreq_success_cb);
}
-static void xreq_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
+static void xreq_vfail_cb(struct afb_request *closure, const char *status, const char *fmt, va_list args)
{
vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb);
}
-static void *xreq_context_get_cb(void *closure)
+static void *xreq_context_get_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_context_get(&xreq->context);
}
-static void xreq_context_set_cb(void *closure, void *value, void (*free_value)(void*))
+static void xreq_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*))
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_context_set(&xreq->context, value, free_value);
}
-static void xreq_addref_cb(void *closure)
+static void xreq_addref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
- xreq_addref(xreq);
+ struct afb_xreq *xreq = from_request(closure);
+ afb_xreq_unhooked_addref(xreq);
}
-static void xreq_unref_cb(void *closure)
+static void xreq_unref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
- xreq_unref(xreq);
+ struct afb_xreq *xreq = from_request(closure);
+ afb_xreq_unhooked_unref(xreq);
}
-static void xreq_session_close_cb(void *closure)
+static void xreq_session_close_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_context_close(&xreq->context);
}
-static int xreq_session_set_LOA_cb(void *closure, unsigned level)
+static int xreq_session_set_LOA_cb(struct afb_request *closure, unsigned level)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_context_change_loa(&xreq->context, level);
}
-static int xreq_subscribe_cb(void *closure, struct afb_event event)
+static int xreq_subscribe_cb(struct afb_request *closure, struct afb_event event)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_xreq_subscribe(xreq, event);
}
return -1;
}
-static int xreq_unsubscribe_cb(void *closure, struct afb_event event)
+static int xreq_unsubscribe_cb(struct afb_request *closure, struct afb_event event)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_xreq_unsubscribe(xreq, event);
}
return -1;
}
-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 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)
{
- struct afb_xreq *xreq = closure;
- struct subcall *subcall;
+ struct afb_xreq *xreq = from_request(closure);
+ struct subcall *sc;
- subcall = subcall_alloc(xreq, api, verb, args);
- if (subcall == NULL) {
+ 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->callback = callback;
- subcall->closure = cb_closure;
- subcall_process(subcall);
+ subcall(sc, callback, cb_closure);
}
}
-static void xreq_subcall_req_reply_cb(void *closure, int status, struct json_object *result)
-{
- struct subcall *subcall = closure;
- subcall->hooked.callback2(subcall->hooked.closure, status, result, to_req(subcall->caller));
-}
-
-static void xreq_subcall_req_cb(void *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_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)
{
- struct afb_xreq *xreq = closure;
- struct subcall *subcall;
+ struct afb_xreq *xreq = from_request(closure);
+ struct subcall *sc;
- subcall = subcall_alloc(xreq, api, verb, args);
- if (subcall == NULL) {
+ sc = subcall_alloc(xreq, api, verb, args);
+ if (sc == NULL) {
if (callback)
callback(cb_closure, 1, afb_msg_json_internal_error(), to_req(xreq));
json_object_put(args);
} else {
- subcall->callback = xreq_subcall_req_reply_cb;
- subcall->closure = subcall;
- subcall->hooked.callback2 = callback;
- subcall->hooked.closure = cb_closure;
- subcall_process(subcall);
+ subcall_req(sc, callback, cb_closure);
}
}
-static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+static int xreq_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
{
int rc;
- struct subcall *subcall;
- struct afb_xreq *xreq = closure;
+ struct subcall *sc;
+ struct afb_xreq *xreq = from_request(closure);
struct json_object *resu;
- subcall = subcall_alloc(xreq, api, verb, args);
- if (!subcall) {
+ sc = subcall_alloc(xreq, api, verb, args);
+ if (!sc) {
rc = -1;
resu = afb_msg_json_internal_error();
json_object_put(args);
} else {
- subcall->callback = subcall_sync_reply;
- subcall->closure = subcall;
- subcall->jobloop = NULL;
- subcall->result = NULL;
- subcall->status = 0;
- rc = jobs_enter(NULL, 0, subcall_sync_enter, subcall);
- resu = subcall->result;
- if (rc < 0 || subcall->status < 0) {
- resu = resu ?: afb_msg_json_internal_error();
- rc = -1;
- }
+ rc = subcallsync(sc, &resu);
}
if (result)
*result = resu;
return rc;
}
-static void xreq_vverbose_cb(void*closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+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)
{
- /* TODO: improves the implementation. example: on condition make a list of log messages that will be returned */
- vverbose(level, file, line, func, fmt, args);
+ char *p;
+ struct afb_xreq *xreq = from_request(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->api, p);
+ free(p);
+ }
}
-static struct afb_stored_req *xreq_store_cb(void *closure)
+static struct afb_stored_req *xreq_store_cb(struct afb_request *closure)
{
xreq_addref_cb(closure);
- return closure;
+ return (struct afb_stored_req*)closure;
+}
+
+static int xreq_has_permission_cb(struct afb_request *closure, const char *permission)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_auth_has_permission(xreq, permission);
+}
+
+static char *xreq_get_application_id_cb(struct afb_request *closure)
+{
+ struct afb_xreq *xreq = from_request(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)
+{
+ struct afb_xreq *xreq = from_request(closure);
+ return afb_context_make(&xreq->context, replace, create_value, free_value, create_closure);
}
/******************************************************************************/
-static struct json_object *xreq_hooked_json_cb(void *closure)
+static struct json_object *xreq_hooked_json_cb(struct afb_request *closure)
{
struct json_object *r = xreq_json_cb(closure);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_json(xreq, r);
}
-static struct afb_arg xreq_hooked_get_cb(void *closure, const char *name)
+static struct afb_arg xreq_hooked_get_cb(struct afb_request *closure, const char *name)
{
struct afb_arg r = xreq_get_cb(closure, name);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_get(xreq, name, r);
}
-static void xreq_hooked_success_cb(void *closure, struct json_object *obj, const char *info)
+static void xreq_hooked_success_cb(struct afb_request *closure, struct json_object *obj, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_success(xreq, obj, info);
xreq_success_cb(closure, obj, info);
}
-static void xreq_hooked_fail_cb(void *closure, const char *status, const char *info)
+static void xreq_hooked_fail_cb(struct afb_request *closure, const char *status, const char *info)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_fail(xreq, status, info);
xreq_fail_cb(closure, status, info);
}
-static void xreq_hooked_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args)
+static void xreq_hooked_vsuccess_cb(struct afb_request *closure, struct json_object *obj, const char *fmt, va_list args)
{
vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb);
}
-static void xreq_hooked_vfail_cb(void *closure, const char *status, const char *fmt, va_list args)
+static void xreq_hooked_vfail_cb(struct afb_request *closure, const char *status, const char *fmt, va_list args)
{
vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb);
}
-static void *xreq_hooked_context_get_cb(void *closure)
+static void *xreq_hooked_context_get_cb(struct afb_request *closure)
{
void *r = xreq_context_get_cb(closure);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_context_get(xreq, r);
}
-static void xreq_hooked_context_set_cb(void *closure, void *value, void (*free_value)(void*))
+static void xreq_hooked_context_set_cb(struct afb_request *closure, void *value, void (*free_value)(void*))
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_context_set(xreq, value, free_value);
xreq_context_set_cb(closure, value, free_value);
}
-static void xreq_hooked_addref_cb(void *closure)
+static void xreq_hooked_addref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_addref(xreq);
xreq_addref_cb(closure);
}
-static void xreq_hooked_unref_cb(void *closure)
+static void xreq_hooked_unref_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_unref(xreq);
xreq_unref_cb(closure);
}
-static void xreq_hooked_session_close_cb(void *closure)
+static void xreq_hooked_session_close_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
afb_hook_xreq_session_close(xreq);
xreq_session_close_cb(closure);
}
-static int xreq_hooked_session_set_LOA_cb(void *closure, unsigned level)
+static int xreq_hooked_session_set_LOA_cb(struct afb_request *closure, unsigned level)
{
int r = xreq_session_set_LOA_cb(closure, level);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_session_set_LOA(xreq, level, r);
}
-static int xreq_hooked_subscribe_cb(void *closure, struct afb_event event)
+static int xreq_hooked_subscribe_cb(struct afb_request *closure, struct afb_event event)
{
int r = xreq_subscribe_cb(closure, event);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_subscribe(xreq, event, r);
}
-static int xreq_hooked_unsubscribe_cb(void *closure, struct afb_event event)
+static int xreq_hooked_unsubscribe_cb(struct afb_request *closure, struct afb_event event)
{
int r = xreq_unsubscribe_cb(closure, event);
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
return afb_hook_xreq_unsubscribe(xreq, event, r);
}
-static void xreq_hooked_subcall_reply_cb(void *closure, int status, struct json_object *result)
+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)
{
- struct subcall *subcall = closure;
-
- afb_hook_xreq_subcall_result(subcall->caller, status, result);
- subcall->hooked.callback(subcall->hooked.closure, status, result);
-}
-
-static void xreq_hooked_subcall_cb(void *closure, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
-{
- struct afb_xreq *xreq = closure;
- struct subcall *subcall;
+ struct afb_xreq *xreq = from_request(closure);
+ struct subcall *sc;
afb_hook_xreq_subcall(xreq, api, verb, args);
- subcall = subcall_alloc(xreq, api, verb, args);
- if (subcall == NULL) {
+ 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->callback = xreq_hooked_subcall_reply_cb;
- subcall->closure = subcall;
- subcall->hooked.callback = callback;
- subcall->hooked.closure = cb_closure;
- subcall_process(subcall);
+ subcall_hooked(sc, callback, cb_closure);
}
}
-static void xreq_hooked_subcall_req_reply_cb(void *closure, int status, struct json_object *result)
-{
- struct subcall *subcall = closure;
-
- afb_hook_xreq_subcall_req_result(subcall->caller, status, result);
- subcall->hooked.callback2(subcall->hooked.closure, status, result, to_req(subcall->caller));
-}
-
-static void xreq_hooked_subcall_req_cb(void *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_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)
{
- struct afb_xreq *xreq = closure;
- struct subcall *subcall;
+ struct afb_xreq *xreq = from_request(closure);
+ struct subcall *sc;
afb_hook_xreq_subcall_req(xreq, api, verb, args);
- subcall = subcall_alloc(xreq, api, verb, args);
- if (subcall == NULL) {
+ sc = subcall_alloc(xreq, api, verb, args);
+ if (sc == NULL) {
if (callback)
callback(cb_closure, 1, afb_msg_json_internal_error(), to_req(xreq));
json_object_put(args);
} else {
- subcall->callback = xreq_hooked_subcall_req_reply_cb;
- subcall->closure = subcall;
- subcall->hooked.callback2 = callback;
- subcall->hooked.closure = cb_closure;
- subcall_process(subcall);
+ subcall_req_hooked(sc, callback, cb_closure);
}
}
-static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+static int xreq_hooked_subcallsync_cb(struct afb_request *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
{
int r;
- struct afb_xreq *xreq = closure;
+ struct afb_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);
}
-static void xreq_hooked_vverbose_cb(void*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_request *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
va_list ap;
va_copy(ap, args);
xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
va_end(ap);
}
-static struct afb_stored_req *xreq_hooked_store_cb(void *closure)
+static struct afb_stored_req *xreq_hooked_store_cb(struct afb_request *closure)
{
- struct afb_xreq *xreq = closure;
+ struct afb_xreq *xreq = from_request(closure);
struct afb_stored_req *r = xreq_store_cb(closure);
afb_hook_xreq_store(xreq, r);
return r;
}
+static int xreq_hooked_has_permission_cb(struct afb_request *closure, const char *permission)
+{
+ struct afb_xreq *xreq = from_request(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)
+{
+ struct afb_xreq *xreq = from_request(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)
+{
+ struct afb_xreq *xreq = from_request(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);
+}
+
/******************************************************************************/
-const struct afb_req_itf xreq_itf = {
+const struct afb_request_itf xreq_itf = {
.json = xreq_json_cb,
.get = xreq_get_cb,
.success = xreq_success_cb,
.subcallsync = xreq_subcallsync_cb,
.vverbose = xreq_vverbose_cb,
.store = xreq_store_cb,
- .subcall_req = xreq_subcall_req_cb
+ .subcall_req = xreq_subcall_req_cb,
+ .has_permission = xreq_has_permission_cb,
+ .get_application_id = xreq_get_application_id_cb,
+ .context_make = xreq_context_make_cb
};
-const struct afb_req_itf xreq_hooked_itf = {
+const struct afb_request_itf xreq_hooked_itf = {
.json = xreq_hooked_json_cb,
.get = xreq_hooked_get_cb,
.success = xreq_hooked_success_cb,
.subcallsync = xreq_hooked_subcallsync_cb,
.vverbose = xreq_hooked_vverbose_cb,
.store = xreq_hooked_store_cb,
- .subcall_req = xreq_hooked_subcall_req_cb
+ .subcall_req = xreq_hooked_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
};
/******************************************************************************/
struct json_object *afb_xreq_json(struct afb_xreq *xreq)
{
- return afb_req_json(to_req(xreq));
+ return afb_request_json(to_request(xreq));
}
void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
{
- afb_req_success(to_req(xreq), obj, info);
+ afb_request_success(to_request(xreq), obj, info);
}
void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...)
{
- char *message;
va_list args;
+
va_start(args, info);
- if (info == NULL || vasprintf(&message, info, args) < 0)
- message = NULL;
+ afb_request_success_v(to_request(xreq), obj, info, args);
va_end(args);
- afb_xreq_success(xreq, obj, message);
- free(message);
}
void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info)
{
- afb_req_fail(to_req(xreq), status, info);
+ afb_request_fail(to_request(xreq), status, info);
}
void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...)
{
- char *message;
va_list args;
+
va_start(args, info);
- if (info == NULL || vasprintf(&message, info, args) < 0)
- message = NULL;
+ afb_request_fail_v(to_request(xreq), status, info, args);
va_end(args);
- afb_xreq_fail(xreq, status, message);
- free(message);
+
}
const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
{
- struct json_object *obj = xreq_json_cb(xreq);
+ struct json_object *obj = xreq_json_cb(to_request(xreq));
const char *result = json_object_to_json_string(obj);
if (size != NULL)
*size = strlen(result);
void afb_xreq_addref(struct afb_xreq *xreq)
{
- afb_req_addref(to_req(xreq));
+ afb_request_addref(to_request(xreq));
}
void afb_xreq_unref(struct afb_xreq *xreq)
{
- afb_req_unref(to_req(xreq));
+ afb_request_unref(to_request(xreq));
}
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*), void *cb_closure)
{
- xreq_subcall_cb(xreq, api, verb, args, callback, cb_closure);
+ xreq_subcall_cb(to_request(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, void (*callback)(void*, int, struct json_object*), void *cb_closure)
{
- afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
+ afb_request_subcall(to_request(xreq), api, verb, args, callback, cb_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)
{
- return xreq_subcallsync_cb(xreq, api, verb, args, result);
+ return xreq_subcallsync_cb(to_request(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)
{
- return afb_req_subcall_sync(to_req(xreq), api, verb, args, result);
+ return afb_request_subcall_sync(to_request(xreq), api, verb, args, result);
}
static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
return -1;
}
- if (auth && !afb_auth_check(auth, xreq)) {
+ if (auth && !afb_auth_check(xreq, auth)) {
afb_xreq_fail_f(xreq, "denied", "authorisation refused");
errno = EPERM;
return -1;
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->refcount = 1;
xreq->queryitf = queryitf;
}
afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, xreq->api);
}
-static void process_sync(struct afb_xreq *xreq)
+static void init_hooking(struct afb_xreq *xreq)
{
- struct afb_api api;
-
- /* init hooking */
afb_hook_init_xreq(xreq);
if (xreq->hookflags)
afb_hook_xreq_begin(xreq);
-
- /* search the api */
- if (afb_apiset_get_started(xreq->apiset, xreq->api, &api) < 0) {
- if (errno == ENOENT)
- afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
- else
- afb_xreq_fail_f(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->api);
- } else {
- xreq->context.api_key = api.closure;
- api.itf->call(api.closure, xreq);
- }
+ else
+ xreq->request.itf = &xreq_itf; /* unhook the interface */
}
+/**
+ * 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 *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);
} else {
- process_sync(xreq);
+ /* init hooking */
+ init_hooking(xreq);
+ /* invoke api call method to process the reqiest */
+ api = (const struct afb_api*)xreq->context.api_key;
+ api->itf->call(api->closure, xreq);
}
- xreq_unref(xreq);
+ /* release the request */
+ afb_xreq_unhooked_unref(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, ...)
+{
+ va_list args;
+
+ /* init hooking */
+ init_hooking(xreq);
+
+ /* send error */
+ va_start(args, info);
+ afb_request_fail_v(to_request(xreq), 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 *api;
+ struct afb_xreq *caller;
+
+ /* lookup at the api */
xreq->apiset = apiset;
+ api = afb_apiset_lookup_started(apiset, xreq->api, 1);
+ if (!api) {
+ if (errno == ENOENT)
+ early_failure(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->api, xreq->verb);
+ else
+ early_failure(xreq, "bad-api-state", "api %s not started correctly: %m", xreq->api);
+ goto end;
+ }
+ xreq->context.api_key = api;
+
+ /* check self locking */
+ if (api->group) {
+ caller = xreq->caller;
+ while (caller) {
+ if (((const struct afb_api *)caller->context.api_key)->group == api->group) {
+ /* noconcurrency lock detected */
+ ERROR("self-lock detected in call stack for API %s", xreq->api);
+ early_failure(xreq, "self-locked", "recursive self lock, API %s", xreq->api);
+ goto end;
+ }
+ caller = caller->caller;
+ }
+ }
- xreq_addref(xreq);
- if (jobs_queue(NULL, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
+ /* 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");
- afb_xreq_fail_f(xreq, "cancelled", "not able to create a job for the task");
- xreq_unref(xreq);
+ early_failure(xreq, "cancelled", "not able to create a job for the task");
+ afb_xreq_unhooked_unref(xreq);
}
- xreq_unref(xreq);
+end:
+ afb_xreq_unhooked_unref(xreq);
}
Code Review / src / app-framework-binder.git / blobdiff