X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=e9cf298e7f10e878bca2974af624a7a9dc17ab1c;hb=11d36a9f7e16aa9992835f8ce06f0e1e5297b131;hp=781ecd94495abb56ff37049c62cd24d0e566738c;hpb=06d422d1de5c505366f6a029d8af85548c2b646f;p=src%2Fapp-framework-binder.git diff --git a/src/session.c b/src/session.c index 781ecd94..e9cf298e 100644 --- a/src/session.c +++ b/src/session.c @@ -14,575 +14,258 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * Reference: + * + * Reference: * http://stackoverflow.com/questions/25971505/how-to-delete-element-from-hsearch * */ - -#include "local-def.h" -#include -#include +#define _GNU_SOURCE +#include #include -#include -#include #include -#include - - -#define AFB_SESSION_JTYPE "AFB_session" -#define AFB_SESSION_JLIST "AFB_sessions.hash" -#define AFB_SESSION_JINFO "AFB_infos" +#include +#include +#include +#include +#include "afb-apis.h" +#include "session.h" -#define AFB_CURRENT_SESSION "active-session" // file link name within sndcard dir -#define AFB_DEFAULT_SESSION "current-session" // should be in sync with UI +#define NOW (time(NULL)) // Session UUID are store in a simple array [for 10 sessions this should be enough] static struct { pthread_mutex_t mutex; // declare a mutex to protect hash table - AFB_clientCtx **store; // sessions store + struct AFB_clientCtx **store; // sessions store int count; // current number of sessions int max; + int timeout; + int apicount; + const char *initok; } sessions; -// verify we can read/write in session dir -PUBLIC AFB_error sessionCheckdir (AFB_session *session) { - - int err; - - // in case session dir would not exist create one - if (verbose) fprintf (stderr, "AFB:notice checking session dir [%s]\n", session->config->sessiondir); - mkdir(session->config->sessiondir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); - - // change for session directory - err = chdir(session->config->sessiondir); - if (err) { - fprintf(stderr,"AFB: Fail to chdir to %s error=%s\n", session->config->sessiondir, strerror(err)); - return err; - } - - // verify we can write session in directory - json_object *dummy= json_object_new_object(); - json_object_object_add (dummy, "checked" , json_object_new_int (getppid())); - err = json_object_to_file ("./AFB-probe.json", dummy); - if (err < 0) return err; - - return AFB_SUCCESS; -} - -// let's return only sessions.hash files -STATIC int fileSelect (const struct dirent *entry) { - return (strstr (entry->d_name, ".afb") != NULL); -} - -STATIC json_object *checkCardDirExit (AFB_session *session, AFB_request *request ) { - int sessionDir, cardDir; - - // card name should be more than 3 character long !!!! - if (strlen (request->prefix) < 3) { - return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->prefix)); - } - - // open session directory - sessionDir = open (session->config->sessiondir, O_DIRECTORY); - if (sessionDir < 0) { - return (jsonNewMessage (AFB_FAIL,"Fail to open directory [%s] error=%s", session->config->sessiondir, strerror(sessionDir))); - } - - // create session sndcard directory if it does not exit - cardDir = openat (sessionDir, request->prefix, O_DIRECTORY); - if (cardDir < 0) { - cardDir = mkdirat (sessionDir, request->prefix, O_RDWR | S_IRWXU | S_IRGRP); - if (cardDir < 0) { - return (jsonNewMessage (AFB_FAIL,"Fail to create directory [%s/%s] error=%s", session->config->sessiondir, request->prefix, strerror(cardDir))); - } - } - close (sessionDir); - return NULL; -} - -// create a session in current directory -PUBLIC json_object *sessionList (AFB_session *session, AFB_request *request) { - json_object *sessionsJ, *ajgResponse; - struct stat fstat; - struct dirent **namelist; - int count, sessionDir; - - // if directory for card's sessions.hash does not exist create it - ajgResponse = checkCardDirExit (session, request); - if (ajgResponse != NULL) return ajgResponse; - - // open session directory - sessionDir = open (session->config->sessiondir, O_DIRECTORY); - if (sessionDir < 0) { - return (jsonNewMessage (AFB_FAIL,"Fail to open directory [%s] error=%s", session->config->sessiondir, strerror(sessionDir))); - } - - count = scandirat (sessionDir, request->prefix, &namelist, fileSelect, alphasort); - close (sessionDir); - - if (count < 0) { - return (jsonNewMessage (AFB_FAIL,"Fail to scan sessions.hash directory [%s/%s] error=%s", session->config->sessiondir, request->prefix, strerror(sessionDir))); - } - if (count == 0) return (jsonNewMessage (AFB_EMPTY,"[%s] no session at [%s]", request->prefix, session->config->sessiondir)); - - // loop on each session file, retrieve its date and push it into json response object - sessionsJ = json_object_new_array(); - while (count--) { - json_object *sessioninfo; - char timestamp [64]; - char *filename; - - // extract file name and last modification date - filename = namelist[count]->d_name; - printf("%s\n", filename); - stat(filename,&fstat); - strftime (timestamp, sizeof(timestamp), "%c", localtime (&fstat.st_mtime)); - filename[strlen(filename)-4] = '\0'; // remove .afb extension from filename - - // create an object by session with last update date - sessioninfo = json_object_new_object(); - json_object_object_add (sessioninfo, "date" , json_object_new_string (timestamp)); - json_object_object_add (sessioninfo, "session" , json_object_new_string (filename)); - json_object_array_add (sessionsJ, sessioninfo); - - free(namelist[count]); - } - - // free scandir structure - free(namelist); - - // everything is OK let's build final response - ajgResponse = json_object_new_object(); - json_object_object_add (ajgResponse, "jtype" , json_object_new_string (AFB_SESSION_JLIST)); - json_object_object_add (ajgResponse, "status" , jsonNewStatus(AFB_SUCCESS)); - json_object_object_add (ajgResponse, "data" , sessionsJ); - - return (ajgResponse); +// Free context [XXXX Should be protected again memory abort XXXX] +static void ctxUuidFreeCB (struct AFB_clientCtx *client) +{ + int idx; + + // If application add a handle let's free it now + assert (client->contexts != NULL); + + // Free client handle with a standard Free function, with app callback or ignore it + for (idx=0; idx < sessions.apicount; idx ++) { + if (client->contexts[idx] != NULL) { + afb_apis_free_context(idx, client->contexts[idx]); + client->contexts[idx] = NULL; + } + } } -// Create a link toward last used sessionname within sndcard directory -STATIC void makeSessionLink (const char *cardname, const char *sessionname) { - char linkname [256], filename [256]; - int err; - // create a link to keep track of last uploaded sessionname for this card - strncpy (filename, sessionname, sizeof(filename)); - strncat (filename, ".afb", sizeof(filename)); - - strncpy (linkname, cardname, sizeof(linkname)); - strncat (linkname, "/", sizeof(filename)); - strncat (linkname, AFB_CURRENT_SESSION, sizeof(linkname)); - strncat (linkname, ".afb", sizeof(filename)); - unlink (linkname); // remove previous link if any - err = symlink (filename, linkname); - if (err < 0) fprintf (stderr, "Fail to create link %s->%s error=%s\n", linkname, filename, strerror(errno)); +// Create a new store in RAM, not that is too small it will be automatically extended +void ctxStoreInit (int nbSession, int timeout, int apicount, const char *initok) +{ + // let's create as store as hashtable does not have any + sessions.store = calloc (1 + (unsigned)nbSession, sizeof(struct AFB_clientCtx)); + sessions.max = nbSession; + sessions.timeout = timeout; + sessions.apicount = apicount; + if (strlen(initok) >= 37) { + fprintf(stderr, "Error: initial token '%s' too long (max length 36)", initok); + exit(1); + } + sessions.initok = initok; } -// Load Json session object from disk -PUBLIC json_object *sessionFromDisk (AFB_session *session, AFB_request *request, char *name) { - json_object *jsonSession, *jtype, *response; - const char *ajglabel; - char filename [256]; - int defsession; - - if (name == NULL) { - return (jsonNewMessage (AFB_FATAL,"session name missing &session=MySessionName")); - } - - // check for current session request - defsession = (strcmp (name, AFB_DEFAULT_SESSION) ==0); - - // if directory for card's sessions.hash does not exist create it - response = checkCardDirExit (session, request); - if (response != NULL) return response; - - // add name and file extension to session name - strncpy (filename, request->prefix, sizeof(filename)); - strncat (filename, "/", sizeof(filename)); - if (defsession) strncat (filename, AFB_CURRENT_SESSION, sizeof(filename)-1); - else strncat (filename, name, sizeof(filename)-1); - strncat (filename, ".afb", sizeof(filename)); - - // just upload json object and return without any further processing - jsonSession = json_object_from_file (filename); +static struct AFB_clientCtx *ctxStoreSearch (const char* uuid) +{ + int idx; + struct AFB_clientCtx *client; - if (jsonSession == NULL) return (jsonNewMessage (AFB_EMPTY,"File [%s] not found", filename)); + assert (uuid != NULL); - // verify that file is a JSON ALSA session type - if (!json_object_object_get_ex (jsonSession, "jtype", &jtype)) { - json_object_put (jsonSession); - return (jsonNewMessage (AFB_EMPTY,"File [%s] 'jtype' descriptor not found", filename)); - } + pthread_mutex_lock(&sessions.mutex); - // check type value is AFB_SESSION_JTYPE - ajglabel = json_object_get_string (jtype); - if (strcmp (AFB_SESSION_JTYPE, ajglabel)) { - json_object_put (jsonSession); - return (jsonNewMessage (AFB_FATAL,"File [%s] jtype=[%s] != [%s]", filename, ajglabel, AFB_SESSION_JTYPE)); + for (idx=0; idx < sessions.max; idx++) { + client = sessions.store[idx]; + if (client && (0 == strcmp (uuid, client->uuid))) + goto found; } + client = NULL; - // create a link to keep track of last uploaded session for this card - if (!defsession) makeSessionLink (request->prefix, name); - - return (jsonSession); -} - -// push Json session object to disk -PUBLIC json_object * sessionToDisk (AFB_session *session, AFB_request *request, char *name, json_object *jsonSession) { - char filename [256]; - time_t rawtime; - struct tm * timeinfo; - int err, defsession; - static json_object *response; - - // we should have a session name - if (name == NULL) return (jsonNewMessage (AFB_FATAL,"session name missing &session=MySessionName")); - - // check for current session request - defsession = (strcmp (name, AFB_DEFAULT_SESSION) ==0); - - // if directory for card's sessions.hash does not exist create it - response = checkCardDirExit (session, request); - if (response != NULL) return response; - - // add cardname and file extension to session name - strncpy (filename, request->prefix, sizeof(filename)); - strncat (filename, "/", sizeof(filename)); - if (defsession) strncat (filename, AFB_CURRENT_SESSION, sizeof(filename)-1); - else strncat (filename, name, sizeof(filename)-1); - strncat (filename, ".afb", sizeof(filename)-1); - - - json_object_object_add(jsonSession, "jtype", json_object_new_string (AFB_SESSION_JTYPE)); - - // add a timestamp and store session on disk - time ( &rawtime ); timeinfo = localtime ( &rawtime ); - // A copy of the string is made and the memory is managed by the json_object - json_object_object_add (jsonSession, "timestamp", json_object_new_string (asctime (timeinfo))); - - - // do we have extra session info ? - if (request->post->type == AFB_POST_JSON) { - static json_object *info, *jtype; - const char *ajglabel; - - // extract session info from args - info = json_tokener_parse (request->post->data); - if (!info) { - response = jsonNewMessage (AFB_FATAL,"sndcard=%s session=%s invalid json args=%s", request->prefix, name, request->post); - goto OnErrorExit; - } - - // info is a valid AFB_info type - if (!json_object_object_get_ex (info, "jtype", &jtype)) { - response = jsonNewMessage (AFB_EMPTY,"sndcard=%s session=%s No 'AFB_pluginT' args=%s", request->prefix, name, request->post); - goto OnErrorExit; - } - - // check type value is AFB_INFO_JTYPE - ajglabel = json_object_get_string (jtype); - if (strcmp (AFB_SESSION_JINFO, ajglabel)) { - json_object_put (info); // release info json object - response = jsonNewMessage (AFB_FATAL,"File [%s] jtype=[%s] != [%s] data=%s", filename, ajglabel, AFB_SESSION_JTYPE, request->post); - goto OnErrorExit; - } - - // this is valid info data for our session - json_object_object_add (jsonSession, "info", info); - } - - // Finally save session on disk - err = json_object_to_file (filename, jsonSession); - if (err < 0) { - response = jsonNewMessage (AFB_FATAL,"Fail save session = [%s] to disk", filename); - goto OnErrorExit; - } - - - // create a link to keep track of last uploaded session for this card - if (!defsession) makeSessionLink (request->prefix, name); - - // we're donne let's return status message - response = jsonNewMessage (AFB_SUCCESS,"Session= [%s] saved on disk", filename); - json_object_put (jsonSession); - return (response); - -OnErrorExit: - json_object_put (jsonSession); - return response; +found: + pthread_mutex_unlock(&sessions.mutex); + return client; } - -// Free context [XXXX Should be protected again memory abort XXXX] -STATIC void ctxUuidFreeCB (AFB_clientCtx *client) { - - AFB_plugin **plugins = client->plugins; - AFB_freeCtxCB freeCtxCB; +static int ctxStoreDel (struct AFB_clientCtx *client) +{ int idx; - - // If application add a handle let's free it now - if (client->contexts != NULL) { - - // Free client handle with a standard Free function, with app callback or ignore it - for (idx=0; client->plugins[idx] != NULL; idx ++) { - if (client->contexts[idx] != NULL) { - freeCtxCB = client->plugins[idx]->freeCtxCB; - if (freeCtxCB == NULL) free (client->contexts[idx]); - else if (freeCtxCB != (void*)-1) freeCtxCB(client->contexts[idx], plugins[idx]->handle, client->uuid); - } - } - } -} + int status; -// Create a new store in RAM, not that is too small it will be automatically extended -PUBLIC void ctxStoreInit (int nbSession) { - int res; - - // let's create as store as hashtable does not have any - sessions.store = calloc (nbSession+1, sizeof(AFB_clientCtx)); - sessions.max=nbSession; -} + assert (client != NULL); -STATIC AFB_clientCtx *ctxStoreSearch (const char* uuid) { - int idx; - AFB_clientCtx *client; - - if (uuid == NULL) return NULL; - pthread_mutex_lock(&sessions.mutex); - + for (idx=0; idx < sessions.max; idx++) { - if (sessions.store[idx] && (0 == strcmp (uuid, sessions.store[idx]->uuid))) break; + if (sessions.store[idx] == client) { + sessions.store[idx]=NULL; + sessions.count--; + status = 1; + goto deleted; + } } - - if (idx == sessions.max) client=NULL; - else client= sessions.store[idx]; + status = 0; +deleted: pthread_mutex_unlock(&sessions.mutex); - - return (client); + return status; } - -STATIC AFB_error ctxStoreDel (AFB_clientCtx *client) { +static int ctxStoreAdd (struct AFB_clientCtx *client) +{ int idx; int status; - if (client == NULL) return (AFB_FAIL); - - pthread_mutex_lock(&sessions.mutex); - - for (idx=0; idx < sessions.max; idx++) { - if (sessions.store[idx] && (0 == strcmp (client->uuid, sessions.store[idx]->uuid))) break; - } - - if (idx == sessions.max) status=AFB_FAIL; - else { - sessions.count --; - ctxUuidFreeCB (sessions.store[idx]); - sessions.store[idx]=NULL; - status=AFB_SUCCESS; - } - - pthread_mutex_unlock(&sessions.mutex); - return (status); -} -STATIC AFB_error ctxStoreAdd (AFB_clientCtx *client) { - int idx; - int status; - if (client == NULL) return (AFB_FAIL); + assert (client != NULL); //fprintf (stderr, "ctxStoreAdd request uuid=%s count=%d\n", client->uuid, sessions.count); - + pthread_mutex_lock(&sessions.mutex); - + for (idx=0; idx < sessions.max; idx++) { - if (NULL == sessions.store[idx]) break; + if (NULL == sessions.store[idx]) { + sessions.store[idx]= client; + sessions.count++; + status = 1; + goto added; + } } - - if (idx == sessions.max) status=AFB_FAIL; - else { - status=AFB_SUCCESS; - sessions.count ++; - sessions.store[idx]= client; - } - - pthread_mutex_unlock(&sessions.mutex); - return (status); + status = 0; +added: + pthread_mutex_unlock(&sessions.mutex); + return status; } // Check if context timeout or not -STATIC int ctxStoreToOld (AFB_clientCtx *ctx, int timeout) { - int res; - time_t now = time(NULL); - res = ((ctx->timeStamp + timeout) <= now); - return (res); +static int ctxStoreTooOld (struct AFB_clientCtx *ctx, time_t now) +{ + return ctx->expiration <= now; } // Loop on every entry and remove old context sessions.hash -PUBLIC int ctxStoreGarbage (const int timeout) { - AFB_clientCtx *ctx; - long idx; - - // Loop on Sessions Table and remove anything that is older than timeout - for (idx=0; idx < sessions.max; idx++) { - ctx=sessions.store[idx]; - if ((ctx != NULL) && (ctxStoreToOld(ctx, timeout))) { - ctxStoreDel (ctx); - } - } +static void ctxStoreCleanUp (time_t now) +{ + struct AFB_clientCtx *ctx; + long idx; + + // Loop on Sessions Table and remove anything that is older than timeout + for (idx=0; idx < sessions.max; idx++) { + ctx = sessions.store[idx]; + if (ctx != NULL && ctxStoreTooOld(ctx, now)) { + ctxClientClose (ctx); + } + } } // This function will return exiting client context or newly created client context -PUBLIC AFB_clientCtx *ctxClientGet (AFB_request *request, int idx) { - AFB_clientCtx *clientCtx=NULL; - const char *uuid; - uuid_t newuuid; - int ret; - - if (request->config->token == NULL) return NULL; - - // Check if client as a context or not inside the URL - uuid = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "uuid"); - - // if UUID in query we're restfull with no cookies otherwise check for cookie - if (uuid != NULL) request->restfull = TRUE; - else { - request->restfull = FALSE; - uuid = MHD_lookup_connection_value (request->connection, MHD_COOKIE_KIND, COOKIE_NAME); - }; - - // Warning when no cookie defined MHD_lookup_connection_value may return something !!! - if ((uuid != NULL) && (strnlen (uuid, 10) >= 10)) { - int search; - // search if client context exist and it not timeout let's use it - clientCtx = ctxStoreSearch (uuid); - +struct AFB_clientCtx *ctxClientGet (const char *uuid) +{ + uuid_t newuuid; + struct AFB_clientCtx *clientCtx; + time_t now; + + /* search for an existing one not too old */ + now = NOW; + ctxStoreCleanUp (now); + clientCtx = uuid != NULL ? ctxStoreSearch (uuid) : NULL; if (clientCtx) { - if (ctxStoreToOld (clientCtx, request->config->cntxTimeout)) { - // this session is too old let's delete it - ctxStoreDel (clientCtx); - clientCtx=NULL; - } else { - request->context=clientCtx->contexts[idx]; - request->handle = clientCtx->plugins[idx]->handle; - request->uuid= uuid; - return (clientCtx); - } + clientCtx->refcount++; + return clientCtx; } - } - - // we have no session let's create one otherwise let's clean any exiting values - if (clientCtx == NULL) { - clientCtx = calloc(1, sizeof(AFB_clientCtx)); // init NULL clientContext - clientCtx->contexts = calloc (1, request->config->pluginCount * (sizeof (void*))); - clientCtx->plugins = request->plugins; - } - - uuid_generate(newuuid); // create a new UUID - uuid_unparse_lower(newuuid, clientCtx->uuid); - - // if table is full at 50% let's clean it up - if(sessions.count > (sessions.max / 2)) ctxStoreGarbage(request->config->cntxTimeout); - - // finally add uuid into hashtable - if (AFB_SUCCESS != ctxStoreAdd (clientCtx)) { - free (clientCtx); - return(NULL); - } - - // if (verbose) fprintf (stderr, "ctxClientGet New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp); - request->context = clientCtx->contexts[idx]; - request->handle = clientCtx->plugins[idx]->handle; - request->uuid=clientCtx->uuid; - return(clientCtx); + + /* mimic old behaviour */ + if (sessions.initok == NULL) + return NULL; + + /* check the uuid if given */ + if (uuid != NULL && 1 + strlen(uuid) >= sizeof clientCtx->uuid) + return NULL; + + /* returns a new one */ + clientCtx = calloc(1, sizeof(struct AFB_clientCtx)); // init NULL clientContext + if (clientCtx != NULL) { + clientCtx->contexts = calloc ((unsigned)sessions.apicount, sizeof (void*)); + if (clientCtx->contexts != NULL) { + /* generate the uuid */ + if (uuid == NULL) { + uuid_generate(newuuid); + uuid_unparse_lower(newuuid, clientCtx->uuid); + } else { + strcpy(clientCtx->uuid, uuid); + } + strcpy(clientCtx->token, sessions.initok); + clientCtx->expiration = now + sessions.timeout; + clientCtx->refcount = 1; + if (ctxStoreAdd (clientCtx)) + return clientCtx; + free(clientCtx->contexts); + } + free(clientCtx); + } + return NULL; } -// Sample Generic Ping Debug API -PUBLIC AFB_error ctxTokenCheck (AFB_clientCtx *clientCtx, AFB_request *request) { - const char *token; - - if (clientCtx->contexts == NULL) return AFB_EMPTY; - - // this time have to extract token from query list - token = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "token"); - - // if not token is providing we refuse the exchange - if ((token == NULL) || (clientCtx->token == NULL)) return (AFB_FALSE); - - // compare current token with previous one - if ((0 == strcmp (token, clientCtx->token)) && (!ctxStoreToOld (clientCtx, request->config->cntxTimeout))) { - return (AFB_SUCCESS); - } - - // Token is not valid let move level of assurance to zero and free attached client handle - return (AFB_FAIL); +void ctxClientPut(struct AFB_clientCtx *clientCtx) +{ + if (clientCtx != NULL) { + assert(clientCtx->refcount != 0); + --clientCtx->refcount; + } } // Free Client Session Context -PUBLIC AFB_error ctxTokenReset (AFB_clientCtx *clientCtx, AFB_request *request) { - int ret; - - if (clientCtx == NULL) return AFB_EMPTY; - - // Search for an existing client with the same UUID - clientCtx = ctxStoreSearch (clientCtx->uuid); - if (clientCtx == NULL) return AFB_FALSE; - - // Remove client from table - ctxStoreDel (clientCtx); - - return (AFB_SUCCESS); +void ctxClientClose (struct AFB_clientCtx *clientCtx) +{ + assert(clientCtx != NULL); + if (clientCtx->created) { + clientCtx->created = 0; + ctxUuidFreeCB (clientCtx); + } + if (clientCtx->refcount == 0) + ctxStoreDel (clientCtx); } -// generate a new token -PUBLIC AFB_error ctxTokenCreate (AFB_clientCtx *clientCtx, AFB_request *request) { - int oldTnkValid; - const char *ornew; - uuid_t newuuid; - const char *token; - - if (clientCtx == NULL) return AFB_EMPTY; - - // if config->token!="" then verify that we have the right initial share secret - if (request->config->token[0] != '\0') { - - // check for initial token secret and return if not presented - token = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "token"); - if (token == NULL) return AFB_UNAUTH; - - // verify that it fits with initial tokens fit - if (strcmp(request->config->token, token)) return AFB_UNAUTH; - } - - // create a UUID as token value - uuid_generate(newuuid); - uuid_unparse_lower(newuuid, clientCtx->token); - - // keep track of time for session timeout and further clean up - clientCtx->timeStamp=time(NULL); - - // Token is also store in context but it might be convenient for plugin to access it directly - return (AFB_SUCCESS); +// Sample Generic Ping Debug API +int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token) +{ + assert(clientCtx != NULL); + assert(token != NULL); + + // compare current token with previous one + if (ctxStoreTooOld (clientCtx, NOW)) + return 0; + + if (!clientCtx->token[0] || 0 == strcmp (token, clientCtx->token)) { + clientCtx->created = 1; /* creates by default */ + return 1; + } + + // Token is not valid let move level of assurance to zero and free attached client handle + return 0; } - // generate a new token and update client context -PUBLIC AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request) { - int oldTnkValid; - const char *oldornew; - uuid_t newuuid; - - if (clientCtx == NULL) return AFB_EMPTY; - - // Check if the old token is valid - if (ctxTokenCheck (clientCtx, request) != AFB_SUCCESS) return (AFB_FAIL); - - // Old token was valid let's regenerate a new one - uuid_generate(newuuid); // create a new UUID - uuid_unparse_lower(newuuid, clientCtx->token); - return (AFB_SUCCESS); - +void ctxTokenNew (struct AFB_clientCtx *clientCtx) +{ + uuid_t newuuid; + + assert(clientCtx != NULL); + + // Old token was valid let's regenerate a new one + uuid_generate(newuuid); // create a new UUID + uuid_unparse_lower(newuuid, clientCtx->token); + + // keep track of time for session timeout and further clean up + clientCtx->expiration = NOW + sessions.timeout; }