X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=527692c674a0842655d1f76987f8ff47f675cb70;hb=6f1126ae2c585afc34d0bb06f3763e3a82ee3d37;hp=d6cf91fd12fbf926f5a8c8fbc4fb41eac8597088;hpb=8a5d14c58817b7ee03f8e22ba734fdd8cc2bc780;p=src%2Fapp-framework-binder.git diff --git a/src/afb-xreq.c b/src/afb-xreq.c index d6cf91fd..527692c6 100644 --- a/src/afb-xreq.c +++ b/src/afb-xreq.c @@ -16,7 +16,7 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include #include @@ -33,9 +33,11 @@ #include "afb-hook.h" #include "afb-api.h" #include "afb-apiset.h" +#include "afb-auth.h" #include "jobs.h" #include "verbose.h" +/******************************************************************************/ static struct json_object *xreq_json_cb(void *closure) { @@ -83,24 +85,6 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info) } } -static const char *xreq_raw_cb(void *closure, size_t *size) -{ - 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; -} - -static void xreq_send_cb(void *closure, const char *buffer, size_t size) -{ - 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"); -} - static void *xreq_context_get_cb(void *closure) { struct afb_xreq *xreq = closure; @@ -177,18 +161,82 @@ 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 iserror; +}; + +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 iserror, struct json_object *obj) +{ + struct xreq_sync *sync = closure; + + sync->iserror = iserror; + 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->iserror = 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.iserror = 1; + + rc = jobs_enter(NULL, 0, xreq_sync_enter, &sync); + json_object_put(args); + if (rc < 0 || sync.iserror) { + *result = sync.result ? : afb_msg_json_internal_error(); + return 0; + } + *result = sync.result; + return 1; } +/******************************************************************************/ + static struct json_object *xreq_hooked_json_cb(void *closure) { struct json_object *r = xreq_json_cb(closure); @@ -217,21 +265,6 @@ 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) -{ - 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)); -} - -static void xreq_hooked_send_cb(void *closure, const char *buffer, size_t size) -{ - struct afb_xreq *xreq = closure; - afb_hook_xreq_send(xreq, buffer, size); - xreq_send_cb(closure, buffer, size); -} - static void *xreq_hooked_context_get_cb(void *closure) { void *r = xreq_context_get_cb(closure); @@ -332,13 +365,13 @@ static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char return afb_hook_xreq_subcallsync_result(xreq, r, *result); } +/******************************************************************************/ + 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, .context_get = xreq_context_get_cb, .context_set = xreq_context_set_cb, .addref = xreq_addref_cb, @@ -356,8 +389,6 @@ 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, .context_get = xreq_hooked_context_get_cb, .context_set = xreq_hooked_context_set_cb, .addref = xreq_hooked_addref_cb, @@ -375,6 +406,8 @@ 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 json_object *afb_xreq_json(struct afb_xreq *xreq) { return afb_req_json(to_req(xreq)); @@ -416,7 +449,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) @@ -439,41 +476,51 @@ 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 xreq_session_check_apply(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) { int loa; - if ((sessionflags & (AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) { + 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"); + afb_xreq_fail_f(xreq, "denied", "invalid token's identity"); errno = EINVAL; return -1; } } - if ((sessionflags & AFB_SESSION_LOA_GE) != 0) { - loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK; + 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, "failed", "invalid LOA"); + afb_xreq_fail_f(xreq, "denied", "invalid LOA"); errno = EPERM; return -1; } } - if ((sessionflags & AFB_SESSION_LOA_LE) != 0) { - loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK; + 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, "failed", "invalid LOA"); + afb_xreq_fail_f(xreq, "denied", "invalid LOA"); errno = EPERM; return -1; } } - if ((sessionflags & AFB_SESSION_RENEW) != 0) { + if ((sessionflags & AFB_SESSION_RENEW_V1) != 0) { afb_context_refresh(&xreq->context); } - if ((sessionflags & AFB_SESSION_CLOSE) != 0) { + if ((sessionflags & AFB_SESSION_CLOSE_V1) != 0) { afb_context_change_loa(&xreq->context, 0); afb_context_close(&xreq->context); } @@ -481,12 +528,48 @@ static int xreq_session_check_apply(struct afb_xreq *xreq, int sessionflags) 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; + } + } + + 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); + } + if ((sessionflags & AFB_SESSION_CLOSE_V2) != 0) { + afb_context_close(&xreq->context); + } + + return 0; +} + 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); else - if (!xreq_session_check_apply(xreq, verb->session)) + if (!xreq_session_check_apply_v1(xreq, verb->session)) verb->callback(to_req(xreq)); } @@ -495,7 +578,7 @@ void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb if (!verb) afb_xreq_fail_unknown_verb(xreq); else - if (!xreq_session_check_apply(xreq, verb->session)) + if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth)) verb->callback(to_req(xreq)); } @@ -516,26 +599,32 @@ 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(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); + } +} + 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); }