X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=38f1b275debb5908dd12eb77a845a58f4b80ab86;hb=78867fd5c3c67839116b89d636b2f191fc14f4e1;hp=4bfd8d99397e0b8a9f444de777d727bfe6f48d1d;hpb=863a97b989aecce8b52a09168c0668ad40df8e1c;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index 4bfd8d99..38f1b275 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -16,17 +16,19 @@ */ #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-v1.h" #include "afb-apiset.h" #include "afb-svc.h" #include "afb-evt.h" @@ -48,9 +50,10 @@ 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_binding_interface_v1 interface; struct afb_ditf ditf; /* daemon interface */ }; @@ -70,11 +73,7 @@ static void call_cb(void *closure, struct afb_xreq *xreq) struct api_so_v1 *desc = closure; 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_v1(xreq, verb); } static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) @@ -97,7 +96,8 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct /* get the initialisation */ init = dlsym(desc->handle, afb_api_so_v1_service_init); - if (init == NULL) { + onevent = dlsym(desc->handle, afb_api_so_v1_service_event); + if (init == NULL && onevent == NULL) { /* not an error when onneed */ if (onneed != 0) return 0; @@ -108,8 +108,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct } /* 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); + desc->service = afb_svc_create_v1(desc->binding->v1.prefix, apiset, share_session, init, onevent); if (desc->service == NULL) { /* starting error */ ERROR("Starting service %s failed", desc->binding->v1.prefix); @@ -123,63 +122,111 @@ static void update_hooks_cb(void *closure) { struct api_so_v1 *desc = closure; afb_ditf_update_hook(&desc->ditf); + if (desc->service) + afb_svc_update_hook(desc->service); } static int get_verbosity_cb(void *closure) { struct api_so_v1 *desc = closure; - return desc->ditf.interface.verbosity; + return desc->interface.verbosity; } static void set_verbosity_cb(void *closure, int level) { struct api_so_v1 *desc = closure; - desc->ditf.interface.verbosity = level; + desc->interface.verbosity = level; } -struct json_object *describe_cb(void *closure) +static struct json_object *addperm(struct json_object *o, struct json_object *x) { - struct api_so_v1 *desc = closure; + 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_openAPIv3(struct api_so_v1 *desc) +{ + char buffer[256]; const struct afb_verb_desc_v1 *verb; - struct json_object *r, *v, *f, *a; + struct json_object *r, *f, *a, *i, *p, *g; r = json_object_new_object(); - json_object_object_add(r, "version", json_object_new_int(1)); - json_object_object_add(r, "info", json_object_new_string(desc->binding->v1.info)); - v = json_object_new_object(); - json_object_object_add(r, "verbs", v); + 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->v1.info)); + 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->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(); - a = json_object_new_array(); - json_object_object_add(f, "name", json_object_new_string(verb->name)); - json_object_object_add(f, "info", json_object_new_string(verb->info)); - if (verb->session & AFB_SESSION_CREATE) - json_object_array_add(a, json_object_new_string("session-create")); - if (verb->session & AFB_SESSION_CLOSE) - json_object_array_add(a, json_object_new_string("session-close")); - if (verb->session & AFB_SESSION_RENEW) - json_object_array_add(a, json_object_new_string("session-renew")); - if (verb->session & AFB_SESSION_CHECK) - json_object_array_add(a, json_object_new_string("session-check")); - if (verb->session & AFB_SESSION_LOA_EQ) { - const char *rel = "?"; - char buffer[80]; - switch (verb->session & AFB_SESSION_LOA_EQ) { - case AFB_SESSION_LOA_GE: rel = ">="; break; - case AFB_SESSION_LOA_LE: rel = "<="; break; - case AFB_SESSION_LOA_EQ: rel = "=="; break; - } - snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK)); - json_object_array_add(a, json_object_new_string(buffer)); - } - json_object_object_add(f, "flags", a); - json_object_object_add(v, verb->name, f); + 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; + + return make_description_openAPIv3(desc); +} + static struct afb_api_itf so_v1_api_itf = { .call = call_cb, .service_start = service_start_cb, @@ -192,7 +239,7 @@ static struct afb_api_itf so_v1_api_itf = { 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); struct afb_api afb_api; /* retrieves the register function */ @@ -210,11 +257,11 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) desc->handle = handle; /* init the interface */ - afb_ditf_init(&desc->ditf, path); + afb_ditf_init_v1(&desc->ditf, path, &desc->interface); /* 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 = register_function(&desc->interface); if (desc->binding == NULL) { ERROR("binding [%s] register function failed. continuing...", path); goto error2; @@ -250,7 +297,7 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) ERROR("binding [%s] can't be registered...", path); goto error2; } - NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); + INFO("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); return 1; error2: