X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fsession.c;h=9944e764935d723b0bdb49a65a031493c886c4db;hb=c94e1ef88adc641ebbab57377b97f8a7b6a70d1b;hp=ae44f7938af08a07243f3cc8dde7c854ba2ffd16;hpb=4256f76f127ff982415e875567da08408087f326;p=src%2Fapp-framework-binder.git

diff --git a/src/session.c b/src/session.c
index ae44f793..9944e764 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,12 +25,40 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <json.h>
+#include <json-c/json.h>
 
 #include "session.h"
+#include "verbose.h"
 
 #define NOW (time(NULL))
 
+struct client_value
+{
+	void *value;
+	void (*free_value)(void*);
+};
+
+struct cookie
+{
+	struct cookie *next;
+	const void *key;
+	void *value;
+	void (*free_value)(void*);
+};
+
+struct AFB_clientCtx
+{
+	unsigned refcount;
+	unsigned loa;
+	int timeout;
+	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 cookie *cookies;
+};
+
 // 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
@@ -39,34 +67,39 @@ static struct {
   int max;
   int timeout;
   int apicount;
-  const char *initok;
+  char initok[37];
 } sessions;
 
-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*))
+/* generate a uuid */
+static void new_uuid(char uuid[37])
 {
-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;
+	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)
 {
 	int idx;
+	struct cookie *cookie;
 
 	// If application add a handle let's free it now
-	assert (client->contexts != NULL);
+	assert (client->values != NULL);
 
 	// 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);
+		ctxClientValueSet(client, idx, NULL, NULL);
+
+	// free cookies
+	cookie = client->cookies;
+	while (cookie != NULL) {
+		client->cookies = cookie->next;
+		if (cookie->value != NULL && cookie->free_value != NULL)
+			cookie->free_value(cookie->value);
+		free(cookie);
+		cookie = client->cookies;
+	}
 }
 
 // Create a new store in RAM, not that is too small it will be automatically extended
@@ -77,11 +110,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) >= 37) {
-		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)
@@ -135,8 +172,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++) {
@@ -156,7 +191,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
@@ -174,68 +217,112 @@ static void ctxStoreCleanUp (time_t now)
 	}
 }
 
-// This function will return exiting client context or newly created client context
-struct AFB_clientCtx *ctxClientGetForUuid (const char *uuid)
+static struct AFB_clientCtx *new_context (const char *uuid, int timeout, time_t now)
 {
-	uuid_t newuuid;
 	struct AFB_clientCtx *clientCtx;
+
+	/* allocates a new one */
+        clientCtx = calloc(1, sizeof(struct AFB_clientCtx) + ((unsigned)sessions.apicount * sizeof(*clientCtx->values)));
+	if (clientCtx == NULL) {
+		errno = ENOMEM;
+		goto error;
+	}
+        clientCtx->values = (void*)(clientCtx + 1);
+
+	/* generate the uuid */
+	if (uuid == NULL) {
+		new_uuid(clientCtx->uuid);
+	} else {
+		if (strlen(uuid) >= sizeof clientCtx->uuid) {
+			errno = EINVAL;
+			goto error2;
+		}
+		strcpy(clientCtx->uuid, uuid);
+	}
+
+	/* init the token */
+	strcpy(clientCtx->token, sessions.initok);
+	clientCtx->timeout = timeout;
+	if (timeout != 0)
+		clientCtx->expiration = now + timeout;
+	else {
+		clientCtx->expiration = (time_t)(~(time_t)0);
+		if (clientCtx->expiration < 0)
+			clientCtx->expiration = (time_t)(((unsigned long long)clientCtx->expiration) >> 1);
+	}
+	if (!ctxStoreAdd (clientCtx)) {
+		errno = ENOMEM;
+		goto error2;
+	}
+
+	clientCtx->access = now;
+	clientCtx->refcount = 1;
+	return clientCtx;
+
+error2:
+	free(clientCtx);
+error:
+	return NULL;
+}
+
+struct AFB_clientCtx *ctxClientCreate (const char *uuid, int timeout)
+{
 	time_t now;
 
-	/* search for an existing one not too old */
+	/* cleaning */
 	now = NOW;
 	ctxStoreCleanUp (now);
-	clientCtx = uuid != NULL ? ctxStoreSearch (uuid) : NULL;
-	if (clientCtx) {
-		clientCtx->refcount++;
-		return clientCtx;
-        }
 
-	/* mimic old behaviour */
-/*
-TODO remove? not remove?
-	if (sessions.initok == NULL)
-		return NULL;
-*/
-	/* check the uuid if given */
-	if (uuid != NULL && strlen(uuid) >= sizeof clientCtx->uuid)
+	/* search for an existing one not too old */
+	if (uuid != NULL && ctxStoreSearch(uuid) != NULL) {
+		errno = EEXIST;
 		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(*clientCtx->contexts));
-		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);
+	return new_context(uuid, timeout, now);
+}
+
+// This function will return exiting client context or newly created client context
+struct AFB_clientCtx *ctxClientGetSession (const char *uuid, int *created)
+{
+	struct AFB_clientCtx *clientCtx;
+	time_t now;
+
+	/* cleaning */
+	now = NOW;
+	ctxStoreCleanUp (now);
+
+	/* search for an existing one not too old */
+	if (uuid != NULL) {
+		clientCtx = ctxStoreSearch(uuid);
+		if (clientCtx != NULL) {
+			*created = 0;
+			clientCtx->access = now;
+			clientCtx->refcount++;
+			return clientCtx;
 		}
-		free(clientCtx);
 	}
-	return NULL;
+
+	*created = 1;
+	return new_context(uuid, sessions.timeout, now);
 }
 
-struct AFB_clientCtx *ctxClientGet(struct AFB_clientCtx *clientCtx)
+struct AFB_clientCtx *ctxClientAddRef(struct AFB_clientCtx *clientCtx)
 {
 	if (clientCtx != NULL)
 		clientCtx->refcount++;
 	return clientCtx;
 }
 
-void ctxClientPut(struct AFB_clientCtx *clientCtx)
+void ctxClientUnref(struct AFB_clientCtx *clientCtx)
 {
 	if (clientCtx != NULL) {
 		assert(clientCtx->refcount != 0);
 		--clientCtx->refcount;
+       		if (clientCtx->refcount == 0 && clientCtx->uuid[0] == 0) {
+			ctxStoreDel (clientCtx);
+			free(clientCtx);
+		}
 	}
 }
 
@@ -243,144 +330,131 @@ void ctxClientPut(struct AFB_clientCtx *clientCtx)
 void ctxClientClose (struct AFB_clientCtx *clientCtx)
 {
 	assert(clientCtx != NULL);
-	if (clientCtx->created) {
-		clientCtx->created = 0;
+	if (clientCtx->uuid[0] != 0) {
+		clientCtx->uuid[0] = 0;
 	        ctxUuidFreeCB (clientCtx);
+       		if (clientCtx->refcount == 0) {
+			ctxStoreDel (clientCtx);
+			free(clientCtx);
+		}
 	}
-       	if (clientCtx->refcount == 0)
-		ctxStoreDel (clientCtx);
 }
 
 // Sample Generic Ping Debug API
-int ctxTokenCheckLen (struct AFB_clientCtx *clientCtx, const char *token, size_t length)
+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))
+	if (!ctxIsActive (clientCtx, NOW))
 		return 0;
 
-	if (clientCtx->token[0] && (length >= sizeof(clientCtx->token) || strncmp (token, clientCtx->token, length) || clientCtx->token[length]))
+	if (clientCtx->token[0] && strcmp (token, clientCtx->token) != 0)
 		return 0;
 
-	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
 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;
+	if (clientCtx->timeout != 0)
+		clientCtx->expiration = NOW + clientCtx->timeout;
 }
 
-struct afb_event_listener_list
+const char *ctxClientGetUuid (struct AFB_clientCtx *clientCtx)
 {
-	struct afb_event_listener_list *next;
-	struct afb_event_listener listener;
-	int refcount;
-};
+	assert(clientCtx != NULL);
+	return clientCtx->uuid;
+}
 
-int ctxClientEventListenerAdd(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+const char *ctxClientGetToken (struct AFB_clientCtx *clientCtx)
 {
-	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;
-	}
+	assert(clientCtx != NULL);
+	return clientCtx->token;
 }
 
-void ctxClientEventListenerRemove(struct AFB_clientCtx *clientCtx, struct afb_event_listener listener)
+unsigned ctxClientGetLOA (struct AFB_clientCtx *clientCtx)
 {
-	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;
-	}
+	assert(clientCtx != NULL);
+	return clientCtx->loa;
 }
 
-static int send(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+void ctxClientSetLOA (struct AFB_clientCtx *clientCtx, unsigned loa)
 {
-	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;
-	}
+	assert(clientCtx != NULL);
+	clientCtx->loa = loa;
+}
 
-	return result;
+void *ctxClientValueGet(struct AFB_clientCtx *clientCtx, int index)
+{
+	assert(clientCtx != NULL);
+	assert(index >= 0);
+	assert(index < sessions.apicount);
+	return clientCtx->values[index].value;
 }
 
-int ctxClientEventSend(struct AFB_clientCtx *clientCtx, const char *event, struct json_object *object)
+void ctxClientValueSet(struct AFB_clientCtx *clientCtx, int index, void *value, void (*free_value)(void*))
 {
-	long idx;
-	time_t now;
-	int result;
+	struct client_value prev;
+	assert(clientCtx != NULL);
+	assert(index >= 0);
+	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.value != value && prev.free_value != NULL)
+		prev.free_value(prev.value);
+}
 
-	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);
-			}
+void *ctxClientCookieGet(struct AFB_clientCtx *clientCtx, const void *key)
+{
+	struct cookie *cookie;
+
+	cookie = clientCtx->cookies;
+	while(cookie != NULL) {
+		if (cookie->key == key)
+			return cookie->value;
+		cookie = cookie->next;
+	}
+	return NULL;
+}
+
+int ctxClientCookieSet(struct AFB_clientCtx *clientCtx, const void *key, void *value, void (*free_value)(void*))
+{
+	struct cookie *cookie;
+
+	/* search for a replacement */
+	cookie = clientCtx->cookies;
+	while(cookie != NULL) {
+		if (cookie->key == key) {
+			if (cookie->value != NULL && cookie->value != value && cookie->free_value != NULL)
+				cookie->free_value(cookie->value);
+			cookie->value = value;
+			cookie->free_value = free_value;
+			return 0;
 		}
+		cookie = cookie->next;
 	}
-	return result;
+
+	/* allocates */
+	cookie = malloc(sizeof *cookie);
+	if (cookie == NULL) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	cookie->key = key;
+	cookie->value = value;
+	cookie->free_value = free_value;
+	cookie->next = clientCtx->cookies;
+	clientCtx->cookies = cookie;
+	return 0;
 }