X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=e0d0a8e64ea05431fd361e9a7b868fbf6251942a;hb=7e0abe76db7b90369429bf387d7aad0fb5a42328;hp=d586e51791b00ddc1df5ef903a2a3ab7d82be274;hpb=f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6;p=src%2Fapp-framework-binder.git diff --git a/src/session.c b/src/session.c index d586e517..e0d0a8e6 100644 --- a/src/session.c +++ b/src/session.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 "IoT.bzh" + * Copyright (C) 2015, 2016 "IoT.bzh" * Author "Fulup Ar Foll" * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,9 +25,10 @@ #include #include -#include +#include #include "session.h" +#include "verbose.h" #define NOW (time(NULL)) @@ -37,22 +38,15 @@ struct client_value void (*free_value)(void*); }; -struct afb_event_listener_list -{ - struct afb_event_listener_list *next; - struct afb_event_listener listener; - int refcount; -}; - struct AFB_clientCtx { unsigned refcount; + unsigned loa; time_t expiration; // expiration time of the token time_t access; char uuid[37]; // long term authentication of remote client char token[37]; // short term authentication of remote client struct client_value *values; - struct afb_event_listener_list *listeners; }; // Session UUID are store in a simple array [for 10 sessions this should be enough] @@ -63,9 +57,17 @@ static struct { int max; int timeout; int apicount; - const char *initok; + char initok[37]; } sessions; +/* generate a uuid */ +static void new_uuid(char uuid[37]) +{ + uuid_t newuuid; + uuid_generate(newuuid); + uuid_unparse_lower(newuuid, uuid); +} + // Free context [XXXX Should be protected again memory abort XXXX] static void ctxUuidFreeCB (struct AFB_clientCtx *client) { @@ -87,11 +89,15 @@ void ctxStoreInit (int max_session_count, int timeout, const char *initok, int c sessions.max = max_session_count; sessions.timeout = timeout; sessions.apicount = context_count; - if (strlen(initok) >= sizeof(sessions.store[0]->token)) { - fprintf(stderr, "Error: initial token '%s' too long (max length 36)", initok); + if (initok == NULL) + /* without token, a secret is made to forbid creation of sessions */ + new_uuid(sessions.initok); + else if (strlen(initok) < sizeof(sessions.store[0]->token)) + strcpy(sessions.initok, initok); + else { + ERROR("initial token '%s' too long (max length 36)", initok); exit(1); } - sessions.initok = initok; } static struct AFB_clientCtx *ctxStoreSearch (const char* uuid) @@ -145,8 +151,6 @@ static int ctxStoreAdd (struct AFB_clientCtx *client) 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++) { @@ -166,7 +170,15 @@ added: // Check if context timeout or not static int ctxStoreTooOld (struct AFB_clientCtx *ctx, time_t now) { - return ctx->expiration <= now; + assert (ctx != NULL); + return ctx->expiration < now; +} + +// Check if context is active or not +static int ctxIsActive (struct AFB_clientCtx *ctx, time_t now) +{ + assert (ctx != NULL); + return ctx->uuid[0] != 0 && ctx->expiration >= now; } // Loop on every entry and remove old context sessions.hash @@ -187,7 +199,6 @@ static void ctxStoreCleanUp (time_t now) // This function will return exiting client context or newly created client context struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created) { - uuid_t newuuid; struct AFB_clientCtx *clientCtx; time_t now; @@ -218,8 +229,7 @@ struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created) /* generate the uuid */ if (uuid == NULL) { - uuid_generate(newuuid); - uuid_unparse_lower(newuuid, clientCtx->uuid); + new_uuid(clientCtx->uuid); } else { strcpy(clientCtx->uuid, uuid); } @@ -258,6 +268,7 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx) --clientCtx->refcount; if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) { ctxStoreDel (clientCtx); + free(clientCtx); } } } @@ -266,8 +277,14 @@ void ctxClientUnref(struct AFB_clientCtx *clientCtx) void ctxClientClose (struct AFB_clientCtx *clientCtx) { assert(clientCtx != NULL); - ctxUuidFreeCB (clientCtx); - clientCtx->uuid[0] = 0; + if (clientCtx->uuid[0] != 0) { + clientCtx->uuid[0] = 0; + ctxUuidFreeCB (clientCtx); + if (clientCtx->refcount == 0) { + ctxStoreDel (clientCtx); + free(clientCtx); + } + } } // Sample Generic Ping Debug API @@ -277,7 +294,7 @@ int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token) assert(token != NULL); // compare current token with previous one - if (ctxStoreTooOld (clientCtx, NOW)) + if (!ctxIsActive (clientCtx, NOW)) return 0; if (clientCtx->token[0] && strcmp (token, clientCtx->token) != 0) @@ -289,113 +306,37 @@ int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token) // generate a new token and update client context 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); + new_uuid(clientCtx->token); // keep track of time for session timeout and further clean up clientCtx->expiration = NOW + sessions.timeout; } -int ctxClientEventListenerAdd(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener) -{ - struct afb_event_listener_list *iter, **prv; - - prv = &clientCtx->listeners; - for (;;) { - iter = *prv; - if (iter == NULL) { - iter = calloc(1, sizeof *iter); - if (iter == NULL) { - errno = ENOMEM; - return -1; - } - iter->listener = listener; - iter->refcount = 1; - *prv = iter; - return 0; - } - if (iter->listener.itf == listener.itf && iter->listener.closure == listener.closure) { - iter->refcount++; - return 0; - } - prv = &iter->next; - } -} - -void ctxClientEventListenerRemove(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener) -{ - struct afb_event_listener_list *iter, **prv; - - prv = &clientCtx->listeners; - for (;;) { - iter = *prv; - if (iter == NULL) - return; - if (iter->listener.itf == listener.itf && iter->listener.closure == listener.closure) { - if (!--iter->refcount) { - *prv = iter->next; - free(iter); - } - return; - } - prv = &iter->next; - } -} - -static int send(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object) +const char *ctxClientGetUuid (struct AFB_clientCtx *clientCtx) { - struct afb_event_listener_list *iter; - int result; - - result = 0; - iter = clientCtx->listeners; - while (iter != NULL) { - iter->listener.itf->send(iter->listener.closure, event, json_object_get(object)); - result++; - iter = iter->next; - } - - return result; + assert(clientCtx != NULL); + return clientCtx->uuid; } -int ctxClientEventSend(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object) +const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx) { - long idx; - time_t now; - int result; - - if (clientCtx != NULL) - result = send(clientCtx, event, object); - else { - result = 0; - now = NOW; - for (idx=0; idx < sessions.max; idx++) { - clientCtx = sessions.store[idx]; - if (clientCtx != NULL && !ctxStoreTooOld(clientCtx, now)) { - clientCtx = ctxClientAddRef(clientCtx); - result += send(clientCtx, event, object); - ctxClientUnref(clientCtx); - } - } - } - return result; + assert(clientCtx != NULL); + return clientCtx->token; } -const char *ctxClientGetUuid (struct AFB_clientCtx *clientCtx) +unsigned ctxClientGetLOA (struct AFB_clientCtx *clientCtx) { assert(clientCtx != NULL); - return clientCtx->uuid; + return clientCtx->loa; } -const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx) +void ctxClientSetLOA (struct AFB_clientCtx *clientCtx, unsigned loa) { assert(clientCtx != NULL); - return clientCtx->token; + clientCtx->loa = loa; } void *ctxClientValueGet(struct AFB_clientCtx *clientCtx, int index) @@ -414,6 +355,6 @@ void ctxClientValueSet(struct AFB_clientCtx *clientCtx, int index, void *value, assert(index < sessions.apicount); prev = clientCtx->values[index]; clientCtx->values[index] = (struct client_value){.value = value, .free_value = free_value}; - if (prev.value != NULL && prev.free_value != NULL) + if (prev.value != NULL && prev.value != value && prev.free_value != NULL) prev.free_value(prev.value); }