X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v2.c;h=ba53223f2cf9deca79339f9614ecbca199b170d4;hb=a0bcdbcab352e311f320ded7af2205eec632296a;hp=14a92a9f61b9b77c6ae469e934d662fa736a12f8;hpb=91b744a510bbf41526f0931df2320379bec87c38;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-so-v2.c b/src/afb-api-so-v2.c
index 14a92a9f..ba53223f 100644
--- a/src/afb-api-so-v2.c
+++ b/src/afb-api-so-v2.c
@@ -28,9 +28,9 @@
 #include "afb-api.h"
 #include "afb-api-so-v2.h"
 #include "afb-apiset.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"
@@ -67,7 +67,8 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
 	struct api_so_v2 *desc = closure;
 	const struct afb_verb_v2 *verb;
 
-	verb = search(desc, xreq->verb);
+	xreq->request.dynapi = (void*)desc->export; /* hack: this avoids to export afb_export structure */
+	verb = search(desc, xreq->request.verb);
 	afb_xreq_call_verb_v2(xreq, verb);
 }
 
@@ -95,69 +96,6 @@ static void set_verbosity_cb(void *closure, int level)
 	afb_export_verbosity_set(desc->export, 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);
-}
-
-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 *addauth_or_array(struct json_object *o, const struct afb_auth *auth);
-
-static struct json_object *addauth(struct json_object *o, const struct afb_auth *auth)
-{
-	switch(auth->type) {
-	case afb_auth_No: return addperm(o, json_object_new_boolean(0));
-	case afb_auth_Token: return addperm_key_valstr(o, "session", "check");
-	case afb_auth_LOA: return addperm_key_valint(o, "LOA", auth->loa);
-	case afb_auth_Permission: return addperm_key_valstr(o, "permission", auth->text);
-	case afb_auth_Or: return addperm_key_val(o, "anyOf", addauth_or_array(json_object_new_array(), auth));
-	case afb_auth_And: return addauth(addauth(o, auth->first), auth->next);
-	case afb_auth_Not: return addperm_key_val(o, "not", addauth(NULL, auth->first));
-	case afb_auth_Yes: return addperm(o, json_object_new_boolean(1));
-	}
-	return o;
-}
-
-static struct json_object *addauth_or_array(struct json_object *o, const struct afb_auth *auth)
-{
-	if (auth->type != afb_auth_Or)
-		json_object_array_add(o, addauth(NULL, auth));
-	else {
-		addauth_or_array(o, auth->first);
-		addauth_or_array(o, auth->next);
-	}
-
-	return o;
-}
-
 static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc)
 {
 	char buffer[256];
@@ -185,17 +123,7 @@ static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc)
 		g = json_object_new_object();
 		json_object_object_add(f, "get", g);
 
-		a = NULL;
-		if (verb->session & AFB_SESSION_CLOSE_V2)
-			a = addperm_key_valstr(a, "session", "close");
-		if (verb->session & AFB_SESSION_CHECK_V2)
-			a = addperm_key_valstr(a, "session", "check");
-		if (verb->session & AFB_SESSION_REFRESH_V2)
-			a = addperm_key_valstr(a, "token", "refresh");
-		if (verb->session & AFB_SESSION_LOA_MASK_V2)
-			a = addperm_key_valint(a, "LOA", verb->session & AFB_SESSION_LOA_MASK_V2);
-		if (verb->auth)
-			a = addauth(a, verb->auth);
+		a = afb_auth_json_v2(verb->auth, verb->session);
 		if (a)
 			json_object_object_add(g, "x-permissions", a);
 
@@ -241,9 +169,9 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle
 	assert(data);
 
 	/* allocates the description */
-	export = afb_export_create_v2(binding->api, data, binding->init, binding->onevent);
+	export = afb_export_create_v2(apiset, binding->api, data, binding->init, binding->onevent);
 	desc = calloc(1, sizeof *desc);
-	if (desc == NULL) {
+	if (!desc || !export) {
 		ERROR("out of memory");
 		goto error;
 	}
@@ -264,7 +192,7 @@ int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle
 	/* records the binding */
 	afb_api.closure = desc;
 	afb_api.itf = &so_v2_api_itf;
-	afb_api.noconcurrency = binding->noconcurrency;
+	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;