diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/samples/SamplePost.c | 62 | ||||
| -rw-r--r-- | plugins/session/token-api.c | 89 |
2 files changed, 4 insertions, 147 deletions
diff --git a/plugins/samples/SamplePost.c b/plugins/samples/SamplePost.c index 9e1c7660..c4b9bc2e 100644 --- a/plugins/samples/SamplePost.c +++ b/plugins/samples/SamplePost.c @@ -19,58 +19,6 @@ #include "local-def.h" -// Dummy sample of Client Application Context -typedef struct { - int something; - void *whateveryouwant; -} MyClientApplicationHandle; - - -// Request Creation of new context if it does not exist -STATIC json_object* clientContextCreate (AFB_request *request) { - json_object *jresp; - - // add an application specific client context to session - request->client->ctx = malloc (sizeof (MyClientApplicationHandle)); - - // Send response to UI - jresp = json_object_new_object(); - json_object_object_add(jresp, "token", json_object_new_string ("A New Token and Session Context Was Created")); - - return (jresp); -} - -// Before entering here token will be check and renew -STATIC json_object* clientContextRefresh (AFB_request *request) { - json_object *jresp; - - - jresp = json_object_new_object(); - json_object_object_add(jresp, "token", json_object_new_string ("Token was refreshed")); - - return (jresp); -} - - -// Session token will we verified before entering here -STATIC json_object* clientContextCheck (AFB_request *request) { - - json_object *jresp = json_object_new_object(); - json_object_object_add(jresp, "isvalid", json_object_new_boolean (TRUE)); - - return (jresp); -} - - -// Close and Free context -STATIC json_object* clientContextReset (AFB_request *request) { - json_object *jresp; - - jresp = json_object_new_object(); - json_object_object_add(jresp, "uuid", json_object_new_string (request->client->uuid)); - - return (jresp); -} // In this case or handle is quite basic typedef struct { @@ -172,12 +120,8 @@ STATIC void clientContextFree(AFB_clientCtx *client) { } STATIC AFB_restapi pluginApis[]= { - {"ping" , AFB_SESSION_NONE , (AFB_apiCB)apiPingTest ,"Ping Rest Test Service"}, - {"token-create" , AFB_SESSION_CREATE, (AFB_apiCB)clientContextCreate ,"Request Client Context Creation"}, - {"token-refresh" , AFB_SESSION_RENEW , (AFB_apiCB)clientContextRefresh,"Refresh Client Context Token"}, - {"token-check" , AFB_SESSION_CHECK , (AFB_apiCB)clientContextCheck ,"Check Client Context Token"}, - {"token-reset" , AFB_SESSION_CLOSE , (AFB_apiCB)clientContextReset ,"Close Client Context and Free resources"}, - {"file-upload" , AFB_SESSION_NONE , (AFB_apiCB)ProcessPostForm ,"Demo for file upload"}, + {"ping" , AFB_SESSION_NONE , (AFB_apiCB)apiPingTest ,"Ping Rest Test Service"}, + {"upload" , AFB_SESSION_NONE , (AFB_apiCB)ProcessPostForm ,"Demo for file upload"}, {NULL} }; @@ -185,7 +129,7 @@ PUBLIC AFB_plugin *afsvRegister () { AFB_plugin *plugin = malloc (sizeof (AFB_plugin)); plugin->type = AFB_PLUGIN_JSON; plugin->info = "Application Framework Binder Service"; - plugin->prefix= "afbs"; // url base + plugin->prefix= "post"; // url base plugin->apis = pluginApis; plugin->handle= (void*) "What ever you want"; plugin->freeCtxCB= (void*) clientContextFree; diff --git a/plugins/session/token-api.c b/plugins/session/token-api.c index 3b49d2e4..b6ebb8ad 100644 --- a/plugins/session/token-api.c +++ b/plugins/session/token-api.c @@ -77,92 +77,6 @@ typedef struct { int fd; } appPostCtx; -// This function is call when PostForm processing is completed -STATIC void DonePostForm (AFB_request *request) { - AFB_PostHandle *postHandle = (AFB_PostHandle*)request->post->data; - appPostCtx *appCtx= postHandle->ctx; - - // Close upload file ID - close (appCtx->fd); - - // Free application specific handle - free (postHandle->ctx); - - if (verbose) fprintf (stderr, "DonePostForm upload done\n"); -} - - -// WARNING: PostForm callback are call multiple time (one or each key within form) -// When processing POST_JSON request->data hold a PostHandle and not data directly as for POST_JSON -STATIC json_object* ProcessPostForm (AFB_request *request, AFB_PostItem *item) { - - AFB_PostHandle *postHandle; - appPostCtx *appCtx; - char filepath[512]; - - // When Post is fully processed the same callback is call with a item==NULL - if (item == NULL) { - // Close file, Free handle - - request->errcode = MHD_HTTP_OK; - return(jsonNewMessage(AFB_SUCCESS,"File [%s] uploaded at [%s] error=\n", item->filename, request->config->sessiondir)); - } - - // Let's make sure this is a valid PostForm request - if (!request->post && request->post->type != AFB_POST_FORM) { - request->errcode = MHD_HTTP_FORBIDDEN; - return(jsonNewMessage(AFB_FAIL,"This is not a valid PostForm request\n")); - } else { - // In AFB_POST_FORM case post->data is a PostForm handle - postHandle = (AFB_PostHandle*) request->post->data; - appCtx = (appPostCtx*) postHandle->ctx; - } - - // Check this is a file element - if (0 != strcmp (item->key, "file")) { - request->errcode = MHD_HTTP_FORBIDDEN; - return (jsonNewMessage(AFB_FAIL,"No File within element key=%s\n", item->key)); - } - - // This is the 1st Item iteration let's open output file and allocate necessary resources - if (postHandle->ctx == NULL) { - int fd; - - strncpy (filepath, request->config->sessiondir, sizeof(filepath)); - strncat (filepath, "/", sizeof(filepath)); - strncat (filepath, item->filename, sizeof(filepath)); - - if((fd = open(request->config->sessiondir, O_RDONLY)) < 0) { - request->errcode = MHD_HTTP_FORBIDDEN; - return (jsonNewMessage(AFB_FAIL,"Fail to Upload file [%s] at [%s] error=\n", item->filename, request->config->sessiondir, strerror(errno))); - }; - - // Create an application specific context - appCtx = malloc (sizeof(appPostCtx)); // May place anything here until post->completeCB handle resources liberation - appCtx->fd = fd; - - // attach application to postHandle - postHandle->ctx = (void*) appCtx; // May place anything here until post->completeCB handle resources liberation - postHandle->completeCB = (AFB_apiCB)DonePostForm; // CallBack when Form Processing is finished - - } else { - // this is not the call, FD is already open - appCtx = (appPostCtx*) postHandle->ctx; - } - - // We have something to write - if (item->len > 0) { - - if (!write (appCtx->fd, item->data, item->len)) { - request->errcode = MHD_HTTP_FORBIDDEN; - return (jsonNewMessage(AFB_FAIL,"Fail to write file [%s] at [%s] error=\n", item->filename, strerror(errno))); - } - } - - // every event should return Sucess or Form processing stop - request->errcode = MHD_HTTP_OK; - return NULL; -} // This function is call when Client Session Context is removed // Note: when freeCtxCB==NULL standard free/malloc is called @@ -172,12 +86,11 @@ STATIC void clientContextFree(AFB_clientCtx *client) { } STATIC AFB_restapi pluginApis[]= { - {"ping" , AFB_SESSION_NONE , (AFB_apiCB)apiPingTest ,"Ping Rest Test Service"}, + {"ping" , AFB_SESSION_NONE , (AFB_apiCB)apiPingTest ,"Ping Rest Test Service"}, {"create" , AFB_SESSION_CREATE, (AFB_apiCB)clientContextCreate ,"Request Client Context Creation"}, {"refresh" , AFB_SESSION_RENEW , (AFB_apiCB)clientContextRefresh,"Refresh Client Context Token"}, {"check" , AFB_SESSION_CHECK , (AFB_apiCB)clientContextCheck ,"Check Client Context Token"}, {"reset" , AFB_SESSION_CLOSE , (AFB_apiCB)clientContextReset ,"Close Client Context and Free resources"}, - {"file-upload" , AFB_SESSION_NONE , (AFB_apiCB)ProcessPostForm ,"Demo for file upload"}, {NULL} }; |