X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=11fa334bd515d7119f1b7a0e2c3f85813dbc1223;hb=4db507f7d53a09cf3f572dedcc304f334970ce06;hp=120747465d9df3cb03b5dd4c12732cf50634d537;hpb=f2995647f0f79e816c7f46033e1ec824185732b5;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c index 12074746..11fa334b 100644 --- a/src/afb-api-so-v2.c +++ b/src/afb-api-so-v2.c @@ -16,16 +16,18 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO +#include #include #include #include -#include +#include #include #include "afb-api.h" +#include "afb-api-so-v2.h" #include "afb-apiset.h" #include "afb-svc.h" #include "afb-ditf.h" @@ -34,52 +36,34 @@ #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" -#include "afb-perm.h" +#include "jobs.h" #include "verbose.h" /* * names of symbols */ static const char afb_api_so_v2_descriptor[] = "afbBindingV2"; - -/** - * structure for memorizing verbs sorted with permissions - */ -struct verb_v2 { - const struct afb_verb_v2 *verb; - struct afb_perm *perm; -}; +static const char afb_api_so_v2_data[] = "afbBindingV2data"; /* * Description of a binding */ struct api_so_v2 { const struct afb_binding_v2 *binding; /* descriptor */ + struct afb_binding_data_v2 *data; /* data */ void *handle; /* context of dlopen */ struct afb_svc *service; /* handler for service started */ struct afb_ditf ditf; /* daemon interface */ - int count; - struct verb_v2 verbs[1]; }; -static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb) +static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *name) { - const struct afb_verb_v2 *v; - int i, l, u, c; - - l = 0; - u = desc->count; - while (l < u) { - i = (l + u) >> 1; - v = desc->verbs[i].verb; - c = strcasecmp(v->verb, verb); - if (c == 0) - return v; - if (c < 0) - l = i + 1; - else - u = i; - } + const struct afb_verb_v2 *verb; + + verb = desc->binding->verbs; + while (verb->verb && strcasecmp(verb->verb, name)) + verb++; + return verb->verb ? verb : NULL; return NULL; } @@ -89,16 +73,37 @@ static void call_cb(void *closure, struct afb_xreq *xreq) const struct afb_verb_v2 *verb; verb = search(desc, xreq->verb); - if (!verb) - afb_xreq_fail_unknown_verb(xreq); - else - if (!xreq_session_check_apply(xreq, verb->session)) - afb_xreq_call(xreq, verb->callback); + afb_xreq_call_verb_v2(xreq, verb); +} + +struct call_sync +{ + struct api_so_v2 *desc; + struct afb_xreq *xreq; +}; + +static void call_sync_cb_cb(int signum, void *closure) +{ + struct call_sync *cs = closure; + if (!signum) + call_cb(cs->desc, cs->xreq); + else { + if (!cs->xreq->replied) + afb_xreq_fail(cs->xreq, "aborted", "internal error"); + } +} + +static void call_sync_cb(void *closure, struct afb_xreq *xreq) +{ + struct call_sync cs = { .desc = closure, .xreq = xreq }; + + if (jobs_call(closure, 0, call_sync_cb_cb, &cs)) + call_cb(closure, xreq); } static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) { - int (*start)(const struct afb_binding_interface *interface, struct afb_service service); + int (*start)(); void (*onevent)(const char *event, struct json_object *object); struct api_so_v2 *desc = closure; @@ -115,8 +120,9 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct } /* get the initialisation */ - start = desc->binding->start; - if (start == NULL) { + start = desc->binding->init; + onevent = desc->binding->onevent; + if (start == NULL && onevent == NULL) { /* not an error when onneed */ if (onneed != 0) return 0; @@ -127,8 +133,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct } /* get the event handler if any */ - onevent = desc->binding->onevent; - desc->service = afb_svc_create_v2(apiset, share_session, onevent, start, &desc->ditf.interface); + desc->service = afb_svc_create_v2(desc->binding->api, apiset, share_session, start, onevent, desc->data); if (desc->service == NULL) { /* starting error */ ERROR("Starting service %s failed", desc->binding->api); @@ -147,19 +152,108 @@ static void update_hooks_cb(void *closure) static int get_verbosity_cb(void *closure) { struct api_so_v2 *desc = closure; - return desc->ditf.interface.verbosity; + return desc->data->verbosity; } static void set_verbosity_cb(void *closure, int level) { struct api_so_v2 *desc = closure; - desc->ditf.interface.verbosity = level; + desc->data->verbosity = level; +} + +static struct json_object *addperm(struct json_object *o, struct json_object *x) +{ + struct json_object *a; + + if (!o) + return x; + + if (!json_object_object_get_ex(o, "allOf", &a)) { + a = json_object_new_array(); + json_object_array_add(a, o); + o = json_object_new_object(); + json_object_object_add(o, "allOf", a); + } + json_object_array_add(a, x); + return o; +} + +static struct json_object *addperm_key_val(struct json_object *o, const char *key, struct json_object *val) +{ + struct json_object *x = json_object_new_object(); + json_object_object_add(x, key, val); + return addperm(o, x); +} + +static struct json_object *addperm_key_valstr(struct json_object *o, const char *key, const char *val) +{ + return addperm_key_val(o, key, json_object_new_string(val)); +} + +static struct json_object *addperm_key_valint(struct json_object *o, const char *key, int val) +{ + return addperm_key_val(o, key, json_object_new_int(val)); +} + +static struct json_object *make_description(struct api_so_v2 *desc) +{ + char buffer[256]; + const struct afb_verb_v2 *verb; + struct json_object *r, *f, *a, *i, *p, *g; + + r = json_object_new_object(); + json_object_object_add(r, "openapi", json_object_new_string("3.0.0")); + + i = json_object_new_object(); + json_object_object_add(r, "info", i); + json_object_object_add(i, "title", json_object_new_string(desc->binding->api)); + json_object_object_add(i, "version", json_object_new_string("0.0.0")); + + p = json_object_new_object(); + json_object_object_add(r, "paths", p); + verb = desc->binding->verbs; + while (verb->verb) { + buffer[0] = '/'; + strncpy(buffer + 1, verb->verb, sizeof buffer - 1); + buffer[sizeof buffer - 1] = 0; + f = json_object_new_object(); + json_object_object_add(p, buffer, f); + g = json_object_new_object(); + json_object_object_add(f, "get", g); + + a = NULL; + if (verb->session & AFB_SESSION_CLOSE_V2) + a = addperm_key_valstr(a, "session", "close"); + if (verb->session & AFB_SESSION_CHECK_V2) + a = addperm_key_valstr(a, "session", "check"); + if (verb->session & AFB_SESSION_REFRESH_V2) + a = addperm_key_valstr(a, "token", "refresh"); + if (verb->session & AFB_SESSION_LOA_MASK_V2) + a = addperm_key_valint(a, "LOA", verb->session & AFB_SESSION_LOA_MASK_V2); +#if 0 + if (verb->auth) + a = +#endif + if (a) + json_object_object_add(g, "x-permissions", a); + + a = json_object_new_object(); + json_object_object_add(g, "responses", a); + f = json_object_new_object(); + json_object_object_add(a, "200", f); + json_object_object_add(f, "description", json_object_new_string(verb->verb)); + verb++; + } + return r; } static struct json_object *describe_cb(void *closure) { struct api_so_v2 *desc = closure; - return desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL; + struct json_object *r = desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL; + if (!r) + r = make_description(desc); + return r; } static struct afb_api_itf so_v2_api_itf = { @@ -169,92 +263,65 @@ static struct afb_api_itf so_v2_api_itf = { .get_verbosity = get_verbosity_cb, .set_verbosity = set_verbosity_cb, .describe = describe_cb +}; +static struct afb_api_itf so_v2_sync_api_itf = { + .call = call_sync_cb, + .service_start = service_start_cb, + .update_hooks = update_hooks_cb, + .get_verbosity = get_verbosity_cb, + .set_verbosity = set_verbosity_cb, + .describe = describe_cb }; -int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset) +int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, struct afb_binding_data_v2 *data) { int rc; struct api_so_v2 *desc; struct afb_api afb_api; - const struct afb_verb_v2 *bv; - int count, i, j; /* basic checks */ + assert(binding); assert(binding->api); - assert(binding->specification); assert(binding->verbs); - - /* count the verbs */ - count = 0; - while (binding->verbs[count].verb) - count++; + assert(data); /* allocates the description */ - desc = malloc(sizeof *desc + (count - 1) * sizeof desc->verbs); + desc = calloc(1, sizeof *desc); if (desc == NULL) { ERROR("out of memory"); goto error; } desc->binding = binding; + desc->data = data; desc->handle = handle; desc->service = NULL; - memset(&desc->ditf, 0, sizeof desc->ditf); - desc->count = count; - - /* fill the verbs sorted */ - for (i = 0 ; i < count ; i++) { - desc->verbs[i].perm = NULL; - j = i; - bv = &binding->verbs[j]; - while (j && strcasecmp(bv->verb, desc->verbs[j-1].verb->verb) < 0) { - desc->verbs[j].verb = desc->verbs[j-1].verb; - j--; - } - desc->verbs[j].verb = bv; - } - - /* makes the permissions */ - for (i = 0 ; i < count ; i++) { - if (desc->verbs[i].verb->permissions) { - desc->verbs[i].perm = afb_perm_parse(desc->verbs[i].verb->permissions); - if (!desc->verbs[i].perm) { - ERROR("Bad permission specification for verb %s of api %s: %s", - desc->verbs[i].verb->verb, binding->api, - desc->verbs[i].verb->permissions); - goto error2; - } - } - } /* init the interface */ - afb_ditf_init(&desc->ditf, binding->api); + desc->data->verbosity = verbosity; + afb_ditf_init_v2(&desc->ditf, binding->api, data); /* init the binding */ - if (binding->init) { - INFO("binding %s calling init function", binding->api); - rc = binding->init(&desc->ditf.interface); + if (binding->preinit) { + INFO("binding %s calling preinit function", binding->api); + rc = binding->preinit(); if (rc < 0) { - ERROR("binding %s initialisation function failed...", binding->api); + ERROR("binding %s preinit function failed...", binding->api); goto error2; } } /* records the binding */ afb_api.closure = desc; - afb_api.itf = &so_v2_api_itf; + afb_api.itf = binding->noconcurrency ? &so_v2_sync_api_itf : &so_v2_api_itf; if (afb_apiset_add(apiset, binding->api, afb_api) < 0) { ERROR("binding %s can't be registered to set %s...", binding->api, afb_apiset_name(apiset)); goto error2; } - NOTICE("binding %s added to set %s", binding->api, afb_apiset_name(apiset)); + INFO("binding %s added to set %s", binding->api, afb_apiset_name(apiset)); return 1; error2: - count = desc->count; - while (count) - if (desc->verbs[--count].perm) - afb_perm_unref(desc->verbs[count].perm); free(desc); error: return -1; @@ -263,15 +330,22 @@ error: int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset) { const struct afb_binding_v2 *binding; + struct afb_binding_data_v2 *data; /* retrieves the register function */ binding = dlsym(handle, afb_api_so_v2_descriptor); - if (!binding) + data = dlsym(handle, afb_api_so_v2_data); + if (!binding && !data) return 0; INFO("binding [%s] looks like an AFB binding V2", path); /* basic checks */ + if (!binding || !data) { + ERROR("binding [%s] incomplete symbol set: %s is missing", + path, binding ? afb_api_so_v2_data : afb_api_so_v2_descriptor); + goto error; + } if (binding->api == NULL || *binding->api == 0) { ERROR("binding [%s] bad api name...", path); goto error; @@ -280,16 +354,18 @@ int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset) ERROR("binding [%s] invalid api name...", path); goto error; } +#if 0 if (binding->specification == NULL || *binding->specification == 0) { ERROR("binding [%s] bad specification...", path); goto error; } +#endif if (binding->verbs == NULL) { ERROR("binding [%s] no verbs...", path); goto error; } - return afb_api_so_v2_add_binding(binding, handle, apiset); + return afb_api_so_v2_add_binding(binding, handle, apiset, data); error: return -1;