X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so.c;h=78d6d1b61b4983d85bb70250f44520e77617004b;hb=cd438c6c7074c9c279f15dd9e5c69b90b412b8a5;hp=cc3447ab856b79796833c5bf764966df586f5a2e;hpb=65bc678960567038ca4d07d1f9c5784b6c7a7834;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so.c b/src/afb-api-so.c index cc3447ab..78d6d1b6 100644 --- a/src/afb-api-so.c +++ b/src/afb-api-so.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "session.h" #include "afb-common.h" @@ -48,9 +48,9 @@ struct api_so_desc { static int api_timeout = 15; -static const char plugin_register_function[] = "pluginAfbV1Entry"; +static const char plugin_register_function[] = "pluginAfbV1Register"; -static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object) +static void afb_api_so_event_sender_push(struct api_so_desc *desc, const char *name, struct json_object *object) { size_t length; char *event; @@ -64,17 +64,17 @@ static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, st ctxClientEventSend(NULL, event, object); } -static const struct afb_evmgr_itf evmgr_itf = { - .push = (void*)afb_api_so_evmgr_push +static const struct afb_event_sender_itf event_sender_itf = { + .push = (void*)afb_api_so_event_sender_push }; -static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc) +static struct afb_event_sender afb_api_so_get_event_sender(struct api_so_desc *desc) { - return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc }; + return (struct afb_event_sender){ .itf = &event_sender_itf, .closure = desc }; } static const struct afb_daemon_itf daemon_itf = { - .get_evmgr = (void*)afb_api_so_get_evmgr, + .get_event_sender = (void*)afb_api_so_get_event_sender, .get_event_loop = (void*)afb_common_get_event_loop, .get_user_bus = (void*)afb_common_get_user_bus, .get_system_bus = (void*)afb_common_get_system_bus @@ -97,9 +97,9 @@ static void call_check(struct afb_req req, struct afb_context *context, const st { struct monitoring data; - int stag = (int)(verb->session & AFB_SESSION_MASK); + int stag = (int)verb->session; - if (stag != AFB_SESSION_NONE) { + if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) { if (!afb_context_check(context)) { afb_context_close(context); afb_req_fail(req, "failed", "invalid token's identity"); @@ -108,18 +108,37 @@ static void call_check(struct afb_req req, struct afb_context *context, const st } if ((stag & AFB_SESSION_CREATE) != 0) { - if (!afb_context_create(context)) { - afb_context_close(context); + if (afb_context_check_loa(context, 1)) { afb_req_fail(req, "failed", "invalid creation state"); return; } + afb_context_change_loa(context, 1); + afb_context_refresh(context); } if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0) afb_context_refresh(context); - if ((stag & AFB_SESSION_CLOSE) != 0) + if ((stag & AFB_SESSION_CLOSE) != 0) { + afb_context_change_loa(context, 0); afb_context_close(context); + } + + if ((stag & AFB_SESSION_LOA_GE) != 0) { + int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK; + if (!afb_context_check_loa(context, loa)) { + afb_req_fail(req, "failed", "invalid LOA"); + return; + } + } + + if ((stag & AFB_SESSION_LOA_LE) != 0) { + int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK; + if (afb_context_check_loa(context, loa + 1)) { + afb_req_fail(req, "failed", "invalid LOA"); + return; + } + } data.req = req; data.action = verb->callback; @@ -141,29 +160,35 @@ static void call(struct api_so_desc *desc, struct afb_req req, struct afb_contex int afb_api_so_add_plugin(const char *path) { + int rc; + void *handle; struct api_so_desc *desc; struct AFB_plugin *(*pluginAfbV1RegisterFct) (const struct AFB_interface *interface); - desc = calloc(1, sizeof *desc); - if (desc == NULL) { - ERROR("out of memory"); - goto error; - } - // This is a loadable library let's check if it's a plugin - desc->handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); - if (desc->handle == NULL) { + rc = 0; + handle = dlopen(path, RTLD_NOW | RTLD_LOCAL); + if (handle == NULL) { ERROR("plugin [%s] not loadable", path); - goto error2; + goto error; } /* retrieves the register function */ - pluginAfbV1RegisterFct = dlsym(desc->handle, plugin_register_function); + pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function); if (!pluginAfbV1RegisterFct) { ERROR("plugin [%s] is not an AFB plugin", path); - goto error3; + goto error2; } INFO("plugin [%s] is a valid AFB plugin", path); + rc = -1; + + /* allocates the description */ + desc = calloc(1, sizeof *desc); + if (desc == NULL) { + ERROR("out of memory"); + goto error2; + } + desc->handle = handle; /* init the interface */ desc->interface.verbosity = 0; @@ -187,6 +212,10 @@ int afb_api_so_add_plugin(const char *path) ERROR("plugin [%s] bad prefix...", path); goto error3; } + if (!afb_apis_is_valid_api_name(desc->plugin->v1.prefix)) { + ERROR("plugin [%s] invalid prefix...", path); + goto error3; + } if (desc->plugin->v1.info == NULL || *desc->plugin->v1.info == 0) { ERROR("plugin [%s] bad description...", path); goto error3; @@ -208,11 +237,11 @@ int afb_api_so_add_plugin(const char *path) return 0; error3: - dlclose(desc->handle); -error2: free(desc); +error2: + dlclose(handle); error: - return -1; + return rc; } static int adddirs(char path[PATH_MAX], size_t end) @@ -256,7 +285,8 @@ static int adddirs(char path[PATH_MAX], size_t end) /* case of files */ if (!strstr(ent.d_name, ".so")) continue; - afb_api_so_add_plugin(path); + if (afb_api_so_add_plugin(path) < 0) + return -1; } } closedir(dir); @@ -305,7 +335,8 @@ int afb_api_so_add_pathset(const char *pathset) p = strsep(&ps, sep); if (!p) return 0; - afb_api_so_add_path(p); - }; + if (afb_api_so_add_path(p) < 0) + return -1; + } }