*/
#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/afb-binding-v1.h>
+
+#include "afb-api.h"
+#include "afb-api-so-v1.h"
+#include "afb-apiset.h"
#include "afb-svc.h"
#include "afb-evt.h"
#include "afb-common.h"
* 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 */
};
struct api_so_v1 *desc = closure;
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
- afb_xreq_call(xreq, verb->session, verb->callback);
+ afb_xreq_call_verb_v1(xreq, verb);
}
-static int service_start_cb(void *closure, int share_session, int onneed)
+static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
{
+ int rc;
int (*init)(struct afb_service service);
void (*onevent)(const char *event, struct json_object *object);
if (desc->service != NULL) {
/* not an error when onneed */
if (onneed != 0)
- return 0;
+ goto done;
/* already started: it is an error */
- ERROR("Service %s already started", desc->binding->v1.prefix);
+ ERROR("Service %s already started", desc->ditf.api);
return -1;
}
/* 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;
+ goto done;
/* no initialisation method */
- ERROR("Binding %s is not a service", desc->binding->v1.prefix);
+ ERROR("Binding %s is not a service", desc->ditf.api);
return -1;
}
/* 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);
+ desc->service = afb_svc_create(desc->ditf.api, apiset, share_session, onevent, NULL);
if (desc->service == NULL) {
- /* starting error */
- ERROR("Starting service %s failed", desc->binding->v1.prefix);
+ ERROR("Creation of service %s failed", desc->ditf.api);
return -1;
}
+ /* Starts the service */
+ desc->ditf.state = Daemon_Init;
+ rc = afb_svc_start_v1(desc->service, init);
+ if (rc < 0) {
+ /* initialisation error */
+ ERROR("Initialisation of service %s failed (%d): %m", desc->ditf.api, rc);
+ afb_svc_destroy(desc->service, NULL);
+ desc->service = NULL;
+ return rc;
+ }
+
+done:
+ desc->ditf.state = Daemon_Run;
return 0;
}
{
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->interface.verbosity;
+}
+
+static void set_verbosity_cb(void *closure, int level)
+{
+ struct api_so_v1 *desc = closure;
+ desc->interface.verbosity = level;
+}
+
+static struct json_object *addperm(struct json_object *o, struct json_object *x)
+{
+ 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);
}
-int afb_api_so_v1_add(const char *path, void *handle)
+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, *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(desc->ditf.api));
+ 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 ?: desc->ditf.api));
+
+ 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 make_description_openAPIv3(desc);
+}
+
+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_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface);
struct afb_api afb_api;
/* retrieves the register function */
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;
ERROR("binding [%s] bad prefix...", path);
goto error2;
}
- if (!afb_apis_is_valid_api_name(desc->binding->v1.prefix)) {
+ if (!afb_api_is_valid_name(desc->binding->v1.prefix)) {
ERROR("binding [%s] invalid prefix...", path);
goto error2;
}
}
/* records the binding */
- afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
+ if (desc->ditf.api == path)
+ afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
afb_api.closure = desc;
- afb_api.call = call_cb;
- afb_api.service_start = service_start_cb;
- afb_api.update_hooks = update_hooks_cb;
- if (afb_apis_add(desc->binding->v1.prefix, afb_api) < 0) {
+ afb_api.itf = &so_v1_api_itf;
+ afb_api.noconcurrency = 0;
+ if (afb_apiset_add(apiset, desc->ditf.api, afb_api) < 0) {
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->ditf.api);
return 1;
error2:
Code Review / src / app-framework-binder.git / blobdiff