fix regression of AFB_SESSION_NONE

[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 bcd8dbe..78d6d1b 100644 (file)
--- a/src/afb-api-so.c
+++ b/src/afb-api-so.c
@@ -97,9 +97,9 @@ static void call_check(struct afb_req req, struct afb_context *context, const st
 {
        struct monitoring data;
 
-       int stag = (int)(verb->session & AFB_SESSION_MASK);
+       int stag = (int)verb->session;
 
-       if (stag != AFB_SESSION_NONE) {
+       if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
                if (!afb_context_check(context)) {
                        afb_context_close(context);
                        afb_req_fail(req, "failed", "invalid token's identity");
@@ -108,18 +108,37 @@ static void call_check(struct afb_req req, struct afb_context *context, const st
        }
 
        if ((stag & AFB_SESSION_CREATE) != 0) {
-               if (!afb_context_create(context)) {
-                       afb_context_close(context);
+               if (afb_context_check_loa(context, 1)) {
                        afb_req_fail(req, "failed", "invalid creation state");
                        return;
                }
+               afb_context_change_loa(context, 1);
+               afb_context_refresh(context);
        }
        
        if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
                afb_context_refresh(context);
 
-       if ((stag & AFB_SESSION_CLOSE) != 0)
+       if ((stag & AFB_SESSION_CLOSE) != 0) {
+               afb_context_change_loa(context, 0);
                afb_context_close(context);
+       }
+
+       if ((stag & AFB_SESSION_LOA_GE) != 0) {
+               int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
+               if (!afb_context_check_loa(context, loa)) {
+                       afb_req_fail(req, "failed", "invalid LOA");
+                       return;
+               }
+       }
+
+       if ((stag & AFB_SESSION_LOA_LE) != 0) {
+               int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
+               if (afb_context_check_loa(context, loa + 1)) {
+                       afb_req_fail(req, "failed", "invalid LOA");
+                       return;
+               }
+       }
 
        data.req = req;
        data.action = verb->callback;
@@ -141,29 +160,35 @@ static void call(struct api_so_desc *desc, struct afb_req req, struct afb_contex
 
 int afb_api_so_add_plugin(const char *path)
 {
+       int rc;
+       void *handle;
        struct api_so_desc *desc;
        struct AFB_plugin *(*pluginAfbV1RegisterFct) (const struct AFB_interface *interface);
 
-       desc = calloc(1, sizeof *desc);
-       if (desc == NULL) {
-               ERROR("out of memory");
-               goto error;
-       }
-
        // This is a loadable library let's check if it's a plugin
-       desc->handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
-       if (desc->handle == NULL) {
+       rc = 0;
+       handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
+       if (handle == NULL) {
                ERROR("plugin [%s] not loadable", path);
-               goto error2;
+               goto error;
        }
 
        /* retrieves the register function */
-       pluginAfbV1RegisterFct = dlsym(desc->handle, plugin_register_function);
+       pluginAfbV1RegisterFct = dlsym(handle, plugin_register_function);
        if (!pluginAfbV1RegisterFct) {
                ERROR("plugin [%s] is not an AFB plugin", path);
-               goto error3;
+               goto error2;
        }
        INFO("plugin [%s] is a valid AFB plugin", path);
+       rc = -1;
+
+       /* allocates the description */
+       desc = calloc(1, sizeof *desc);
+       if (desc == NULL) {
+               ERROR("out of memory");
+               goto error2;
+       }
+       desc->handle = handle;
 
        /* init the interface */
        desc->interface.verbosity = 0;
@@ -212,11 +237,11 @@ int afb_api_so_add_plugin(const char *path)
        return 0;
 
 error3:
-       dlclose(desc->handle);
-error2:
        free(desc);
+error2:
+       dlclose(handle);
 error:
-       return -1;
+       return rc;
 }
 
 static int adddirs(char path[PATH_MAX], size_t end)
@@ -260,7 +285,8 @@ static int adddirs(char path[PATH_MAX], size_t end)
                        /* case of files */
                        if (!strstr(ent.d_name, ".so"))
                                continue;
-                       afb_api_so_add_plugin(path);
+                       if (afb_api_so_add_plugin(path) < 0)
+                               return -1;
                }
        }
        closedir(dir);
@@ -309,7 +335,8 @@ int afb_api_so_add_pathset(const char *pathset)
                p = strsep(&ps, sep);
                if (!p)
                        return 0;
-               afb_api_so_add_path(p);
-       };
+               if (afb_api_so_add_path(p) < 0)
+                       return -1;
+       }
 }