X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Frest-api.c;h=3ae9cc0eb3635b280a61ed13a7406915db74d2f9;hb=cf2b7c5be026071b696c62a8b0f260e624c9a357;hp=5565f356bed817fac1b2b2678d61f8f94b0a918b;hpb=0d37437a44e872db93631270cee0472fe9716673;p=src%2Fapp-framework-binder.git diff --git a/src/rest-api.c b/src/rest-api.c index 5565f356..3ae9cc0e 100644 --- a/src/rest-api.c +++ b/src/rest-api.c @@ -50,9 +50,11 @@ PUBLIC void endPostRequest(AFB_PostHandle *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}; /*--------------------------------------------------------------- @@ -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); @@ -116,7 +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 - 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 !!!")); @@ -125,12 +128,12 @@ 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, request->client, request->client->uuid, request->client->token); + , request->plugin, 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') { + if (clientCtx->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")); @@ -138,50 +141,50 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c return (AFB_DONE); } - 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); } 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); } 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); } 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")); @@ -195,11 +198,11 @@ STATIC AFB_error callPluginApi(AFB_plugin *plugin, AFB_request *request, void *c // Effectively call the API with a subset of the context jresp = plugin->apis[idx].callback(request, context); - // handle intemediatry Post Iterates out of band + // 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) { @@ -235,7 +238,7 @@ STATIC AFB_error findAndCallApi (AFB_request *request, void *context) { // 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); + status =callPluginApi(request, idx, context); break; } } @@ -500,9 +503,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)) { + if ((!request->restfull) && (request->context != NULL)) { char cookie[64]; - snprintf (cookie, sizeof (cookie), "%s=%s", COOKIE_NAME, request->client->uuid); + snprintf (cookie, sizeof (cookie), "%s=%s", COOKIE_NAME, request->uuid); MHD_add_response_header (webResponse, MHD_HTTP_HEADER_SET_COOKIE, cookie); } @@ -575,9 +578,10 @@ void initPlugins(AFB_session *session) { struct dirent *pluginDir; DIR *dir; afbJsonType = json_object_new_string (AFB_MSG_JTYPE); - int i = 0; + int num = 0; - plugins = (AFB_plugin **) malloc (sizeof(AFB_plugin)); + /* pre-allocate for 20 plugins, we will downsize if necessary */ + plugins = (AFB_plugin **) malloc (20*sizeof(AFB_plugin)); if ((dir = opendir(session->config->plugins)) == NULL) { fprintf(stderr, "Could not open plugin directory [%s], exiting...\n", session->config->plugins); @@ -594,7 +598,7 @@ void initPlugins(AFB_session *session) { pluginRegisterFct = dlsym (plugin, "pluginRegister"); free (pluginPath); if (!plugin) { - if (verbose) fprintf(stderr, "[%s] is not a binary plugin, continuing...\n", pluginDir->d_name); + 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); @@ -602,12 +606,14 @@ void initPlugins(AFB_session *session) { } 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++; + 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[i] = NULL; + plugins = (AFB_plugin **) realloc (plugins, (num+1)*sizeof(AFB_plugin)); + plugins[num] = NULL; closedir (dir); @@ -618,4 +624,5 @@ void initPlugins(AFB_session *session) { // complete plugins and save them within current sessions session->plugins = RegisterJsonPlugins(plugins); + session->config->pluginCount = num; }