*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#include <stdlib.h>
#include <string.h>
#include <dlfcn.h>
#include <assert.h>
-#include <afb/afb-binding.h>
+#include <afb/afb-binding-v2.h>
#include <json-c/json.h>
#include "afb-api.h"
+#include "afb-api-so-v2.h"
#include "afb-apiset.h"
-#include "afb-svc.h"
-#include "afb-ditf.h"
+#include "afb-auth.h"
+#include "afb-export.h"
#include "afb-evt.h"
-#include "afb-common.h"
#include "afb-context.h"
#include "afb-api-so.h"
#include "afb-xreq.h"
-#include "afb-perm.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 */
- 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];
+ void *handle; /* context of dlopen */
+ struct afb_export *export; /* exportations */
};
-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;
}
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);
}
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);
- void (*onevent)(const char *event, struct json_object *object);
-
struct api_so_v2 *desc = closure;
-
- /* check state */
- if (desc->service != NULL) {
- /* not an error when onneed */
- if (onneed != 0)
- return 0;
-
- /* already started: it is an error */
- ERROR("Service %s already started", desc->binding->api);
- return -1;
- }
-
- /* get the initialisation */
- start = desc->binding->start;
- if (start == NULL) {
- /* not an error when onneed */
- if (onneed != 0)
- return 0;
-
- /* no initialisation method */
- ERROR("Binding %s is not a service", desc->binding->api);
- return -1;
- }
-
- /* get the event handler if any */
- onevent = desc->binding->onevent;
- desc->service = afb_svc_create_v2(apiset, share_session, onevent, start, &desc->ditf.interface);
- if (desc->service == NULL) {
- /* starting error */
- ERROR("Starting service %s failed", desc->binding->api);
- return -1;
- }
-
- return 0;
+ return afb_export_start(desc->export, share_session, onneed, apiset);
}
static void update_hooks_cb(void *closure)
{
struct api_so_v2 *desc = closure;
- afb_ditf_update_hook(&desc->ditf);
+ afb_export_update_hook(desc->export);
}
static int get_verbosity_cb(void *closure)
{
struct api_so_v2 *desc = closure;
- return desc->ditf.interface.verbosity;
+ return afb_export_verbosity_get(desc->export);
}
static void set_verbosity_cb(void *closure, int level)
{
struct api_so_v2 *desc = closure;
- desc->ditf.interface.verbosity = level;
+ afb_export_verbosity_set(desc->export, level);
+}
+
+static struct json_object *make_description_openAPIv3(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(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->info ?: afb_export_apiname(desc->export)));
+
+ 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 = afb_auth_json_v2(verb->auth, verb->session);
+ 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->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_openAPIv3(desc);
+ return r;
}
static struct afb_api_itf so_v2_api_itf = {
.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;
+ struct afb_export *export;
/* 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);
- if (desc == NULL) {
+ export = afb_export_create_v2(apiset, binding->api, data, binding->init, binding->onevent);
+ desc = calloc(1, sizeof *desc);
+ if (!desc || !export) {
ERROR("out of memory");
goto error;
}
desc->binding = binding;
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->export = export;
/* 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);
- goto error2;
+ ERROR("binding %s preinit function failed...", afb_export_apiname(desc->export));
+ goto error;
}
}
/* records the binding */
afb_api.closure = desc;
afb_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;
+ afb_api.group = binding->noconcurrency ? export : NULL;
+ if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) {
+ ERROR("binding %s can't be registered to set %s...", afb_export_apiname(desc->export), afb_apiset_name(apiset));
+ goto error;
}
- NOTICE("binding %s added to set %s", binding->api, afb_apiset_name(apiset));
+ INFO("binding %s added to set %s", afb_export_apiname(desc->export), 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:
+ afb_export_destroy(export);
+ free(desc);
+
return -1;
}
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;
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;
Code Review / src / app-framework-binder.git / blobdiff