X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=c77ab72487ea4a123969d1215a83356e85ccdb82;hb=3e3a29fa49ec494800a4aa866d84fba4eaa8261b;hp=8c4ea484a0a356dab1464287918276c920d71694;hpb=a8e971702f23ee67e02b4716ad4159f12cefdca6;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index 8c4ea484..c77ab724 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -16,23 +16,24 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#include #include #include #include -#include +#include + +#include #include "afb-api.h" +#include "afb-api-so-v1.h" #include "afb-apiset.h" -#include "afb-svc.h" -#include "afb-evt.h" +#include "afb-export.h" #include "afb-common.h" #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" -#include "afb-ditf.h" #include "verbose.h" /* @@ -46,10 +47,9 @@ static const char afb_api_so_v1_service_event[] = "afbBindingV1ServiceEvent"; * Description of a binding */ struct api_so_v1 { - struct afb_binding *binding; /* descriptor */ + struct afb_binding_v1 *binding; /* descriptor */ void *handle; /* context of dlopen */ - struct afb_svc *service; /* handler for service started */ - struct afb_ditf ditf; /* daemon interface */ + struct afb_export *export; /* export */ }; static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name) @@ -67,71 +67,123 @@ static void call_cb(void *closure, struct afb_xreq *xreq) const struct afb_verb_desc_v1 *verb; struct api_so_v1 *desc = closure; - verb = search(desc, xreq->verb); - if (!verb) - afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->v1.prefix); - else - afb_xreq_so_call(xreq, verb->session, verb->callback); + xreq->request.dynapi = (void*)desc->export; /* hack: this avoids to export afb_export structure */ + verb = search(desc, xreq->request.verb); + afb_xreq_call_verb_v1(xreq, verb); } static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) { - int (*init)(struct afb_service service); - void (*onevent)(const char *event, struct json_object *object); + struct api_so_v1 *desc = closure; + return afb_export_start(desc->export, share_session, onneed, apiset); +} +static void update_hooks_cb(void *closure) +{ struct api_so_v1 *desc = closure; + afb_export_update_hook(desc->export); +} - /* check state */ - if (desc->service != NULL) { - /* not an error when onneed */ - if (onneed != 0) - return 0; +static int get_verbosity_cb(void *closure) +{ + struct api_so_v1 *desc = closure; + return afb_export_verbosity_get(desc->export); +} - /* already started: it is an error */ - ERROR("Service %s already started", desc->binding->v1.prefix); - return -1; - } +static void set_verbosity_cb(void *closure, int level) +{ + struct api_so_v1 *desc = closure; + afb_export_verbosity_set(desc->export, level); +} - /* get the initialisation */ - init = dlsym(desc->handle, afb_api_so_v1_service_init); - if (init == NULL) { - /* not an error when onneed */ - if (onneed != 0) - return 0; +static struct json_object *addperm(struct json_object *o, struct json_object *x) +{ + struct json_object *a; - /* no initialisation method */ - ERROR("Binding %s is not a service", desc->binding->v1.prefix); - return -1; - } + if (!o) + return x; - /* get the event handler if any */ - onevent = dlsym(desc->handle, afb_api_so_v1_service_event); - desc->service = afb_svc_create(apiset, share_session, init, onevent); - if (desc->service == NULL) { - /* starting error */ - ERROR("Starting service %s failed", desc->binding->v1.prefix); - return -1; + 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; +} - return 0; +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 void update_hooks_cb(void *closure) +static struct json_object *addperm_key_valstr(struct json_object *o, const char *key, const char *val) { - struct api_so_v1 *desc = closure; - afb_ditf_update_hook(&desc->ditf); + return addperm_key_val(o, key, json_object_new_string(val)); } -static int get_verbosity_cb(void *closure) +static struct json_object *addperm_key_valint(struct json_object *o, const char *key, int val) { - struct api_so_v1 *desc = closure; - return desc->ditf.interface.verbosity; + return addperm_key_val(o, key, json_object_new_int(val)); } -static void set_verbosity_cb(void *closure, int level) +static struct json_object *make_description_openAPIv3(struct api_so_v1 *desc) +{ + char buffer[256]; + const struct afb_verb_desc_v1 *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(afb_export_apiname(desc->export))); + json_object_object_add(i, "version", json_object_new_string("0.0.0")); + json_object_object_add(i, "description", json_object_new_string(desc->binding->v1.info ?: afb_export_apiname(desc->export))); + + p = json_object_new_object(); + json_object_object_add(r, "paths", p); + verb = desc->binding->v1.verbs; + while (verb->name) { + buffer[0] = '/'; + strncpy(buffer + 1, verb->name, 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_V1) + a = addperm_key_valstr(a, "session", "close"); + if (verb->session & AFB_SESSION_CHECK_V1) + a = addperm_key_valstr(a, "session", "check"); + if (verb->session & AFB_SESSION_RENEW_V1) + a = addperm_key_valstr(a, "token", "refresh"); + if (verb->session & AFB_SESSION_LOA_MASK_V1) + a = addperm_key_valint(a, "LOA", (verb->session >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1); + 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->info)); + verb++; + } + return r; +} + +static struct json_object *describe_cb(void *closure) { struct api_so_v1 *desc = closure; - desc->ditf.interface.verbosity = level; + + return make_description_openAPIv3(desc); } static struct afb_api_itf so_v1_api_itf = { @@ -139,14 +191,18 @@ static struct afb_api_itf so_v1_api_itf = { .service_start = service_start_cb, .update_hooks = update_hooks_cb, .get_verbosity = get_verbosity_cb, - .set_verbosity = set_verbosity_cb + .set_verbosity = set_verbosity_cb, + .describe = describe_cb }; int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) { struct api_so_v1 *desc; - struct afb_binding *(*register_function) (const struct afb_binding_interface *interface); + struct afb_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface); + int (*init)(struct afb_service service); + void (*onevent)(const char *event, struct json_object *object); struct afb_api afb_api; + struct afb_export *export; /* retrieves the register function */ register_function = dlsym(handle, afb_api_so_v1_register); @@ -155,60 +211,64 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) INFO("binding [%s] is a valid AFB binding V1", path); /* allocates the description */ + init = dlsym(handle, afb_api_so_v1_service_init); + onevent = dlsym(handle, afb_api_so_v1_service_event); + export = afb_export_create_v1(apiset, path, init, onevent); desc = calloc(1, sizeof *desc); - if (desc == NULL) { + if (desc == NULL || export == NULL) { ERROR("out of memory"); goto error; } + desc->export = export; desc->handle = handle; - /* init the interface */ - afb_ditf_init(&desc->ditf, path); - /* init the binding */ - NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register); - desc->binding = register_function(&desc->ditf.interface); + INFO("binding [%s] calling registering function %s", path, afb_api_so_v1_register); + desc->binding = afb_export_register_v1(desc->export, register_function); if (desc->binding == NULL) { ERROR("binding [%s] register function failed. continuing...", path); - goto error2; + goto error; } /* check the returned structure */ if (desc->binding->type != AFB_BINDING_VERSION_1) { ERROR("binding [%s] invalid type %d...", path, desc->binding->type); - goto error2; + goto error; } if (desc->binding->v1.prefix == NULL || *desc->binding->v1.prefix == 0) { ERROR("binding [%s] bad prefix...", path); - goto error2; + goto error; } - if (!afb_api_is_valid_name(desc->binding->v1.prefix)) { + if (!afb_api_is_valid_name(desc->binding->v1.prefix, 1)) { ERROR("binding [%s] invalid prefix...", path); - goto error2; + goto error; } if (desc->binding->v1.info == NULL || *desc->binding->v1.info == 0) { ERROR("binding [%s] bad description...", path); - goto error2; + goto error; } if (desc->binding->v1.verbs == NULL) { ERROR("binding [%s] no APIs...", path); - goto error2; + goto error; } /* records the binding */ - afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix); + if (!strcmp(path, afb_export_apiname(desc->export))) + afb_export_rename(desc->export, desc->binding->v1.prefix); afb_api.closure = desc; afb_api.itf = &so_v1_api_itf; - if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) { + afb_api.group = NULL; + if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) { ERROR("binding [%s] can't be registered...", path); - goto error2; + goto error; } - NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); + INFO("binding %s loaded with API prefix %s", path, afb_export_apiname(desc->export)); return 1; -error2: - free(desc); error: + afb_export_destroy(export); + free(desc); + return -1; }