*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#include <stdio.h>
#include <string.h>
#include <dlfcn.h>
#include <assert.h>
-#include <afb/afb-binding.h>
+#include <json-c/json.h>
-#include "afb-apis.h"
-#include "afb-svc.h"
-#include "afb-evt.h"
+#include <afb/afb-binding-v1.h>
+
+#include "afb-api.h"
+#include "afb-api-so-v1.h"
+#include "afb-apiset.h"
+#include "afb-export.h"
#include "afb-common.h"
#include "afb-context.h"
#include "afb-api-so.h"
* Description of a binding
*/
struct api_so_v1 {
- struct afb_binding *binding; /* descriptor */
- size_t apilength; /* length of the API name */
+ struct afb_binding_v1 *binding; /* descriptor */
void *handle; /* context of dlopen */
- struct afb_svc *service; /* handler for service started */
- struct afb_binding_interface interface; /* interface for the binding */
-};
-
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name);
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object);
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args);
-static int afb_api_so_rootdir_get_fd(void *closure);
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale);
-
-static const struct afb_daemon_itf daemon_itf = {
- .event_broadcast = afb_api_so_event_broadcast_cb,
- .get_event_loop = afb_common_get_event_loop,
- .get_user_bus = afb_common_get_user_bus,
- .get_system_bus = afb_common_get_system_bus,
- .vverbose = afb_api_so_vverbose_cb,
- .event_make = afb_api_so_event_make_cb,
- .rootdir_get_fd = afb_api_so_rootdir_get_fd,
- .rootdir_open_locale = afb_api_so_rootdir_open_locale
+ struct afb_export *export; /* export */
};
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name)
+static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name)
{
- size_t length;
- char *event;
- struct api_so_v1 *desc = closure;
-
- /* makes the event name */
- assert(desc->binding != NULL);
- length = strlen(name);
- event = alloca(length + 2 + desc->apilength);
- memcpy(event, desc->binding->v1.prefix, desc->apilength);
- event[desc->apilength] = '/';
- memcpy(event + desc->apilength + 1, name, length + 1);
+ const struct afb_verb_desc_v1 *verb;
- /* crate the event */
- return afb_evt_create_event(event);
+ verb = desc->binding->v1.verbs;
+ while (verb->name && strcasecmp(verb->name, name))
+ verb++;
+ return verb->name ? verb : NULL;
}
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object)
+static void call_cb(void *closure, struct afb_xreq *xreq)
{
- size_t length;
- char *event;
+ const struct afb_verb_desc_v1 *verb;
struct api_so_v1 *desc = closure;
- /* makes the event name */
- assert(desc->binding != NULL);
- length = strlen(name);
- event = alloca(length + 2 + desc->apilength);
- memcpy(event, desc->binding->v1.prefix, desc->apilength);
- event[desc->apilength] = '/';
- memcpy(event + desc->apilength + 1, name, length + 1);
-
- return afb_evt_broadcast(event, object);
+ 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 void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
+static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
{
- char *p;
struct api_so_v1 *desc = closure;
-
- if (vasprintf(&p, fmt, args) < 0)
- vverbose(level, file, line, fmt, args);
- else {
- verbose(level, file, line, "%s {binding %s}", p, desc->binding->v1.prefix);
- free(p);
- }
+ return afb_export_start(desc->export, share_session, onneed, apiset);
}
-static int afb_api_so_rootdir_get_fd(void *closure)
+static void update_hooks_cb(void *closure)
{
- return afb_common_rootdir_get_fd();
+ struct api_so_v1 *desc = closure;
+ afb_export_update_hook(desc->export);
}
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale)
+static int get_verbosity_cb(void *closure)
{
- return afb_common_rootdir_open_locale(filename, flags, locale);
+ struct api_so_v1 *desc = closure;
+ return afb_export_verbosity_get(desc->export);
}
-static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name)
+static void set_verbosity_cb(void *closure, int level)
{
- const struct afb_verb_desc_v1 *verb;
-
- verb = desc->binding->v1.verbs;
- while (verb->name && strcasecmp(verb->name, name))
- verb++;
- return verb->name ? verb : NULL;
+ struct api_so_v1 *desc = closure;
+ afb_export_verbosity_set(desc->export, level);
}
-static void call_cb(void *closure, struct afb_xreq *xreq)
+static struct json_object *addperm(struct json_object *o, struct json_object *x)
{
- const struct afb_verb_desc_v1 *verb;
- struct api_so_v1 *desc = closure;
+ struct json_object *a;
+
+ if (!o)
+ return x;
- 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 {
- xreq->timeout = afb_api_so_timeout;
- xreq->sessionflags = (int)verb->session;
- xreq->group = desc;
- xreq->callback = verb->callback;
- afb_xreq_call(xreq);
+ 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 int service_start_cb(void *closure, int share_session, int onneed)
+static struct json_object *addperm_key_val(struct json_object *o, const char *key, struct json_object *val)
{
- int (*init)(struct afb_service service);
- void (*onevent)(const char *event, struct json_object *object);
+ struct json_object *x = json_object_new_object();
+ json_object_object_add(x, key, val);
+ return addperm(o, x);
+}
- struct api_so_v1 *desc = closure;
+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));
+}
- /* check state */
- if (desc->service != NULL) {
- /* not an error when onneed */
- if (onneed != 0)
- return 0;
+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));
+}
- /* already started: it is an error */
- ERROR("Service %s already started", desc->binding->v1.prefix);
- return -1;
- }
+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;
- /* 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;
+ r = json_object_new_object();
+ json_object_object_add(r, "openapi", json_object_new_string("3.0.0"));
- /* no initialisation method */
- ERROR("Binding %s is not a service", desc->binding->v1.prefix);
- return -1;
- }
+ 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)));
- /* get the event handler if any */
- onevent = dlsym(desc->handle, afb_api_so_v1_service_event);
- desc->service = afb_svc_create(share_session, init, onevent);
- if (desc->service == NULL) {
- /* starting error */
- ERROR("Starting service %s failed", desc->binding->v1.prefix);
- return -1;
+ 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;
- return 0;
+ return make_description_openAPIv3(desc);
}
-int afb_api_so_v1_add(const char *path, void *handle)
+static struct afb_api_itf so_v1_api_itf = {
+ .call = call_cb,
+ .service_start = service_start_cb,
+ .update_hooks = update_hooks_cb,
+ .get_verbosity = get_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_verb_desc_v1 fake_verb;
- struct afb_binding fake_binding;
+ 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);
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 */
- desc->interface.verbosity = verbosity;
- desc->interface.mode = AFB_MODE_LOCAL;
- desc->interface.daemon.itf = &daemon_itf;
- desc->interface.daemon.closure = desc;
-
- /* for log purpose, a fake binding is needed here */
- desc->binding = &fake_binding;
- fake_binding.type = AFB_BINDING_VERSION_1;
- fake_binding.v1.info = path;
- fake_binding.v1.prefix = path;
- fake_binding.v1.verbs = &fake_verb;
- fake_verb.name = NULL;
-
/* init the binding */
- NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
- desc->binding = register_function(&desc->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_apis_is_valid_api_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 */
- desc->apilength = strlen(desc->binding->v1.prefix);
- if (afb_apis_add(desc->binding->v1.prefix, (struct afb_api){
- .closure = desc,
- .call = call_cb,
- .service_start = service_start_cb }) < 0) {
+ 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;
+ 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;
}