X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=9478f154f25709cc74cb808ca19a7711fa4d1ed6;hb=090379fdaf6ed1860dcff21424135ad71ead0cd2;hp=cf982220f8413e27da75e0733199eb6b7a87e090;hpb=4846cec0be7f41f992b9f89b7adb97033e15b1a0;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index cf982220..9478f154 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -16,7 +16,7 @@
  */
 
 #define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
 
 #include <stdlib.h>
 #include <string.h>
@@ -31,20 +31,25 @@
 #include "afb-msg-json.h"
 #include "afb-subcall.h"
 #include "afb-hook.h"
+#include "afb-api.h"
+#include "afb-apiset.h"
+#include "afb-auth.h"
+#include "jobs.h"
 #include "verbose.h"
 
+/******************************************************************************/
 
 static struct json_object *xreq_json_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
-	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq->query));
+	return xreq->json ? : (xreq->json = xreq->queryitf->json(xreq));
 }
 
 static struct afb_arg xreq_get_cb(void *closure, const char *name)
 {
 	struct afb_xreq *xreq = closure;
 	if (xreq->queryitf->get)
-		return xreq->queryitf->get(xreq->query, name);
+		return xreq->queryitf->get(xreq, name);
 	else
 		return afb_msg_json_get_arg(xreq_json_cb(closure), name);
 }
@@ -59,9 +64,9 @@ static void xreq_success_cb(void *closure, struct json_object *obj, const char *
 	} else {
 		xreq->replied = 1;
 		if (xreq->queryitf->success)
-			xreq->queryitf->success(xreq->query, obj, info);
+			xreq->queryitf->success(xreq, obj, info);
 		else
-			xreq->queryitf->reply(xreq->query, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
+			xreq->queryitf->reply(xreq, 0, afb_msg_json_reply_ok(info, obj, &xreq->context, NULL));
 	}
 }
 
@@ -74,9 +79,9 @@ static void xreq_fail_cb(void *closure, const char *status, const char *info)
 	} else {
 		xreq->replied = 1;
 		if (xreq->queryitf->fail)
-			xreq->queryitf->fail(xreq->query, status, info);
+			xreq->queryitf->fail(xreq, status, info);
 		else
-			xreq->queryitf->reply(xreq->query, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
+			xreq->queryitf->reply(xreq, 1, afb_msg_json_reply_error(status, info, &xreq->context, NULL));
 	}
 }
 
@@ -120,7 +125,7 @@ static void xreq_unref_cb(void *closure)
 {
 	struct afb_xreq *xreq = closure;
 	if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
-		xreq->queryitf->unref(xreq->query);
+		xreq->queryitf->unref(xreq);
 	}
 }
 
@@ -147,7 +152,7 @@ int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event event)
 	if (xreq->listener)
 		return afb_evt_add_watch(xreq->listener, event);
 	if (xreq->queryitf->subscribe)
-		return xreq->queryitf->subscribe(xreq->query, event);
+		return xreq->queryitf->subscribe(xreq, event);
 	ERROR("no event listener, subscription impossible");
 	errno = EINVAL;
 	return -1;
@@ -164,7 +169,7 @@ int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
 	if (xreq->listener)
 		return afb_evt_remove_watch(xreq->listener, event);
 	if (xreq->queryitf->unsubscribe)
-		return xreq->queryitf->unsubscribe(xreq->query, event);
+		return xreq->queryitf->unsubscribe(xreq, event);
 	ERROR("no event listener, unsubscription impossible");
 	errno = EINVAL;
 	return -1;
@@ -174,18 +179,82 @@ static void xreq_subcall_cb(void *closure, const char *api, const char *verb, st
 {
 	struct afb_xreq *xreq = closure;
 
-	if (xreq->queryitf->subcall)
-		xreq->queryitf->subcall(xreq->query, api, verb, args, callback, cb_closure);
-	else
+	if (xreq->queryitf->subcall) {
+		xreq->queryitf->subcall(xreq, api, verb, args, callback, cb_closure);
+		json_object_put(args);
+	} else {
 		afb_subcall(xreq, api, verb, args, callback, cb_closure);
+	}
+}
+
+struct xreq_sync
+{
+	struct afb_xreq *caller;
+	const char *api;
+	const char *verb;
+	struct json_object *args;
+	struct jobloop *jobloop;
+	struct json_object *result;
+	int iserror;
+};
+
+static void xreq_sync_leave(struct xreq_sync *sync)
+{
+	struct jobloop *jobloop = sync->jobloop;
+	if (jobloop) {
+		sync->jobloop = NULL;
+		jobs_leave(jobloop);
+	}
+}
+
+static void xreq_sync_reply(void *closure, int iserror, struct json_object *obj)
+{
+	struct xreq_sync *sync = closure;
+
+	sync->iserror = iserror;
+	sync->result = json_object_get(obj);
+	xreq_sync_leave(sync);
+}
+
+static void xreq_sync_enter(int signum, void *closure, struct jobloop *jobloop)
+{
+	struct xreq_sync *sync = closure;
+
+	if (!signum) {
+		sync->jobloop = jobloop;
+		xreq_subcall_cb(sync->caller, sync->api, sync->verb, json_object_get(sync->args), xreq_sync_reply, sync);
+	} else {
+		sync->iserror = 1;
+		xreq_sync_leave(sync);
+	}
 }
 
 static int xreq_subcallsync_cb(void *closure, const char *api, const char *verb, struct json_object *args, struct json_object **result)
 {
+	int rc;
+	struct xreq_sync sync;
 	struct afb_xreq *xreq = closure;
-	return afb_subcall_sync(xreq, api, verb, args, result);
+
+	sync.caller = xreq;
+	sync.api = api;
+	sync.verb = verb;
+	sync.args = args;
+	sync.jobloop = NULL;
+	sync.result = NULL;
+	sync.iserror = 1;
+
+	rc = jobs_enter(NULL, 0, xreq_sync_enter, &sync);
+	json_object_put(args);
+	if (rc < 0 || sync.iserror) {
+		*result = sync.result ? : afb_msg_json_internal_error();
+		return 0;
+	}
+	*result = sync.result;
+	return 1;
 }
 
+/******************************************************************************/
+
 static struct json_object *xreq_hooked_json_cb(void *closure)
 {
 	struct json_object *r = xreq_json_cb(closure);
@@ -256,7 +325,7 @@ static void xreq_hooked_unref_cb(void *closure)
 	afb_hook_xreq_unref(xreq);
 	if (!__atomic_sub_fetch(&xreq->refcount, 1, __ATOMIC_RELAXED)) {
 		afb_hook_xreq_end(xreq);
-		xreq->queryitf->unref(xreq->query);
+		xreq->queryitf->unref(xreq);
 	}
 }
 
@@ -329,6 +398,8 @@ static int xreq_hooked_subcallsync_cb(void *closure, const char *api, const char
 	return afb_hook_xreq_subcallsync_result(xreq, r, *result);
 }
 
+/******************************************************************************/
+
 const struct afb_req_itf xreq_itf = {
 	.json = xreq_json_cb,
 	.get = xreq_get_cb,
@@ -372,6 +443,13 @@ static inline struct afb_req to_req(struct afb_xreq *xreq)
 	return (struct afb_req){ .itf = xreq->hookflags ? &xreq_hooked_itf : &xreq_itf, .closure = xreq };
 }
 
+/******************************************************************************/
+
+struct json_object *afb_xreq_json(struct afb_xreq *xreq)
+{
+	return afb_req_json(to_req(xreq));
+}
+
 void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info)
 {
 	afb_req_success(to_req(xreq), obj, info);
@@ -431,62 +509,170 @@ void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb,
 	afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
 }
 
-static int xcheck(struct afb_xreq *xreq, int sessionflags)
+int afb_xreq_unhooked_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+	return xreq_subcallsync_cb(xreq, api, verb, args, result);
+}
+
+int afb_xreq_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+	return afb_req_subcall_sync(to_req(xreq), api, verb, args, result);
+}
+
+static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
 {
-	if ((sessionflags & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
+	int loa;
+
+	if ((sessionflags & (AFB_SESSION_CLOSE_V1|AFB_SESSION_RENEW_V1|AFB_SESSION_CHECK_V1|AFB_SESSION_LOA_EQ_V1)) != 0) {
 		if (!afb_context_check(&xreq->context)) {
 			afb_context_close(&xreq->context);
-			afb_xreq_fail_f(xreq, "failed", "invalid token's identity");
-			return 0;
+			afb_xreq_fail_f(xreq, "denied", "invalid token's identity");
+			errno = EINVAL;
+			return -1;
 		}
 	}
 
-	if ((sessionflags & AFB_SESSION_CREATE) != 0) {
-		if (afb_context_check_loa(&xreq->context, 1)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid creation state");
-			return 0;
+	if ((sessionflags & AFB_SESSION_LOA_GE_V1) != 0) {
+		loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1;
+		if (!afb_context_check_loa(&xreq->context, loa)) {
+			afb_xreq_fail_f(xreq, "denied", "invalid LOA");
+			errno = EPERM;
+			return -1;
 		}
-		afb_context_change_loa(&xreq->context, 1);
-		afb_context_refresh(&xreq->context);
 	}
 
-	if ((sessionflags & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
-		afb_context_refresh(&xreq->context);
+	if ((sessionflags & AFB_SESSION_LOA_LE_V1) != 0) {
+		loa = (sessionflags >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1;
+		if (afb_context_check_loa(&xreq->context, loa + 1)) {
+			afb_xreq_fail_f(xreq, "denied", "invalid LOA");
+			errno = EPERM;
+			return -1;
+		}
+	}
 
-	if ((sessionflags & AFB_SESSION_CLOSE) != 0) {
+	if ((sessionflags & AFB_SESSION_RENEW_V1) != 0) {
+		afb_context_refresh(&xreq->context);
+	}
+	if ((sessionflags & AFB_SESSION_CLOSE_V1) != 0) {
 		afb_context_change_loa(&xreq->context, 0);
 		afb_context_close(&xreq->context);
 	}
 
-	if ((sessionflags & AFB_SESSION_LOA_GE) != 0) {
-		int loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
-		if (!afb_context_check_loa(&xreq->context, loa)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid LOA");
-			return 0;
+	return 0;
+}
+
+static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionflags, const struct afb_auth *auth)
+{
+	int loa;
+
+	if (sessionflags != 0) {
+		if (!afb_context_check(&xreq->context)) {
+			afb_context_close(&xreq->context);
+			afb_xreq_fail_f(xreq, "denied", "invalid token's identity");
+			errno = EINVAL;
+			return -1;
 		}
 	}
 
-	if ((sessionflags & AFB_SESSION_LOA_LE) != 0) {
-		int loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
-		if (afb_context_check_loa(&xreq->context, loa + 1)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid LOA");
-			return 0;
-		}
+	loa = (int)(sessionflags & AFB_SESSION_LOA_MASK_V2);
+	if (loa && !afb_context_check_loa(&xreq->context, loa)) {
+		afb_xreq_fail_f(xreq, "denied", "invalid LOA");
+		errno = EPERM;
+		return -1;
 	}
-	return 1;
+
+	if (auth && !afb_auth_check(auth, xreq)) {
+		afb_xreq_fail_f(xreq, "denied", "authorisation refused");
+		errno = EPERM;
+		return -1;
+	}
+
+	if ((sessionflags & AFB_SESSION_REFRESH_V2) != 0) {
+		afb_context_refresh(&xreq->context);
+	}
+	if ((sessionflags & AFB_SESSION_CLOSE_V2) != 0) {
+		afb_context_close(&xreq->context);
+	}
+
+	return 0;
 }
 
-void afb_xreq_call(struct afb_xreq *xreq, int sessionflags, void (*method)(struct afb_req req))
+void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb)
 {
-	if (xcheck(xreq, sessionflags))
-		method(to_req(xreq));
+	if (!verb)
+		afb_xreq_fail_unknown_verb(xreq);
+	else
+		if (!xreq_session_check_apply_v1(xreq, verb->session))
+			verb->callback(to_req(xreq));
 }
 
-void afb_xreq_begin(struct afb_xreq *xreq)
+void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb)
 {
+	if (!verb)
+		afb_xreq_fail_unknown_verb(xreq);
+	else
+		if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth))
+			verb->callback(to_req(xreq));
+}
+
+void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
+{
+	memset(xreq, 0, sizeof *xreq);
+	xreq->refcount = 1;
+	xreq->queryitf = queryitf;
+}
+
+void afb_xreq_fail_unknown_api(struct afb_xreq *xreq)
+{
+	afb_xreq_fail_f(xreq, "unknown-api", "api %s not found (for verb %s)", xreq->api, xreq->verb);
+}
+
+void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq)
+{
+	afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, xreq->api);
+}
+
+static void process_sync(struct afb_xreq *xreq)
+{
+	struct afb_api api;
+
+	/* init hooking */
 	afb_hook_init_xreq(xreq);
 	if (xreq->hookflags)
 		afb_hook_xreq_begin(xreq);
+
+	/* search the api */
+	if (afb_apiset_get(xreq->apiset, xreq->api, &api) < 0) {
+		afb_xreq_fail_f(xreq, "unknown-api", "api %s not found", xreq->api);
+	} else {
+		xreq->context.api_key = api.closure;
+		api.itf->call(api.closure, xreq);
+	}
 }
 
+static void process_async(int signum, void *arg)
+{
+	struct afb_xreq *xreq = arg;
+
+	if (signum != 0) {
+		afb_xreq_fail_f(xreq, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
+	} else {
+		process_sync(xreq);
+	}
+	afb_xreq_unref(xreq);
+}
+
+void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset)
+{
+	xreq->apiset = apiset;
+
+	afb_xreq_addref(xreq);
+	if (jobs_queue(NULL, afb_apiset_timeout_get(apiset), process_async, xreq) < 0) {
+		/* TODO: allows or not to proccess it directly as when no threading? (see above) */
+		ERROR("can't process job with threads: %m");
+		afb_xreq_fail_f(xreq, "cancelled", "not able to create a job for the task");
+		afb_xreq_unref(xreq);
+	}
+	afb_xreq_unref(xreq);
+}