X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fsession.c;h=3b9288f810158c92ab7cc6fc282f5f77766b4d24;hb=80437693983321d32f20b6324128d441c5fccc49;hp=4877acf799ef1e9a85bfcf3a6e60d71719a094ba;hpb=3f13bc8ca416e6318bcbd199113a2cd69b11b2b6;p=src%2Fapp-framework-binder.git diff --git a/src/session.c b/src/session.c index 4877acf7..3b9288f8 100644 --- a/src/session.c +++ b/src/session.c @@ -31,14 +31,6 @@ #include -#define AFB_SESSION_JTYPE "AFB_session" -#define AFB_SESSION_JLIST "AFB_sessions.hash" -#define AFB_SESSION_JINFO "AFB_infos" - - -#define AFB_CURRENT_SESSION "active-session" // file link name within sndcard dir -#define AFB_DEFAULT_SESSION "current-session" // should be in sync with UI - // 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 @@ -47,30 +39,15 @@ static struct { int max; } 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); +#if defined(ALLOWS_SESSION_FILES) - // 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; - } +#define AFB_SESSION_JTYPE "AFB_session" +#define AFB_SESSION_JLIST "AFB_sessions.hash" +#define AFB_SESSION_JINFO "AFB_infos" - // 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; -} +#define AFB_CURRENT_SESSION "active-session" // file link name within sndcard dir +#define AFB_DEFAULT_SESSION "current-session" // should be in sync with UI // let's return only sessions.hash files STATIC int fileSelect (const struct dirent *entry) { @@ -81,8 +58,8 @@ STATIC json_object *checkCardDirExit (AFB_session *session, AFB_request *reques int sessionDir, cardDir; // card name should be more than 3 character long !!!! - if (strlen (request->plugin) < 3) { - return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->plugin)); + if (strlen (request->prefix) < 3) { + return (jsonNewMessage (AFB_FAIL,"Fail invalid plugin=%s", request->prefix)); } // open session directory @@ -92,17 +69,59 @@ STATIC json_object *checkCardDirExit (AFB_session *session, AFB_request *reques } // create session sndcard directory if it does not exit - cardDir = openat (sessionDir, request->plugin, O_DIRECTORY); + cardDir = openat (sessionDir, request->prefix, O_DIRECTORY); if (cardDir < 0) { - cardDir = mkdirat (sessionDir, request->plugin, O_RDWR | S_IRWXU | S_IRGRP); + 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->plugin, strerror(cardDir))); + 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 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)); +} + +// 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; +} + // create a session in current directory PUBLIC json_object *sessionList (AFB_session *session, AFB_request *request) { json_object *sessionsJ, *ajgResponse; @@ -120,13 +139,13 @@ PUBLIC json_object *sessionList (AFB_session *session, AFB_request *request) { return (jsonNewMessage (AFB_FAIL,"Fail to open directory [%s] error=%s", session->config->sessiondir, strerror(sessionDir))); } - count = scandirat (sessionDir, request->plugin, &namelist, fileSelect, alphasort); + 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->plugin, strerror(sessionDir))); + 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->plugin, session->config->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(); @@ -163,23 +182,6 @@ PUBLIC json_object *sessionList (AFB_session *session, AFB_request *request) { return (ajgResponse); } -// 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)); -} - // Load Json session object from disk PUBLIC json_object *sessionFromDisk (AFB_session *session, AFB_request *request, char *name) { json_object *jsonSession, *jtype, *response; @@ -199,7 +201,7 @@ PUBLIC json_object *sessionFromDisk (AFB_session *session, AFB_request *request, if (response != NULL) return response; // add name and file extension to session name - strncpy (filename, request->plugin, sizeof(filename)); + 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); @@ -224,7 +226,7 @@ PUBLIC json_object *sessionFromDisk (AFB_session *session, AFB_request *request, } // create a link to keep track of last uploaded session for this card - if (!defsession) makeSessionLink (request->plugin, name); + if (!defsession) makeSessionLink (request->prefix, name); return (jsonSession); } @@ -248,7 +250,7 @@ PUBLIC json_object * sessionToDisk (AFB_session *session, AFB_request *request, if (response != NULL) return response; // add cardname and file extension to session name - strncpy (filename, request->plugin, sizeof(filename)); + 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); @@ -271,13 +273,13 @@ PUBLIC json_object * sessionToDisk (AFB_session *session, AFB_request *request, // 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->plugin, name, request->post); + 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->plugin, name, request->post); + response = jsonNewMessage (AFB_EMPTY,"sndcard=%s session=%s No 'AFB_pluginT' args=%s", request->prefix, name, request->post); goto OnErrorExit; } @@ -302,7 +304,7 @@ PUBLIC json_object * sessionToDisk (AFB_session *session, AFB_request *request, // create a link to keep track of last uploaded session for this card - if (!defsession) makeSessionLink (request->plugin, name); + if (!defsession) makeSessionLink (request->prefix, name); // we're donne let's return status message response = jsonNewMessage (AFB_SUCCESS,"Session= [%s] saved on disk", filename); @@ -313,29 +315,35 @@ OnErrorExit: json_object_put (jsonSession); return response; } - - - +#endif // Free context [XXXX Should be protected again memory abort XXXX] STATIC void ctxUuidFreeCB (AFB_clientCtx *client) { - + + AFB_plugin **plugins = client->plugins; + AFB_freeCtxCB freeCtxCB; + int idx; + // If application add a handle let's free it now - if (client->ctx != NULL) { - + if (client->contexts != NULL) { + // Free client handle with a standard Free function, with app callback or ignore it - if (client->plugin->freeCtxCB == NULL) free (client->ctx); - else if (client->plugin->freeCtxCB != (void*)-1) client->plugin->freeCtxCB(client); + 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); + } + } } } // 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; + sessions.store = calloc (1 + (unsigned)nbSession, sizeof(AFB_clientCtx)); + sessions.max = nbSession; } STATIC AFB_clientCtx *ctxStoreSearch (const char* uuid) { @@ -352,7 +360,6 @@ STATIC AFB_clientCtx *ctxStoreSearch (const char* uuid) { if (idx == sessions.max) client=NULL; else client= sessions.store[idx]; - pthread_mutex_unlock(&sessions.mutex); return (client); @@ -363,8 +370,6 @@ STATIC AFB_error ctxStoreDel (AFB_clientCtx *client) { int idx; int status; if (client == NULL) return (AFB_FAIL); - - //fprintf (stderr, "ctxStoreDel request uuid=%s count=%d\n", client->uuid, sessions.count); pthread_mutex_lock(&sessions.mutex); @@ -375,16 +380,13 @@ STATIC AFB_error ctxStoreDel (AFB_clientCtx *client) { 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); - + pthread_mutex_unlock(&sessions.mutex); return (status); - - // plugin registered a callback let's release semaphore and cleanup now - if ((client->plugin->freeCtxCB != NULL) && client->ctx) client->plugin->freeCtxCB(client); } STATIC AFB_error ctxStoreAdd (AFB_clientCtx *client) { @@ -407,8 +409,7 @@ STATIC AFB_error ctxStoreAdd (AFB_clientCtx *client) { sessions.store[idx]= client; } - pthread_mutex_unlock(&sessions.mutex); - + pthread_mutex_unlock(&sessions.mutex); return (status); } @@ -421,7 +422,7 @@ STATIC int ctxStoreToOld (AFB_clientCtx *ctx, int timeout) { } // Loop on every entry and remove old context sessions.hash -PUBLIC int ctxStoreGarbage (const int timeout) { +PUBLIC void ctxStoreGarbage (const int timeout) { AFB_clientCtx *ctx; long idx; @@ -435,14 +436,12 @@ PUBLIC int ctxStoreGarbage (const int timeout) { } // This function will return exiting client context or newly created client context -PUBLIC AFB_error ctxClientGet (AFB_request *request, AFB_plugin *plugin) { - static int cid=0; +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 AFB_EMPTY; + 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"); @@ -450,13 +449,14 @@ PUBLIC AFB_error ctxClientGet (AFB_request *request, AFB_plugin *plugin) { // if UUID in query we're restfull with no cookies otherwise check for cookie if (uuid != NULL) request->restfull = TRUE; else { + char cookie[64]; request->restfull = FALSE; - uuid = MHD_lookup_connection_value (request->connection, MHD_COOKIE_KIND, COOKIE_NAME); + snprintf(cookie, sizeof cookie, "%s-%d", COOKIE_NAME, request->config->httpdPort); + uuid = MHD_lookup_connection_value (request->connection, MHD_COOKIE_KIND, cookie); }; // 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); @@ -466,49 +466,54 @@ PUBLIC AFB_error ctxClientGet (AFB_request *request, AFB_plugin *plugin) { ctxStoreDel (clientCtx); clientCtx=NULL; } else { - request->client=clientCtx; - return (AFB_SUCCESS); + request->context=clientCtx->contexts[idx]; + request->handle = clientCtx->plugins[idx]->handle; + request->uuid= uuid; + 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 + if (clientCtx == NULL) { + clientCtx = calloc(1, sizeof(AFB_clientCtx)); // init NULL clientContext + clientCtx->contexts = calloc (1, (unsigned)request->config->pluginCount * (sizeof (void*))); + clientCtx->plugins = request->plugins; + } + uuid_generate(newuuid); // create a new UUID uuid_unparse_lower(newuuid, clientCtx->uuid); - clientCtx->cid=cid++; // simple application uniqueID - clientCtx->plugin = plugin; // provide plugin callbacks a hook to plugin - clientCtx->plugin; // provide plugin callbacks a hook to plugin - + // 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(AFB_FAIL); + return(NULL); } // if (verbose) fprintf (stderr, "ctxClientGet New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp); - request->client = clientCtx; - - return(AFB_SUCCESS); + request->context = clientCtx->contexts[idx]; + request->handle = clientCtx->plugins[idx]->handle; + request->uuid=clientCtx->uuid; + return(clientCtx); } // Sample Generic Ping Debug API -PUBLIC AFB_error ctxTokenCheck (AFB_request *request) { +PUBLIC AFB_error ctxTokenCheck (AFB_clientCtx *clientCtx, AFB_request *request) { const char *token; - if (request->client == NULL) return AFB_EMPTY; + 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) || (request->client->token == NULL)) return (AFB_FALSE); + if ((token == NULL) || (clientCtx->token == NULL)) return (AFB_FALSE); // compare current token with previous one - if ((0 == strcmp (token, request->client->token)) && (!ctxStoreToOld (request->client, request->config->cntxTimeout))) { + if ((0 == strcmp (token, clientCtx->token)) && (!ctxStoreToOld (clientCtx, request->config->cntxTimeout))) { return (AFB_SUCCESS); } @@ -517,14 +522,13 @@ PUBLIC AFB_error ctxTokenCheck (AFB_request *request) { } // Free Client Session Context -PUBLIC AFB_error ctxTokenReset (AFB_request *request) { - int ret; - AFB_clientCtx *clientCtx; +PUBLIC AFB_error ctxTokenReset (AFB_clientCtx *clientCtx, AFB_request *request) { - if (request->client == NULL) return AFB_EMPTY; + if (clientCtx == NULL) return AFB_EMPTY; + //if (verbose) fprintf (stderr, "ctxClientReset New uuid=[%s] token=[%s] timestamp=%d\n", clientCtx->uuid, clientCtx->token, clientCtx->timeStamp); // Search for an existing client with the same UUID - clientCtx = ctxStoreSearch (request->client->uuid); + clientCtx = ctxStoreSearch (clientCtx->uuid); if (clientCtx == NULL) return AFB_FALSE; // Remove client from table @@ -534,13 +538,11 @@ PUBLIC AFB_error ctxTokenReset (AFB_request *request) { } // generate a new token -PUBLIC AFB_error ctxTokenCreate (AFB_request *request) { - int oldTnkValid; - const char *ornew; +PUBLIC AFB_error ctxTokenCreate (AFB_clientCtx *clientCtx, AFB_request *request) { uuid_t newuuid; const char *token; - if (request->client == NULL) return AFB_EMPTY; + 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') { @@ -549,16 +551,16 @@ PUBLIC AFB_error ctxTokenCreate (AFB_request *request) { token = MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, "token"); if (token == NULL) return AFB_UNAUTH; - // verify that presented initial tokens fit + // 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, request->client->token); + uuid_unparse_lower(newuuid, clientCtx->token); // keep track of time for session timeout and further clean up - request->client->timeStamp=time(NULL); + clientCtx->timeStamp=time(NULL); // Token is also store in context but it might be convenient for plugin to access it directly return (AFB_SUCCESS); @@ -566,19 +568,21 @@ PUBLIC AFB_error ctxTokenCreate (AFB_request *request) { // generate a new token and update client context -PUBLIC AFB_error ctxTokenRefresh (AFB_request *request) { - int oldTnkValid; - const char *oldornew; +PUBLIC AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request) { uuid_t newuuid; - if (request->client == NULL) return AFB_EMPTY; + if (clientCtx == NULL) return AFB_EMPTY; // Check if the old token is valid - if (ctxTokenCheck (request) != AFB_SUCCESS) return (AFB_FAIL); + 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, request->client->token); + uuid_unparse_lower(newuuid, clientCtx->token); + + // keep track of time for session timeout and further clean up + clientCtx->timeStamp=time(NULL); + return (AFB_SUCCESS); }