X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Frest-api.c;h=dd5c59b9a4170bc48355e6601b62fbd6ad1ab01e;hb=d809e9b8fc03a0a08060034c6ddbd4b4c4176399;hp=1a44b33f72961538bb1a436fe9cc7db4e5d6b214;hpb=00857f9da5ae802794a4cb94aca576b11bfe6628;p=src%2Fapp-framework-binder.git diff --git a/src/rest-api.c b/src/rest-api.c index 1a44b33f..dd5c59b9 100644 --- a/src/rest-api.c +++ b/src/rest-api.c @@ -45,15 +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->private) free(postHandle->private); 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) { +STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context) { json_object *jresp, *jcall; int idx, status, sig; AFB_clientCtx *clientCtx; + AFB_plugin *plugin = request->plugins[plugidx]; int signals[]= {SIGALRM, SIGSEGV, SIGFPE, 0}; /*--------------------------------------------------------------- @@ -117,8 +118,8 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c if (AFB_SESSION_NONE != plugin->apis[idx].session) { // add client context to request - clientCtx = ctxClientGet(request, idx); - if (clientCtx != NULL) { + 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 !!!")); @@ -127,7 +128,7 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c }; 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, clientCtx, clientCtx->uuid, clientCtx->token); + , request->prefix, request->api, plugin->apis[idx].session, clientCtx, clientCtx->uuid, clientCtx->token); switch(plugin->apis[idx].session) { @@ -194,9 +195,12 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c } } - // 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); + // Store context in case it was updated by plugins + clientCtx->contexts[plugidx] = request->context; + // handle intermediary Post Iterates out of band if ((jresp == NULL) && (request->errcode == MHD_HTTP_OK)) return (AFB_SUCCESS); @@ -232,24 +236,24 @@ STATIC AFB_error findAndCallApi (AFB_request *request, void *context) { int idx; AFB_error status; - if (!request->api || !request->plugin) return (AFB_FAIL); + 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] Url=%s", request->plugin, request->url); + 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] url=[%s]", request->api, request->plugin, request->url); + request->jresp = jsonNewMessage(AFB_FATAL, "No API=[%s] for Plugin=[%s] url=[%s]", request->api, request->prefix, request->url); goto ExitOnError; } @@ -305,7 +309,7 @@ doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key, STATIC void freeRequest (AFB_request *request) { - free (request->plugin); + free (request->prefix); free (request->api); free (request); } @@ -313,7 +317,8 @@ STATIC void freeRequest (AFB_request *request) { STATIC AFB_request *createRequest (struct MHD_Connection *connection, AFB_session *session, const char* url) { AFB_request *request; - + int idx; + // Start with a clean request request = calloc (1, sizeof (AFB_request)); char *urlcpy1, *urlcpy2; @@ -340,9 +345,10 @@ STATIC AFB_request *createRequest (struct MHD_Connection *connection, AFB_sessio 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); @@ -382,8 +388,8 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co // 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 @@ -460,11 +466,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; } @@ -483,7 +489,6 @@ 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; request->post = &postRequest; // if (verbose) fprintf(stderr, "Close Post[%d] Buffer=%s\n", postHandle->uid, request->post->data); @@ -503,8 +508,8 @@ ProcessApiCall: // client did not pass token on URI let's use cookies if ((!request->restfull) && (request->context != NULL)) { - char cookie[64]; - snprintf (cookie, sizeof (cookie), "%s=%s", COOKIE_NAME, request->uuid); + char cookie[256]; + snprintf (cookie, sizeof (cookie), "%s=%s;path=%s;max-age=%d", COOKIE_NAME, request->uuid, request->config->rootapi,request->config->cntxTimeout); MHD_add_response_header (webResponse, MHD_HTTP_HEADER_SET_COOKIE, cookie); } @@ -569,59 +574,106 @@ STATIC AFB_plugin ** RegisterJsonPlugins(AFB_plugin **plugins) { 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 num = 0; - - /* pre-allocate for 20 plugins, we will downsize if necessary */ - plugins = (AFB_plugin **) malloc (20*sizeof(AFB_plugin)); + 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], exiting...\n", session->config->plugins); - exit (-1); + // 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 loadable, 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); - if (verbose) fprintf(stderr, "[%s] is a valid AFB plugin, loading it\n", pluginDir->d_name); - plugins[num] = (AFB_plugin *) malloc (sizeof(AFB_plugin)); - plugins[num] = (**pluginRegisterFct)(); - num++; - /* only 20 plugins are supported at that time */ - if (num == 20) break; - } - plugins = (AFB_plugin **) realloc (plugins, (num+1)*sizeof(AFB_plugin)); - plugins[num] = NULL; + // 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", *count); + continue; + } + + if (verbose) fprintf(stderr, "[%s] is a valid AFB plugin, loading pos[%d]\n", pluginDir.d_name, *count); + plugins[*count] = (AFB_plugin *) malloc (sizeof(AFB_plugin)); + plugins[*count] = (**pluginRegisterFct)(); + *count = *count +1; + + } + } closedir (dir); +} - if (plugins[0] == NULL) { +void initPlugins(AFB_session *session) { + static AFB_plugin **plugins; + + afbJsonType = json_object_new_string (AFB_MSG_JTYPE); + int count = 0; + char *dirpath; + int dirfd; + + /* 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); + } + + 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, (count+1)*sizeof(AFB_plugin)); + plugins[count] = NULL; // complete plugins and save them within current sessions session->plugins = RegisterJsonPlugins(plugins); - session->config->pluginCount = num; + session->config->pluginCount = count; }