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_request *request, int plugidx, void *context) {
- json_object *jresp, *jcall;
+ json_object *jresp, *jcall, *jreqt;
int idx, status, sig;
AFB_clientCtx *clientCtx;
AFB_plugin *plugin = request->plugins[plugidx];
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();
// 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 {
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);
+ json_object_object_add(jreqt, "request", jcall);
return AFB_DONE;
}
}
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);
+ json_object_object_add(jreqt, "request", jcall);
return (AFB_DONE);
};
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);
+ json_object_object_add(jreqt, "request", jcall);
return (AFB_DONE);
}
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);
+ json_object_object_add(jreqt, "request", jcall);
return (AFB_DONE);
} else {
json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid));
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);
+ json_object_object_add(jreqt, "request", jcall);
return (AFB_DONE);
} else {
json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid));
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);
+ json_object_object_add(jreqt, "request", jcall);
return (AFB_DONE);
} else {
json_object_object_add(jcall, "uuid", json_object_new_string (clientCtx->uuid));
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);
+ json_object_object_add(jreqt, "request", jcall);
return (AFB_DONE);
}
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);
+ // prefix response with request object;
+ request->jresp = jreqt;
+
+ // 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);
// 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) {
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) {
// 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);
request->prefix = strdup (baseurl);
request->api = strdup (baseapi);
request->plugins= session->plugins;
- for (idx = 0; idx < session->config->pluginCount; idx++) {
- if (!strcmp(baseurl, session->plugins[idx]->prefix)) {
- request->plugin = session->plugins[idx];
- break;
- }
- }
+ // note request->handle is fed with request->context in ctxClientGet
Done:
free(urlcpy1);
AFB_PostHandle *postHandle;
AFB_PostRequest postRequest;
int ret;
-
+
+ // fprintf (stderr, "doRestAPI method=%s posthandle=0x%x\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
// 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=0x%x]\n", postHandle->uid, postHandle);
request = createRequest (connection, session, url);
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;
+ 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");
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;
}
// 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);
// 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);
}
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;
}
Code Review / src / app-framework-binder.git / blobdiff