}
// 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};
/*---------------------------------------------------------------
+---------------------------------------------------------------- */
void pluginError (int signum) {
sigset_t sigset;
- AFB_clientCtx *context;
-
+
+
// unlock signal to allow a new signal to come
sigemptyset (&sigset);
sigaddset (&sigset, signum);
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 !!!"));
};
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"));
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"));
// 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) {
int idx;
AFB_error status;
+ if (!request->api || !request->plugin) 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);
+ 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->plugin, 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->plugin, request->url);
goto ExitOnError;
}
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->plugin = strdup (baseurl);
request->api = strdup (baseapi);
request->plugins= session->plugins;
-
+
+Done:
free(urlcpy1);
return (request);
}
// 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);
if (verbose) fprintf(stderr, "Create PostForm[uid=%d]\n", postHandle->uid);
request = createRequest (connection, session, url);
- if (request->jresp != NULL) {
- errMessage = request->jresp;
- goto ExitOnError;
- }
+ if (request->jresp != NULL) goto ProcessApiCall;
+
postHandle = malloc(sizeof (AFB_PostHandle)); // allocate application POST processor handle
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
if (NULL == postHandle->pp) {
fprintf(stderr,"OOPS: Internal error fail to allocate MHD_create_post_processor\n");
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);
}
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);
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);
}
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);
// complete plugins and save them within current sessions
session->plugins = RegisterJsonPlugins(plugins);
+ session->config->pluginCount = num;
}
Code Review / src / app-framework-binder.git / blobdiff