X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=3e08808faef926006ca55493db0f38fb765ffcb1;hb=04b1757467bcb4e287dd1c34d5a21f76705340d6;hp=eded14165b743330549d103534d7bdcc6ac88694;hpb=1205c90cccd3144bab24b4b5fd8dcbf0d0e6b570;p=src%2Fapp-framework-binder.git
diff --git a/src/session.c b/src/session.c
index eded1416..3e08808f 100644
--- a/src/session.c
+++ b/src/session.c
@@ -2,36 +2,29 @@
* Copyright (C) 2015 "IoT.bzh"
* Author "Fulup Ar Foll"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- * Reference:
- * http://stackoverflow.com/questions/25971505/how-to-delete-element-from-hsearch
+ * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-
-#include "local-def.h"
-#include
-#include
+#define _GNU_SOURCE
+#include
#include
-#include
-#include
#include
-#include
+#include
+#include
+#include
#include
+#include
-#include "afb-apis.h"
#include "session.h"
#define NOW (time(NULL))
@@ -39,7 +32,7 @@
// 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;
@@ -47,34 +40,41 @@ static struct {
const char *initok;
} sessions;
-static const char key_uuid[] = "uuid";
-static const char key_token[] = "token";
+void *afb_context_get(struct afb_context *actx)
+{
+ return actx->context;
+}
+
+void afb_context_set(struct afb_context *actx, void *context, void (*free_context)(void*))
+{
+fprintf(stderr, "afb_context_set(%p,%p) was (%p,%p)\n",context, free_context, actx->context, actx->free_context);
+ if (actx->context != NULL && actx->free_context != NULL)
+ actx->free_context(actx->context);
+ actx->context = context;
+ actx->free_context = free_context;
+}
// Free context [XXXX Should be protected again memory abort XXXX]
-static void ctxUuidFreeCB (AFB_clientCtx *client)
+static void ctxUuidFreeCB (struct AFB_clientCtx *client)
{
- int idx;
+ int idx;
- // If application add a handle let's free it now
- if (client->contexts != NULL) {
+ // 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]);
- }
- }
- }
+ // Free client handle with a standard Free function, with app callback or ignore it
+ for (idx=0; idx < sessions.apicount; idx ++)
+ afb_context_set(&client->contexts[idx], NULL, NULL);
}
// 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)
+void ctxStoreInit (int max_session_count, int timeout, const char *initok, int context_count)
{
// let's create as store as hashtable does not have any
- sessions.store = calloc (1 + (unsigned)nbSession, sizeof(AFB_clientCtx));
- sessions.max = nbSession;
+ sessions.store = calloc (1 + (unsigned)max_session_count, sizeof(struct AFB_clientCtx));
+ sessions.max = max_session_count;
sessions.timeout = timeout;
- sessions.apicount = apicount;
+ sessions.apicount = context_count;
if (strlen(initok) >= 37) {
fprintf(stderr, "Error: initial token '%s' too long (max length 36)", initok);
exit(1);
@@ -82,10 +82,10 @@ void ctxStoreInit (int nbSession, int timeout, int apicount, const char *initok)
sessions.initok = initok;
}
-static AFB_clientCtx *ctxStoreSearch (const char* uuid)
+static struct AFB_clientCtx *ctxStoreSearch (const char* uuid)
{
int idx;
- AFB_clientCtx *client;
+ struct AFB_clientCtx *client;
assert (uuid != NULL);
@@ -103,7 +103,7 @@ found:
return client;
}
-static AFB_error ctxStoreDel (AFB_clientCtx *client)
+static int ctxStoreDel (struct AFB_clientCtx *client)
{
int idx;
int status;
@@ -114,25 +114,24 @@ static AFB_error ctxStoreDel (AFB_clientCtx *client)
for (idx=0; idx < sessions.max; idx++) {
if (sessions.store[idx] == client) {
- sessions.store[idx]=NULL;
+ sessions.store[idx] = NULL;
sessions.count--;
- ctxUuidFreeCB (client);
- status = AFB_SUCCESS;
+ status = 1;
goto deleted;
}
}
- status = AFB_FAIL;
+ status = 0;
deleted:
pthread_mutex_unlock(&sessions.mutex);
return status;
}
-static AFB_error ctxStoreAdd (AFB_clientCtx *client)
+static int ctxStoreAdd (struct 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);
@@ -140,301 +139,81 @@ static AFB_error ctxStoreAdd (AFB_clientCtx *client)
for (idx=0; idx < sessions.max; idx++) {
if (NULL == sessions.store[idx]) {
- sessions.store[idx]= client;
+ sessions.store[idx] = client;
sessions.count++;
- status = AFB_SUCCESS;
+ status = 1;
goto added;
}
}
- status = AFB_FAIL;
-
+ status = 0;
added:
pthread_mutex_unlock(&sessions.mutex);
return status;
}
// Check if context timeout or not
-static int ctxStoreTooOld (AFB_clientCtx *ctx, time_t now)
+static int ctxStoreTooOld (struct AFB_clientCtx *ctx, time_t now)
{
- return ctx->timeStamp <= now;
+ return ctx->expiration <= now;
}
// Loop on every entry and remove old context sessions.hash
-void ctxStoreGarbage ()
-{
- AFB_clientCtx *ctx;
- long idx;
- time_t now = NOW;
-
- // 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))) {
- ctxStoreDel (ctx);
- }
- }
-}
-
-// This function will return exiting client context or newly created client context
-AFB_clientCtx *ctxClientGet (AFB_request *request)
-{
- AFB_clientCtx *clientCtx=NULL;
- const char *uuid;
- uuid_t newuuid;
-
- if (request->config->token == NULL) return NULL;
-
- // Check if client as a context or not inside the URL
- uuid = NULL; //MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, key_uuid);
-
- // 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;
- snprintf(cookie, sizeof cookie, "%s-%d", COOKIE_NAME, request->config->httpdPort);
- uuid = NULL; //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)) {
- // search if client context exist and it not timeout let's use it
- clientCtx = ctxStoreSearch (uuid);
-
- if (clientCtx) {
- if (ctxStoreTooOld (clientCtx, NOW)) {
- // this session is too old let's delete it
- ctxStoreDel (clientCtx);
- clientCtx = NULL;
- } else {
- 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 ((unsigned)sessions.apicount, sizeof (void*));
- }
-
- 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();
-
- // finally add uuid into hashtable
- if (AFB_SUCCESS != ctxStoreAdd (clientCtx)) {
- free (clientCtx);
- return NULL;
- }
- return clientCtx;
-}
-
-// Sample Generic Ping Debug API
-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 = NULL; //MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, key_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)) && (!ctxStoreTooOld (clientCtx, NOW))) {
- return AFB_SUCCESS;
- }
-
- // Token is not valid let move level of assurance to zero and free attached client handle
- return AFB_FAIL;
-}
-
-// Free Client Session Context
-AFB_error ctxTokenReset (AFB_clientCtx *clientCtx, AFB_request *request)
-{
- 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 (clientCtx->uuid);
- if (clientCtx == NULL)
- return AFB_FALSE;
-
- // Remove client from table
- ctxStoreDel (clientCtx);
-
- return AFB_SUCCESS;
-}
-
-// generate a new token
-AFB_error ctxTokenCreate (AFB_clientCtx *clientCtx, AFB_request *request)
-{
- 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 = NULL; //MHD_lookup_connection_value(request->connection, MHD_GET_ARGUMENT_KIND, key_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) + sessions.timeout;
-
- // Token is also store in context but it might be convenient for plugin to access it directly
- return AFB_SUCCESS;
-}
-
-
-// generate a new token and update client context
-AFB_error ctxTokenRefresh (AFB_clientCtx *clientCtx, AFB_request *request)
+static void ctxStoreCleanUp (time_t now)
{
- 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);
-
- // keep track of time for session timeout and further clean up
- clientCtx->timeStamp = time(NULL) + sessions.timeout;
-
- return AFB_SUCCESS;
+ 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
-AFB_clientCtx *_ctxClientGet (const char *uuid)
+struct AFB_clientCtx *ctxClientGetForUuid (const char *uuid)
{
uuid_t newuuid;
- AFB_clientCtx *clientCtx;
+ 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 (!ctxStoreTooOld (clientCtx, NOW))
+ clientCtx->refcount++;
return clientCtx;
- ctxStoreDel (clientCtx);
}
/* mimic old behaviour */
+/*
+TODO remove? not remove?
if (sessions.initok == NULL)
return NULL;
-
- /* cleanup before creating */
- if(2 * sessions.count >= sessions.max)
- ctxStoreGarbage();
+*/
+ /* check the uuid if given */
+ if (uuid != NULL && strlen(uuid) >= sizeof clientCtx->uuid)
+ return NULL;
/* returns a new one */
- clientCtx = calloc(1, sizeof(AFB_clientCtx)); // init NULL clientContext
+ clientCtx = calloc(1, sizeof(struct AFB_clientCtx)); // init NULL clientContext
if (clientCtx != NULL) {
- clientCtx->contexts = calloc ((unsigned)sessions.apicount, sizeof (void*));
+ clientCtx->contexts = calloc ((unsigned)sessions.apicount, sizeof(*clientCtx->contexts));
if (clientCtx->contexts != NULL) {
/* generate the uuid */
- uuid_generate(newuuid);
- uuid_unparse_lower(newuuid, clientCtx->uuid);
- clientCtx->timeStamp = time(NULL) + sessions.timeout;
+ if (uuid == NULL) {
+ uuid_generate(newuuid);
+ uuid_unparse_lower(newuuid, clientCtx->uuid);
+ } else {
+ strcpy(clientCtx->uuid, uuid);
+ }
strcpy(clientCtx->token, sessions.initok);
- if (AFB_SUCCESS == ctxStoreAdd (clientCtx))
+ clientCtx->expiration = now + sessions.timeout;
+ clientCtx->refcount = 1;
+ if (ctxStoreAdd (clientCtx))
return clientCtx;
free(clientCtx->contexts);
}
@@ -443,33 +222,61 @@ AFB_clientCtx *_ctxClientGet (const char *uuid)
return NULL;
}
+struct AFB_clientCtx *ctxClientGet(struct AFB_clientCtx *clientCtx)
+{
+ if (clientCtx != NULL)
+ clientCtx->refcount++;
+ return clientCtx;
+}
+
+void ctxClientPut(struct AFB_clientCtx *clientCtx)
+{
+ if (clientCtx != NULL) {
+ assert(clientCtx->refcount != 0);
+ --clientCtx->refcount;
+ }
+}
+
// Free Client Session Context
-AFB_error _ctxClientDel (AFB_clientCtx *clientCtx)
+void ctxClientClose (struct AFB_clientCtx *clientCtx)
{
assert(clientCtx != NULL);
- return ctxStoreDel (clientCtx);
+ if (clientCtx->created) {
+ clientCtx->created = 0;
+ ctxUuidFreeCB (clientCtx);
+ }
+ if (clientCtx->refcount == 0)
+ ctxStoreDel (clientCtx);
}
// Sample Generic Ping Debug API
-AFB_error _ctxTokenCheck (AFB_clientCtx *clientCtx, const char *token)
+int ctxTokenCheckLen (struct AFB_clientCtx *clientCtx, const char *token, size_t length)
{
assert(clientCtx != NULL);
assert(token != NULL);
// compare current token with previous one
if (ctxStoreTooOld (clientCtx, NOW))
- return AFB_FAIL;
- if (!clientCtx->token[0] || 0 == strcmp (token, clientCtx->token)) {
- clientCtx->timeStamp = time(NULL) + sessions.timeout;
- return AFB_SUCCESS;
- }
+ return 0;
+
+ if (clientCtx->token[0] && (length >= sizeof(clientCtx->token) || strncmp (token, clientCtx->token, length) || clientCtx->token[length]))
+ return 0;
- // Token is not valid let move level of assurance to zero and free attached client handle
- return AFB_FAIL;
+ clientCtx->created = 1; /* creates by default */
+ return 1;
+}
+
+// Sample Generic Ping Debug API
+int ctxTokenCheck (struct AFB_clientCtx *clientCtx, const char *token)
+{
+ assert(clientCtx != NULL);
+ assert(token != NULL);
+
+ return ctxTokenCheckLen(clientCtx, token, strlen(token));
}
// generate a new token and update client context
-AFB_error _ctxTokenNew (AFB_clientCtx *clientCtx)
+void ctxTokenNew (struct AFB_clientCtx *clientCtx)
{
uuid_t newuuid;
@@ -480,8 +287,98 @@ AFB_error _ctxTokenNew (AFB_clientCtx *clientCtx)
uuid_unparse_lower(newuuid, clientCtx->token);
// keep track of time for session timeout and further clean up
- clientCtx->timeStamp = time(NULL) + sessions.timeout;
+ clientCtx->expiration = NOW + sessions.timeout;
+}
+
+struct afb_event_sender_list
+{
+ struct afb_event_sender_list *next;
+ struct afb_event_sender sender;
+ int refcount;
+};
+
+int ctxClientEventSenderAdd(struct AFB_clientCtx *clientCtx, struct afb_event_sender sender)
+{
+ struct afb_event_sender_list *iter, **prv;
+
+ prv = &clientCtx->senders;
+ for (;;) {
+ iter = *prv;
+ if (iter == NULL) {
+ iter = calloc(1, sizeof *iter);
+ if (iter == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+ iter->sender = sender;
+ iter->refcount = 1;
+ *prv = iter;
+ return 0;
+ }
+ if (iter->sender.itf == sender.itf && iter->sender.closure == sender.closure) {
+ iter->refcount++;
+ return 0;
+ }
+ prv = &iter->next;
+ }
+}
- return AFB_SUCCESS;
+void ctxClientEventSenderRemove(struct AFB_clientCtx *clientCtx, struct afb_event_sender sender)
+{
+ struct afb_event_sender_list *iter, **prv;
+
+ prv = &clientCtx->senders;
+ for (;;) {
+ iter = *prv;
+ if (iter == NULL)
+ return;
+ if (iter->sender.itf == sender.itf && iter->sender.closure == sender.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)
+{
+ struct afb_event_sender_list *iter;
+ int result;
+
+ result = 0;
+ iter = clientCtx->senders;
+ while (iter != NULL) {
+ iter->sender.itf->send(iter->sender.closure, event, object);
+ result++;
+ iter = iter->next;
+ }
+
+ return result;
+}
+
+int ctxClientEventSend(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+{
+ 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 = ctxClientGet(clientCtx);
+ result += send(clientCtx, event, object);
+ ctxClientPut(clientCtx);
+ }
+ }
+ }
+ return result;
}