X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=cd0b0866a0d24ed91f710c560b8046ee6ff1ba90;hb=052c3aee6362b2e33c060e0fbddd68439bb73dcb;hp=48503291f17aa9d42550e2a2b8d1318d7bbd14f9;hpb=3634c468ec7de94f6911c532a606625418fa5133;p=src%2Fapp-framework-binder.git diff --git a/src/afb-xreq.c b/src/afb-xreq.c index 48503291..cd0b0866 100644 --- a/src/afb-xreq.c +++ b/src/afb-xreq.c @@ -16,14 +16,16 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include +#include #include #include #include -#include +#include +#include #include "afb-context.h" #include "afb-xreq.h" @@ -33,23 +35,51 @@ #include "afb-hook.h" #include "afb-api.h" #include "afb-apiset.h" +#include "afb-auth.h" #include "jobs.h" #include "verbose.h" +/******************************************************************************/ + +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(void *closure) { struct afb_xreq *xreq = closure; - return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq)); + 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) { struct afb_xreq *xreq = closure; + struct afb_arg arg; + struct json_object *object, *value; + if (xreq->queryitf->get) - return xreq->queryitf->get(xreq, name); - else - return afb_msg_json_get_arg(xreq_json_cb(closure), name); + 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_success_cb(void *closure, struct json_object *obj, const char *info) @@ -79,26 +109,18 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info) 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)); + xreq->queryitf->reply(xreq, -1, afb_msg_json_reply_error(status, info, &xreq->context, NULL)); } } -static const char *xreq_raw_cb(void *closure, size_t *size) +static void xreq_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args) { - struct afb_xreq *xreq = closure; - const char *result = json_object_to_json_string(xreq_json_cb(xreq)); - if (size != NULL) - *size = strlen(result); - return result; + vinfo(closure, obj, fmt, args, (void*)xreq_success_cb); } -static void xreq_send_cb(void *closure, const char *buffer, size_t size) +static void xreq_vfail_cb(void *closure, const char *status, const char *fmt, va_list args) { - 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"); + vinfo(closure, (void*)status, fmt, args, (void*)xreq_fail_cb); } static void *xreq_context_get_cb(void *closure) @@ -177,18 +199,94 @@ static void xreq_subcall_cb(void *closure, const char *api, const char *verb, st { struct afb_xreq *xreq = closure; - if (xreq->queryitf->subcall) + if (xreq->queryitf->subcall) { xreq->queryitf->subcall(xreq, api, verb, args, callback, cb_closure); - else + json_object_put(args); + } else { afb_subcall(xreq, api, verb, args, callback, cb_closure); + } +} + +struct xreq_sync +{ + struct afb_xreq *caller; + const char *api; + const char *verb; + struct json_object *args; + struct jobloop *jobloop; + struct json_object *result; + int status; +}; + +static void xreq_sync_leave(struct xreq_sync *sync) +{ + struct jobloop *jobloop = sync->jobloop; + if (jobloop) { + sync->jobloop = NULL; + jobs_leave(jobloop); + } +} + +static void xreq_sync_reply(void *closure, int status, struct json_object *obj) +{ + struct xreq_sync *sync = closure; + + sync->status = status; + sync->result = json_object_get(obj); + xreq_sync_leave(sync); +} + +static void xreq_sync_enter(int signum, void *closure, struct jobloop *jobloop) +{ + struct xreq_sync *sync = closure; + + if (!signum) { + sync->jobloop = jobloop; + xreq_subcall_cb(sync->caller, sync->api, sync->verb, json_object_get(sync->args), xreq_sync_reply, sync); + } else { + sync->status = -1; + xreq_sync_leave(sync); + } } static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result) { + int rc; + struct xreq_sync sync; struct afb_xreq *xreq = closure; - return afb_subcall_sync(xreq, api, verb, args, result); + + sync.caller = xreq; + sync.api = api; + sync.verb = verb; + sync.args = args; + sync.jobloop = NULL; + sync.result = NULL; + sync.status = 0; + + rc = jobs_enter(NULL, 0, xreq_sync_enter, &sync); + json_object_put(args); + if (rc < 0 || sync.status < 0) { + *result = sync.result ? : afb_msg_json_internal_error(); + return -1; + } + *result = sync.result; + return 0; +} + +static void xreq_vverbose_cb(void*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); +} + +static struct afb_stored_req *xreq_store_cb(void *closure) +{ + xreq_addref_cb(closure); + return closure; } +/******************************************************************************/ + static struct json_object *xreq_hooked_json_cb(void *closure) { struct json_object *r = xreq_json_cb(closure); @@ -217,19 +315,14 @@ static void xreq_hooked_fail_cb(void *closure, const char *status, const char *i xreq_fail_cb(closure, status, info); } -static const char *xreq_hooked_raw_cb(void *closure, size_t *size) +static void xreq_hooked_vsuccess_cb(void *closure, struct json_object *obj, const char *fmt, va_list args) { - size_t s; - const char *r = xreq_raw_cb(closure, size ? : &s); - struct afb_xreq *xreq = closure; - return afb_hook_xreq_raw(xreq, r, *(size ? : &s)); + vinfo(closure, obj, fmt, args, (void*)xreq_hooked_success_cb); } -static void xreq_hooked_send_cb(void *closure, const char *buffer, size_t size) +static void xreq_hooked_vfail_cb(void *closure, const char *status, const char *fmt, va_list args) { - struct afb_xreq *xreq = closure; - afb_hook_xreq_send(xreq, buffer, size); - xreq_send_cb(closure, buffer, size); + vinfo(closure, (void*)status, fmt, args, (void*)xreq_hooked_fail_cb); } static void *xreq_hooked_context_get_cb(void *closure) @@ -298,12 +391,12 @@ struct reply void *closure; }; -static void xreq_hooked_subcall_reply_cb(void *closure, int iserror, struct json_object *result) +static void xreq_hooked_subcall_reply_cb(void *closure, int status, struct json_object *result) { struct reply *reply = closure; - afb_hook_xreq_subcall_result(reply->xreq, iserror, result); - reply->callback(reply->closure, iserror, result); + afb_hook_xreq_subcall_result(reply->xreq, status, result); + reply->callback(reply->closure, status, result); free(reply); } @@ -332,13 +425,33 @@ static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char 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) +{ + struct afb_xreq *xreq = 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_store_cb(void *closure) +{ + struct afb_xreq *xreq = closure; + struct afb_stored_req *r = xreq_store_cb(closure); + afb_hook_xreq_store(xreq, r); + return r; +} + +/******************************************************************************/ + const struct afb_req_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, + .vsuccess = xreq_vsuccess_cb, + .vfail = xreq_vfail_cb, .context_get = xreq_context_get_cb, .context_set = xreq_context_set_cb, .addref = xreq_addref_cb, @@ -348,7 +461,9 @@ const struct afb_req_itf xreq_itf = { .subscribe = xreq_subscribe_cb, .unsubscribe = xreq_unsubscribe_cb, .subcall = xreq_subcall_cb, - .subcallsync = xreq_subcallsync_cb + .subcallsync = xreq_subcallsync_cb, + .vverbose = xreq_vverbose_cb, + .store = xreq_store_cb }; const struct afb_req_itf xreq_hooked_itf = { @@ -356,8 +471,8 @@ const struct afb_req_itf xreq_hooked_itf = { .get = xreq_hooked_get_cb, .success = xreq_hooked_success_cb, .fail = xreq_hooked_fail_cb, - .raw = xreq_hooked_raw_cb, - .send = xreq_hooked_send_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, .addref = xreq_hooked_addref_cb, @@ -367,7 +482,9 @@ const struct afb_req_itf xreq_hooked_itf = { .subscribe = xreq_hooked_subscribe_cb, .unsubscribe = xreq_hooked_unsubscribe_cb, .subcall = xreq_hooked_subcall_cb, - .subcallsync = xreq_hooked_subcallsync_cb + .subcallsync = xreq_hooked_subcallsync_cb, + .vverbose = xreq_hooked_vverbose_cb, + .store = xreq_hooked_store_cb }; static inline struct afb_req to_req(struct afb_xreq *xreq) @@ -375,6 +492,21 @@ 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 }; } +/******************************************************************************/ + +struct afb_req 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 to_req(xreq); +} + +struct json_object *afb_xreq_json(struct afb_xreq *xreq) +{ + return afb_req_json(to_req(xreq)); +} + void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info) { afb_req_success(to_req(xreq), obj, info); @@ -411,7 +543,11 @@ void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size) { - return afb_req_raw(to_req(xreq), size); + struct json_object *obj = xreq_json_cb(xreq); + const char *result = json_object_to_json_string(obj); + if (size != NULL) + *size = strlen(result); + return result; } void afb_xreq_addref(struct afb_xreq *xreq) @@ -434,62 +570,110 @@ void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb, afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure); } -static int xcheck(struct afb_xreq *xreq, int sessionflags) +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); +} + +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); +} + +static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags) { - if ((sessionflags & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) { + int loa; + + if ((sessionflags & (AFB_SESSION_CLOSE_V1|AFB_SESSION_RENEW_V1|AFB_SESSION_CHECK_V1|AFB_SESSION_LOA_EQ_V1)) != 0) { if (!afb_context_check(&xreq->context)) { afb_context_close(&xreq->context); - afb_xreq_fail_f(xreq, "failed", "invalid token's identity"); - return 0; + afb_xreq_fail_f(xreq, "denied", "invalid token's identity"); + errno = EINVAL; + return -1; } } - if ((sessionflags & AFB_SESSION_CREATE) != 0) { - if (afb_context_check_loa(&xreq->context, 1)) { - afb_xreq_fail_f(xreq, "failed", "invalid creation state"); - return 0; + if ((sessionflags & AFB_SESSION_LOA_GE_V1) != 0) { + loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1; + if (!afb_context_check_loa(&xreq->context, loa)) { + afb_xreq_fail_f(xreq, "denied", "invalid LOA"); + errno = EPERM; + return -1; } - afb_context_change_loa(&xreq->context, 1); - afb_context_refresh(&xreq->context); } - if ((sessionflags & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0) - afb_context_refresh(&xreq->context); + if ((sessionflags & AFB_SESSION_LOA_LE_V1) != 0) { + loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1; + if (afb_context_check_loa(&xreq->context, loa + 1)) { + afb_xreq_fail_f(xreq, "denied", "invalid LOA"); + errno = EPERM; + return -1; + } + } - if ((sessionflags & AFB_SESSION_CLOSE) != 0) { + if ((sessionflags & AFB_SESSION_RENEW_V1) != 0) { + afb_context_refresh(&xreq->context); + } + if ((sessionflags & AFB_SESSION_CLOSE_V1) != 0) { afb_context_change_loa(&xreq->context, 0); afb_context_close(&xreq->context); } - if ((sessionflags & AFB_SESSION_LOA_GE) != 0) { - int loa = (sessionflags >> 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; + return 0; +} + +static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionflags, const struct afb_auth *auth) +{ + int loa; + + if (sessionflags != 0) { + if (!afb_context_check(&xreq->context)) { + afb_context_close(&xreq->context); + afb_xreq_fail_f(xreq, "denied", "invalid token's identity"); + errno = EINVAL; + return -1; } } - if ((sessionflags & AFB_SESSION_LOA_LE) != 0) { - int loa = (sessionflags >> 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; - } + loa = (int)(sessionflags & AFB_SESSION_LOA_MASK_V2); + if (loa && !afb_context_check_loa(&xreq->context, loa)) { + afb_xreq_fail_f(xreq, "denied", "invalid LOA"); + errno = EPERM; + return -1; + } + + if (auth && !afb_auth_check(auth, xreq)) { + afb_xreq_fail_f(xreq, "denied", "authorisation refused"); + errno = EPERM; + return -1; + } + + if ((sessionflags & AFB_SESSION_REFRESH_V2) != 0) { + afb_context_refresh(&xreq->context); } - return 1; + if ((sessionflags & AFB_SESSION_CLOSE_V2) != 0) { + afb_context_close(&xreq->context); + } + + return 0; } -void afb_xreq_so_call(struct afb_xreq *xreq, int sessionflags, void (*method)(struct afb_req req)) +void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb) { - if (xcheck(xreq, sessionflags)) - method(to_req(xreq)); + if (!verb) + afb_xreq_fail_unknown_verb(xreq); + else + if (!xreq_session_check_apply_v1(xreq, verb->session)) + verb->callback(to_req(xreq)); } -void afb_xreq_begin(struct afb_xreq *xreq) +void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb) { - afb_hook_init_xreq(xreq); - if (xreq->hookflags) - afb_hook_xreq_begin(xreq); + if (!verb) + afb_xreq_fail_unknown_verb(xreq); + else + if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth)) + verb->callback(to_req(xreq)); } void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf) @@ -499,27 +683,45 @@ void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *query xreq->queryitf = queryitf; } +void afb_xreq_fail_unknown_api(struct afb_xreq *xreq) +{ + afb_xreq_fail_f(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->api, xreq->verb); +} + +void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq) +{ + 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) +{ + 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); + } +} static void process_async(int signum, void *arg) { struct afb_xreq *xreq = arg; - struct afb_api api; if (signum != 0) { afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum); } else { - /* init hooking */ - afb_hook_init_xreq(xreq); - if (xreq->hookflags) - afb_hook_xreq_begin(xreq); - - /* search the api */ - if (afb_apiset_get(xreq->apiset, xreq->api, &api) < 0) { - afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api); - } else { - xreq->context.api_key = api.closure; - api.itf->call(api.closure, xreq); - } + process_sync(xreq); } afb_xreq_unref(xreq); }