Refactoring requests and context handling

[src/app-framework-binder.git] / src / afb-api-so.c

diff --git a/src/afb-api-so.c b/src/afb-api-so.c
index c3cb08d..38621ec 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -33,19 +33,20 @@
 
 #include "afb-plugin.h"
 #include "afb-req-itf.h"
-#include "afb-pollmgr-itf.h"
 #include "afb-evmgr-itf.h"
 
 #include "session.h"
+#include "afb-common.h"
+#include "afb-context.h"
 #include "afb-apis.h"
 #include "afb-api-so.h"
 #include "verbose.h"
-#include "utils-upoll.h"
 
 extern __thread sigjmp_buf *error_handler;
 
 struct api_so_desc {
        struct AFB_plugin *plugin;      /* descriptor */
+       size_t apilength;
        void *handle;                   /* context of dlopen */
        struct AFB_interface interface; /* interface */
 };
@@ -54,17 +55,18 @@ static int api_timeout = 15;
 
 static const char plugin_register_function[] = "pluginRegister";
 
-static const struct afb_pollmgr_itf pollmgr_itf = {
-       .wait = (void*)upoll_wait,
-       .open = (void*)upoll_open,
-       .on_readable = (void*)upoll_on_readable,
-       .on_writable = (void*)upoll_on_writable,
-       .on_hangup = (void*)upoll_on_hangup,
-       .close = (void*)upoll_close
-};
-
 static void afb_api_so_evmgr_push(struct api_so_desc *desc, const char *name, struct json_object *object)
 {
+       size_t length;
+       char *event;
+
+       assert(desc->plugin != NULL);
+       length = strlen(name);
+       event = alloca(length + 2 + desc->apilength);
+       memcpy(event, desc->plugin->prefix, desc->apilength);
+       event[desc->apilength] = '/';
+       memcpy(event + desc->apilength + 1, name, length + 1);
+       ctxClientEventSend(NULL, event, object);
 }
 
 static const struct afb_evmgr_itf evmgr_itf = {
@@ -76,16 +78,14 @@ static struct afb_evmgr afb_api_so_get_evmgr(struct api_so_desc *desc)
        return (struct afb_evmgr){ .itf = &evmgr_itf, .closure = desc };
 }
 
-static struct afb_pollmgr afb_api_so_get_pollmgr(struct api_so_desc *desc)
-{
-       return (struct afb_pollmgr){ .itf = &pollmgr_itf, .closure = NULL };
-}
-
 static const struct afb_daemon_itf daemon_itf = {
        .get_evmgr = (void*)afb_api_so_get_evmgr,
-       .get_pollmgr = (void*)afb_api_so_get_pollmgr
+       .get_event_loop = (void*)afb_common_get_event_loop,
+       .get_user_bus = (void*)afb_common_get_user_bus,
+       .get_system_bus = (void*)afb_common_get_system_bus
 };
 
+
 static void trapping_call(struct afb_req req, void(*cb)(struct afb_req))
 {
        volatile int signum, timerset;
@@ -127,32 +127,36 @@ static void trapping_call(struct afb_req req, void(*cb)(struct afb_req))
        error_handler = older;
 }
 
-static void call_check(struct afb_req req, const struct AFB_restapi *verb)
+static void call_check(struct afb_req req, struct afb_context *context, const struct AFB_restapi *verb)
 {
-       switch(verb->session) {
-       case AFB_SESSION_CREATE:
-               if (!afb_req_session_create(req))
-                       return;
-               break;
-       case AFB_SESSION_RENEW:
-               if (!afb_req_session_check(req, 1))
+       int stag = (int)(verb->session & AFB_SESSION_MASK);
+
+       if (stag != AFB_SESSION_NONE) {
+               if (!afb_context_check(context)) {
+                       afb_context_close(context);
+                       afb_req_fail(req, "failed", "invalid token's identity");
                        return;
-               break;
-       case AFB_SESSION_CLOSE:
-       case AFB_SESSION_CHECK:
-               if (!afb_req_session_check(req, 0))
+               }       
+       }
+
+       if ((stag & AFB_SESSION_CREATE) != 0) {
+               if (!afb_context_create(context)) {
+                       afb_context_close(context);
+                       afb_req_fail(req, "failed", "invalid creation state");
                        return;
-               break;
-       case AFB_SESSION_NONE:
-       default:
-               break;
+               }
        }
+       
+       if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
+               afb_context_refresh(context);
+
+       if ((stag & AFB_SESSION_CLOSE) != 0)
+               afb_context_close(context);
+
        trapping_call(req, verb->callback);
-       if (verb->session == AFB_SESSION_CLOSE)
-               afb_req_session_close(req);
 }
 
-static void call(struct api_so_desc *desc, struct afb_req req, const char *verb, size_t lenverb)
+static void call(struct api_so_desc *desc, struct afb_req req, struct afb_context *context, const char *verb, size_t lenverb)
 {
        const struct AFB_restapi *v;
 
@@ -160,7 +164,7 @@ static void call(struct api_so_desc *desc, struct afb_req req, const char *verb,
        while (v->name && (strncasecmp(v->name, verb, lenverb) || v->name[lenverb]))
                v++;
        if (v->name)
-               call_check(req, v);
+               call_check(req, context, v);
        else
                afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->plugin->prefix);
 }
@@ -224,6 +228,7 @@ int afb_api_so_add_plugin(const char *path)
        }
 
        /* records the plugin */
+       desc->apilength = strlen(desc->plugin->prefix);
        if (afb_apis_add(desc->plugin->prefix, (struct afb_api){
                        .closure = desc,
                        .call = (void*)call}) < 0) {