// 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 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
- clientCtx->contexts[plugidx] = request->context;
+ 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);
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
// 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");
Code Review / src / app-framework-binder.git / blobdiff