X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Frest-api.c;h=643acb57d2240451c35cd2b22a50f3a5a1c2a9fb;hb=3a10185ae380956bd356c73f34138f97255bf7e6;hp=0a31e20e0be8de07df7b2b7de0742507dcf09d42;hpb=e76dff6729fb9acd1638019507e7edbbd8af23f5;p=src%2Fapp-framework-binder.git diff --git a/src/rest-api.c b/src/rest-api.c index 0a31e20e..643acb57 100644 --- a/src/rest-api.c +++ b/src/rest-api.c @@ -45,14 +45,16 @@ PUBLIC void endPostRequest(AFB_PostHandle *postHandle) { if (postHandle->type == AFB_POST_FORM) { if (verbose) fprintf(stderr, "End PostForm Request UID=%d\n", postHandle->uid); } - free(postHandle->private); + if (postHandle->privatebuf) free(postHandle->privatebuf); free(postHandle); } // Check of apiurl is declare in this plugin and call it -STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *context) { - json_object *jresp, *jcall; +STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) { + json_object *jresp, *jcall, *jreqt; int idx, status, sig; + AFB_clientCtx *clientCtx = NULL; + AFB_plugin *plugin = request->plugins[plugidx]; int signals[]= {SIGALRM, SIGSEGV, SIGFPE, 0}; /*--------------------------------------------------------------- @@ -60,8 +62,8 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c +---------------------------------------------------------------- */ void pluginError (int signum) { sigset_t sigset; - AFB_clientCtx *context; - + + // unlock signal to allow a new signal to come sigemptyset (&sigset); sigaddset (&sigset, signum); @@ -77,9 +79,9 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c if (!strcmp(plugin->apis[idx].name, request->api)) { // Request was found and at least partially executed - request->jresp = json_object_new_object(); + jreqt = json_object_new_object(); json_object_get (afbJsonType); // increate jsontype reference count - json_object_object_add (request->jresp, "jtype", afbJsonType); + json_object_object_add (jreqt, "jtype", afbJsonType); // prepare an object to store calling values jcall=json_object_new_object(); @@ -93,7 +95,7 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c // Plugin aborted somewhere during its execution json_object_object_add(jcall, "status", json_object_new_string ("abort")); json_object_object_add(jcall, "info" , json_object_new_string ("Plugin broke during execution")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); } else { @@ -104,113 +106,117 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c request->errcode = MHD_HTTP_UNPROCESSABLE_ENTITY; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("Setting Timeout Handler Failed")); - json_object_object_add(request->jresp, "request", jcall); - return AFB_DONE; + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; } } // Trigger a timer to protect from unacceptable long time execution - alarm (request->config->apiTimeout); + alarm ((unsigned)request->config->apiTimeout); } // Out of SessionNone every call get a client context session if (AFB_SESSION_NONE != plugin->apis[idx].session) { // add client context to request - if (ctxClientGet(request, plugin) != AFB_SUCCESS) { + clientCtx = ctxClientGet(request, plugidx); + if (clientCtx == NULL) { request->errcode=MHD_HTTP_INSUFFICIENT_STORAGE; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("Client Session Context Full !!!")); - json_object_object_add(request->jresp, "request", jcall); - return (AFB_DONE); + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; }; - if (verbose) fprintf(stderr, "Plugin=[%s] Api=[%s] Middleware=[%d] Client=[0x%x] Uuid=[%s] Token=[%s]\n" - , request->plugin, request->api, plugin->apis[idx].session, request->client, request->client->uuid, request->client->token); + if (verbose) fprintf(stderr, "Plugin=[%s] Api=[%s] Middleware=[%d] Client=[%p] Uuid=[%s] Token=[%s]\n" + , request->prefix, request->api, plugin->apis[idx].session, clientCtx, clientCtx->uuid, clientCtx->token); switch(plugin->apis[idx].session) { - case AFB_SESSION_CREATE: - if (request->client->token[0] != '\0') { + case AFB_SESSION_CREATE: + if (clientCtx->token[0] != '\0' && request->config->token[0] != '\0') { request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("exist")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CREATE Session already exist")); - json_object_object_add(request->jresp, "request", jcall); - return (AFB_DONE); + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; } - if (AFB_SUCCESS != ctxTokenCreate (request)) { + if (AFB_SUCCESS != ctxTokenCreate (clientCtx, request)) { request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CREATE Invalid Initial Token")); - json_object_object_add(request->jresp, "request", jcall); - return (AFB_DONE); + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; } else { - json_object_object_add(jcall, "uuid", json_object_new_string (request->client->uuid)); - json_object_object_add(jcall, "token", json_object_new_string (request->client->token)); + json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid)); + json_object_object_add(jcall, "token", json_object_new_string (clientCtx->token)); json_object_object_add(jcall, "timeout", json_object_new_int (request->config->cntxTimeout)); } break; case AFB_SESSION_RENEW: - if (AFB_SUCCESS != ctxTokenRefresh (request)) { + if (AFB_SUCCESS != ctxTokenRefresh (clientCtx, request)) { request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_REFRESH Broken Exchange Token Chain")); - json_object_object_add(request->jresp, "request", jcall); - return (AFB_DONE); + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; } else { - json_object_object_add(jcall, "uuid", json_object_new_string (request->client->uuid)); - json_object_object_add(jcall, "token", json_object_new_string (request->client->token)); + json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid)); + json_object_object_add(jcall, "token", json_object_new_string (clientCtx->token)); json_object_object_add(jcall, "timeout", json_object_new_int (request->config->cntxTimeout)); } break; case AFB_SESSION_CLOSE: - if (AFB_SUCCESS != ctxTokenCheck (request)) { + if (AFB_SUCCESS != ctxTokenCheck (clientCtx, request)) { request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("empty")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CLOSE Not a Valid Access Token")); - json_object_object_add(request->jresp, "request", jcall); - return (AFB_DONE); + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; } else { - json_object_object_add(jcall, "uuid", json_object_new_string (request->client->uuid)); + json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid)); } break; case AFB_SESSION_CHECK: default: // default action is check - if (AFB_SUCCESS != ctxTokenCheck (request)) { + if (AFB_SUCCESS != ctxTokenCheck (clientCtx, request)) { request->errcode=MHD_HTTP_UNAUTHORIZED; json_object_object_add(jcall, "status", json_object_new_string ("fail")); json_object_object_add(jcall, "info", json_object_new_string ("AFB_SESSION_CHECK Invalid Active Token")); - json_object_object_add(request->jresp, "request", jcall); - return (AFB_DONE); + json_object_object_add(jreqt, "request", jcall); + goto ExitOnDone; } break; } } - // Effectively call the API with a subset of the context + // Effectively CALL PLUGIN API with a subset of the context jresp = plugin->apis[idx].callback(request, context); - // handle intemediatry Post Iterates out of band + // Store context in case it was updated by plugins + if (request->context != NULL) clientCtx->contexts[plugidx] = request->context; + + // handle intermediary Post Iterates out of band if ((jresp == NULL) && (request->errcode == MHD_HTTP_OK)) return (AFB_SUCCESS); // Session close is done after the API call so API can still use session in closing API - if (AFB_SESSION_CLOSE == plugin->apis[idx].session) ctxTokenReset (request); + if (AFB_SESSION_CLOSE == plugin->apis[idx].session) ctxTokenReset (clientCtx, request); // API should return NULL of a valid Json Object if (jresp == NULL) { json_object_object_add(jcall, "status", json_object_new_string ("null")); - json_object_object_add(request->jresp, "request", jcall); + json_object_object_add(jreqt, "request", jcall); request->errcode = MHD_HTTP_NO_RESPONSE; } else { json_object_object_add(jcall, "status", json_object_new_string ("processed")); - json_object_object_add(request->jresp, "request", jcall); - json_object_object_add(request->jresp, "response", jresp); + json_object_object_add(jreqt, "request", jcall); + json_object_object_add(jreqt, "response", jresp); } // cancel timeout and plugin signal handle before next call if (request->config->apiTimeout > 0) { @@ -220,33 +226,38 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c } } } - return (AFB_DONE); + goto ExitOnDone; } } return (AFB_FAIL); + +ExitOnDone: + request->jresp = jreqt; + return (AFB_DONE); } STATIC AFB_error findAndCallApi (AFB_request *request, void *context) { int idx; AFB_error status; + if (!request->api || !request->prefix) return (AFB_FAIL); // Search for a plugin with this urlpath for (idx = 0; request->plugins[idx] != NULL; idx++) { - if (!strcmp(request->plugins[idx]->prefix, request->plugin)) { - status =callPluginApi(request->plugins[idx], request, context); + if (!strcmp(request->plugins[idx]->prefix, request->prefix)) { + status =callPluginApi(request, idx, context); break; } } // No plugin was found if (request->plugins[idx] == NULL) { - request->jresp = jsonNewMessage(AFB_FATAL, "No Plugin=[%s]", request->plugin); + request->jresp = jsonNewMessage(AFB_FATAL, "No Plugin=[%s] Url=%s", request->prefix, request->url); goto ExitOnError; } // plugin callback did not return a valid Json Object if (status == AFB_FAIL) { - request->jresp = jsonNewMessage(AFB_FATAL, "No API=[%s] for Plugin=[%s]", request->api, request->plugin); + request->jresp = jsonNewMessage(AFB_FATAL, "No API=[%s] for Plugin=[%s] url=[%s]", request->api, request->prefix, request->url); goto ExitOnError; } @@ -260,7 +271,7 @@ ExitOnError: // This CB is call for every item with a form post it reformat iterator values // and callback Plugin API for each Item within PostForm. -doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, +STATIC int doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, const char *filename, const char *mimetype, const char *encoding, const char *data, uint64_t offset, size_t size) { @@ -270,10 +281,11 @@ doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, // retrieve API request from Post iterator handle AFB_PostHandle *postHandle = (AFB_PostHandle*)cls; - AFB_request *request = (AFB_request*)postHandle->private; + AFB_request *request = (AFB_request*)postHandle->privatebuf; AFB_PostRequest postRequest; - fprintf (stderr, "postHandle key=%s filename=%s len=%d mime=%s\n", key, filename, size, mimetype); + if (verbose) + fprintf (stderr, "postHandle key=%s filename=%s len=%zu mime=%s\n", key, filename, size, mimetype); // Create and Item value for Plugin API item.kind = kind; @@ -297,12 +309,12 @@ doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, if (status != AFB_SUCCESS) return MHD_NO; // let's allow iterator to move to next item - return (MHD_YES); + return MHD_YES; } STATIC void freeRequest (AFB_request *request) { - free (request->plugin); + free (request->prefix); free (request->api); free (request); } @@ -310,33 +322,39 @@ STATIC void freeRequest (AFB_request *request) { STATIC AFB_request *createRequest (struct MHD_Connection *connection, AFB_session *session, const char* url) { AFB_request *request; - + // Start with a clean request request = calloc (1, sizeof (AFB_request)); char *urlcpy1, *urlcpy2; - char *baseapi, *baseurl; + char *baseapi, *baseurl; // Extract plugin urlpath from request and make two copy because strsep overload copy urlcpy1 = urlcpy2 = strdup(url); baseurl = strsep(&urlcpy2, "/"); if (baseurl == NULL) { request->jresp = jsonNewMessage(AFB_FATAL, "Invalid API call url=[%s]", url); + request->errcode = MHD_HTTP_BAD_REQUEST; + goto Done; } // let's compute URL and call API baseapi = strsep(&urlcpy2, "/"); if (baseapi == NULL) { - request->jresp = jsonNewMessage(AFB_FATAL, "Invalid API call url=[%s]", url); + request->jresp = jsonNewMessage(AFB_FATAL, "Invalid API call plugin=[%s] url=[%s]", baseurl, url); + request->errcode = MHD_HTTP_BAD_REQUEST; + goto Done; } // build request structure request->connection = connection; request->config = session->config; request->url = url; - request->plugin = strdup (baseurl); + request->prefix = strdup (baseurl); request->api = strdup (baseapi); request->plugins= session->plugins; - + // note request->handle is fed with request->context in ctxClientGet + +Done: free(urlcpy1); return (request); } @@ -350,47 +368,45 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co AFB_error status; struct MHD_Response *webResponse; const char *serialized; - AFB_request *request; + AFB_request *request = NULL; AFB_PostHandle *postHandle; AFB_PostRequest postRequest; int ret; - + + // fprintf (stderr, "doRestAPI method=%s posthandle=%p\n", method, con_cls); + // if post data may come in multiple calls if (0 == strcmp(method, MHD_HTTP_METHOD_POST)) { const char *encoding, *param; int contentlen = -1; postHandle = *con_cls; - // This is the initial post event let's create form post structure POST datas come in multiple events + // This is the initial post event let's create form post structure POST data come in multiple events if (postHandle == NULL) { // allocate application POST processor handle to zero postHandle = calloc(1, sizeof (AFB_PostHandle)); postHandle->uid = postcount++; // build a UID for DEBUG + *con_cls = postHandle; // update context with posthandle // Let make sure we have the right encoding and a valid length encoding = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_CONTENT_TYPE); // We are facing an empty post let's process it as a get if (encoding == NULL) { - request= createRequest (connection, session, url); - goto ProcessApiCall; + postHandle->type = AFB_POST_EMPTY; + return MHD_YES; } // Form post is handle through a PostProcessor and call API once per form key if (strcasestr(encoding, FORM_CONTENT) != NULL) { - if (verbose) fprintf(stderr, "Create PostForm[uid=%d]\n", postHandle->uid); + if (verbose) fprintf(stderr, "Create doPostIterate[uid=%d posthandle=%p]\n", postHandle->uid, postHandle); request = createRequest (connection, session, url); - if (request->jresp != NULL) { - errMessage = request->jresp; - goto ExitOnError; - } - postHandle = malloc(sizeof (AFB_PostHandle)); // allocate application POST processor handle + if (request->jresp != NULL) goto ProcessApiCall; postHandle->type = AFB_POST_FORM; - postHandle->pp = MHD_create_post_processor (connection, MAX_POST_SIZE, doPostIterate, postHandle); - postHandle->private= (void*)request; - *con_cls = postHandle; // update context with posthandle + postHandle->privatebuf = (void*)request; + postHandle->pp = MHD_create_post_processor (connection, MAX_POST_SIZE, &doPostIterate, postHandle); if (NULL == postHandle->pp) { fprintf(stderr,"OOPS: Internal error fail to allocate MHD_create_post_processor\n"); @@ -414,7 +430,7 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co // Size is OK, let's allocate a buffer to hold post data postHandle->type = AFB_POST_JSON; - postHandle->private = malloc(contentlen + 1); // allocate memory for full POST data + 1 for '\0' enf of string + postHandle->privatebuf = malloc((unsigned)contentlen + 1); // allocate memory for full POST data + 1 for '\0' enf of string // if (verbose) fprintf(stderr, "Create PostJson[uid=%d] Size=%d\n", postHandle->uid, contentlen); return MHD_YES; @@ -439,7 +455,7 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co // Process JsonPost request when buffer is completed let's call API if (postHandle->type == AFB_POST_JSON) { // if (verbose) fprintf(stderr, "Updating PostJson[uid=%d]\n", postHandle->uid); - memcpy(&postHandle->private[postHandle->len], upload_data, *upload_data_size); + memcpy(&postHandle->privatebuf[postHandle->len], upload_data, *upload_data_size); postHandle->len = postHandle->len + *upload_data_size; } @@ -454,11 +470,11 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co errMessage = request->jresp; goto ExitOnError; } + postRequest.type = postHandle->type; // Postform add application context handle to request if (postHandle->type == AFB_POST_FORM) { postRequest.data = (char*) postHandle; - postRequest.type = postHandle->type; request->post = &postRequest; } @@ -475,9 +491,8 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co } // Before processing data, make sure buffer string is properly ended - postHandle->private[postHandle->len] = '\0'; - postRequest.data = postHandle->private; - postRequest.type = postHandle->type; + postHandle->privatebuf[postHandle->len] = '\0'; + postRequest.data = postHandle->privatebuf; request->post = &postRequest; // if (verbose) fprintf(stderr, "Close Post[%d] Buffer=%s\n", postHandle->uid, request->post->data); @@ -496,9 +511,9 @@ ProcessApiCall: webResponse = MHD_create_response_from_buffer(strlen(serialized), (void*) serialized, MHD_RESPMEM_MUST_COPY); // client did not pass token on URI let's use cookies - if ((!request->restfull) && (request->client != NULL)) { - char cookie[64]; - snprintf (cookie, sizeof (cookie), "%s=%s", COOKIE_NAME, request->client->uuid); + if ((!request->restfull) && (request->context != NULL)) { + char cookie[256]; + snprintf (cookie, sizeof (cookie), "%s-%d=%s; Path=%s; Max-Age=%d; HttpOnly", COOKIE_NAME, request->config->httpdPort, request->uuid, request->config->rootapi,request->config->cntxTimeout); MHD_add_response_header (webResponse, MHD_HTTP_HEADER_SET_COOKIE, cookie); } @@ -524,7 +539,7 @@ ExitOnError: // Loop on plugins. Check that they have the right type, prepare a JSON object with prefix STATIC AFB_plugin ** RegisterJsonPlugins(AFB_plugin **plugins) { - int idx, jdx; + int idx; for (idx = 0; plugins[idx] != NULL; idx++) { if (plugins[idx]->type != AFB_PLUGIN_JSON) { @@ -544,67 +559,112 @@ STATIC AFB_plugin ** RegisterJsonPlugins(AFB_plugin **plugins) { plugins[idx]->jtype = json_object_new_string(plugins[idx]->prefix); json_object_get(plugins[idx]->jtype); // increase reference count to make it permanent plugins[idx]->prefixlen = strlen(plugins[idx]->prefix); - - - // Prebuild each API jtype to boost API json response - for (jdx = 0; plugins[idx]->apis[jdx].name != NULL; jdx++) { - AFB_privateApi *private = malloc (sizeof (AFB_privateApi)); - if (plugins[idx]->apis[jdx].private != NULL) { - fprintf (stderr, "WARNING: plugin=%s api=%s private handle should be NULL=0x%x\n" - ,plugins[idx]->prefix,plugins[idx]->apis[jdx].name, plugins[idx]->apis[jdx].private); - } - private->len = strlen (plugins[idx]->apis[jdx].name); - private->jtype=json_object_new_string(plugins[idx]->apis[jdx].name); - json_object_get(private->jtype); // increase reference count to make it permanent - plugins[idx]->apis[jdx].private = private; - } } } return (plugins); } -void initPlugins(AFB_session *session) { - static AFB_plugin **plugins; - AFB_plugin* (*pluginRegisterFct)(void); - void *plugin; - char *pluginPath; - struct dirent *pluginDir; +STATIC void scanDirectory(char *dirpath, int dirfd, AFB_plugin **plugins, int *count) { DIR *dir; - afbJsonType = json_object_new_string (AFB_MSG_JTYPE); - int i = 0; + void *libso; + struct dirent pluginDir, *result; + AFB_plugin* (*pluginRegisterFct)(void); + char pluginPath[255]; - if ((dir = opendir(session->config->plugins)) == NULL) { - fprintf(stderr, "Could not open plugin directory=%s\n", session->config->plugins); - return; + // Open Directory to scan over it + dir = fdopendir (dirfd); + if (dir == NULL) { + fprintf(stderr, "ERROR in scanning directory\n"); + return; } + if (verbose) fprintf (stderr, "Scanning dir=[%s] for plugins\n", dirpath); + + for (;;) { + readdir_r(dir, &pluginDir, &result); + if (result == NULL) break; + + // Loop on any contained directory + if ((pluginDir.d_type == DT_DIR) && (pluginDir.d_name[0] != '.')) { + int fd = openat (dirfd, pluginDir.d_name, O_DIRECTORY); + char newpath[255]; + strncpy (newpath, dirpath, sizeof(newpath)); + strncat (newpath, "/", sizeof(newpath)); + strncat (newpath, pluginDir.d_name, sizeof(newpath)); + + scanDirectory (newpath, fd, plugins, count); + close (fd); - while ((pluginDir = readdir(dir)) != NULL) { + } else { - if (!strstr (pluginDir->d_name, ".so")) - continue; + // This is a file but not a plugin let's move to next directory element + if (!strstr (pluginDir.d_name, ".so")) continue; - asprintf (&pluginPath, "%s/%s", session->config->plugins, pluginDir->d_name); - plugin = dlopen (pluginPath, RTLD_NOW | RTLD_LOCAL); - pluginRegisterFct = dlsym (plugin, "pluginRegister"); - free (pluginPath); - if (!plugin) { - if (verbose) fprintf(stderr, "[%s] is not a binary plugin, continuing...\n", pluginDir->d_name); - continue; - } else if (!pluginRegisterFct) { - if (verbose) fprintf(stderr, "[%s] is not an AFB plugin, continuing...\n", pluginDir->d_name); - continue; + // This is a loadable library let's check if it's a plugin + snprintf (pluginPath, sizeof(pluginPath), "%s/%s", dirpath, pluginDir.d_name); + libso = dlopen (pluginPath, RTLD_NOW | RTLD_LOCAL); + + // Load fail we ignore this .so file + if (!libso) { + fprintf(stderr, "[%s] is not loadable, continuing...\n", pluginDir.d_name); + continue; + } + + pluginRegisterFct = dlsym (libso, "pluginRegister"); + + if (!pluginRegisterFct) { + fprintf(stderr, "[%s] is not an AFB plugin, continuing...\n", pluginDir.d_name); + continue; + } + + // if max plugin is reached let's stop searching + if (*count == AFB_MAX_PLUGINS) { + fprintf(stderr, "[%s] is not loaded [Max Count=%d reached]\n", pluginDir.d_name, *count); + continue; + } + + if (verbose) fprintf(stderr, "[%s] is a valid AFB plugin, loading pos[%d]\n", pluginDir.d_name, *count); + plugins[*count] = pluginRegisterFct(); + if (!plugins[*count]) { + if (verbose) fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", pluginDir.d_name); + } else + *count = *count +1; } + } + closedir (dir); +} + +void initPlugins(AFB_session *session) { + AFB_plugin **plugins; + + afbJsonType = json_object_new_string (AFB_MSG_JTYPE); + int count = 0; + char *dirpath; + int dirfd; - if (verbose) fprintf(stderr, "[%s] is a valid AFB plugin, loading it\n", pluginDir->d_name); - plugins = (AFB_plugin **) realloc (plugins, (i+1)*sizeof(AFB_plugin)); - plugins[i] = (AFB_plugin *) malloc (sizeof(AFB_plugin)); - plugins[i] = (**pluginRegisterFct)(); - i++; + /* pre-allocate for AFB_MAX_PLUGINS plugins, we will downsize later */ + plugins = (AFB_plugin **) malloc (AFB_MAX_PLUGINS *sizeof(AFB_plugin*)); + + // Loop on every directory passed in --plugins=xxx + while ((dirpath = strsep(&session->config->ldpaths, ":"))) { + // Ignore any directory we fail to open + if ((dirfd = open(dirpath, O_DIRECTORY)) <= 0) { + fprintf(stderr, "Invalid directory path=[%s]\n", dirpath); + continue; + } + scanDirectory (dirpath, dirfd, plugins, &count); + close (dirfd); } - plugins[i++] = NULL; - closedir (dir); + if (count == 0) { + fprintf(stderr, "No plugins found, afb-daemon is unlikely to work in this configuration, exiting...\n"); + exit (1); + } + // downsize structure to effective number of loaded plugins + plugins = (AFB_plugin **)realloc (plugins, (unsigned)(count+1)*sizeof(AFB_plugin*)); + plugins[count] = NULL; + // complete plugins and save them within current sessions session->plugins = RegisterJsonPlugins(plugins); + session->config->pluginCount = count; }