#include "session.h"
#include "afb-common.h"
+#include "afb-context.h"
#include "afb-apis.h"
#include "afb-api-so.h"
#include "verbose.h"
error_handler = older;
}
-static void call_check(struct afb_req req, const struct AFB_restapi *verb)
+static void call_check(struct afb_req req, struct afb_context *context, const struct AFB_restapi *verb)
{
- switch(verb->session) {
- case AFB_SESSION_CREATE:
- if (!afb_req_session_create(req))
- return;
- break;
- case AFB_SESSION_RENEW:
- if (!afb_req_session_check(req, 1))
+ int stag = (int)(verb->session & AFB_SESSION_MASK);
+
+ if (stag != AFB_SESSION_NONE) {
+ if (!afb_context_check(context)) {
+ afb_context_close(context);
+ afb_req_fail(req, "failed", "invalid token's identity");
return;
- break;
- case AFB_SESSION_CLOSE:
- case AFB_SESSION_CHECK:
- if (!afb_req_session_check(req, 0))
+ }
+ }
+
+ if ((stag & AFB_SESSION_CREATE) != 0) {
+ if (!afb_context_create(context)) {
+ afb_context_close(context);
+ afb_req_fail(req, "failed", "invalid creation state");
return;
- break;
- case AFB_SESSION_NONE:
- default:
- break;
+ }
}
+
+ if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
+ afb_context_refresh(context);
+
+ if ((stag & AFB_SESSION_CLOSE) != 0)
+ afb_context_close(context);
+
trapping_call(req, verb->callback);
- if (verb->session == AFB_SESSION_CLOSE)
- afb_req_session_close(req);
}
-static void call(struct api_so_desc *desc, struct afb_req req, const char *verb, size_t lenverb)
+static void call(struct api_so_desc *desc, struct afb_req req, struct afb_context *context, const char *verb, size_t lenverb)
{
const struct AFB_restapi *v;
while (v->name && (strncasecmp(v->name, verb, lenverb) || v->name[lenverb]))
v++;
if (v->name)
- call_check(req, v);
+ call_check(req, context, v);
else
afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->plugin->prefix);
}
desc = calloc(1, sizeof *desc);
if (desc == NULL) {
- fprintf(stderr, "[%s] out of memory\n", path);
+ 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) {
- fprintf(stderr, "[%s] not loadable, continuing...\n", path);
+ ERROR("plugin [%s] not loadable", path);
goto error2;
}
/* retrieves the register function */
pluginRegisterFct = dlsym(desc->handle, plugin_register_function);
if (!pluginRegisterFct) {
- fprintf(stderr, "[%s] not an AFB plugin, continuing...\n", path);
+ ERROR("plugin [%s] is not an AFB plugin", path);
goto error3;
}
- if (verbosity)
- fprintf(stderr, "[%s] is a valid AFB plugin\n", path);
+ INFO("plugin [%s] is a valid AFB plugin", path);
/* init the interface */
desc->interface.verbosity = 0;
/* init the plugin */
desc->plugin = pluginRegisterFct(&desc->interface);
if (desc->plugin == NULL) {
- fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", path);
+ ERROR("plugin [%s] register function failed. continuing...", path);
goto error3;
}
/* check the returned structure */
if (desc->plugin->type != AFB_PLUGIN_JSON) {
- fprintf(stderr, "ERROR: plugin [%s] invalid type %d...\n", path, desc->plugin->type);
+ ERROR("plugin [%s] invalid type %d...", path, desc->plugin->type);
goto error3;
}
if (desc->plugin->prefix == NULL || *desc->plugin->prefix == 0) {
- fprintf(stderr, "ERROR: plugin [%s] bad prefix...\n", path);
+ ERROR("plugin [%s] bad prefix...", path);
goto error3;
}
if (desc->plugin->info == NULL || *desc->plugin->info == 0) {
- fprintf(stderr, "ERROR: plugin [%s] bad description...\n", path);
+ ERROR("plugin [%s] bad description...", path);
goto error3;
}
if (desc->plugin->apis == NULL) {
- fprintf(stderr, "ERROR: plugin [%s] no APIs...\n", path);
+ ERROR("plugin [%s] no APIs...", path);
goto error3;
}
if (afb_apis_add(desc->plugin->prefix, (struct afb_api){
.closure = desc,
.call = (void*)call}) < 0) {
- fprintf(stderr, "ERROR: plugin [%s] can't be registered...\n", path);
+ ERROR("plugin [%s] can't be registered...", path);
goto error3;
}
-
+ NOTICE("plugin %s loaded with API prefix %s", path, desc->plugin->prefix);
return 0;
error3:
/* open the DIR now */
dir = opendir(path);
if (dir == NULL) {
- fprintf(stderr, "ERROR in scanning plugin directory %s, %m\n", path);
+ ERROR("can't scan plugin directory %s, %m", path);
return -1;
}
- if (verbosity)
- fprintf(stderr, "Scanning dir=[%s] for plugins\n", path);
+ INFO("Scanning dir=[%s] for plugins", path);
/* scan each entry */
if (end)
len = strlen(ent.d_name);
if (len + end >= PATH_MAX) {
- fprintf(stderr, "path too long for %s\n", ent.d_name);
+ ERROR("path too long while scanning plugins for %s", ent.d_name);
continue;
}
memcpy(&path[end], ent.d_name, len+1);
length = strlen(path);
if (length >= sizeof(buffer)) {
- fprintf(stderr, "path too long %lu [%.99s...]\n", (unsigned long)length, path);
+ ERROR("path too long %lu [%.99s...]", (unsigned long)length, path);
return -1;
}
rc = stat(path, &st);
if (rc < 0)
- fprintf(stderr, "Invalid plugin path [%s]: %m\n", path);
+ ERROR("Invalid plugin path [%s]: %m", path);
else if (S_ISDIR(st.st_mode))
rc = afb_api_so_add_directory(path);
- else
+ else if (strstr(path, ".so"))
rc = afb_api_so_add_plugin(path);
+ else
+ INFO("not a plugin [%s], skipped", path);
return rc;
}
Code Review / src / app-framework-binder.git / blobdiff