From b4da3b7f3db2211e7ecca74301e26b3089fda5a2 Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Fri, 15 Nov 2019 16:21:03 +0100 Subject: Move tokens from sessions to requests Tokens are no more related to sessions. Each request provides a token. In the case of websockets or connected link, the context can record the token. Bug-AGL: SPEC-2968 Change-Id: I1442b0422584c5a5b860ddb826518b0e673612f9 Signed-off-by: Jose Bollo --- src/afb-ws-json1.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/afb-ws-json1.c') diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index fd132197..a8461707 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -177,13 +177,33 @@ static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1) afb_ws_json1_unref(ws); } +static int aws_new_token(struct afb_ws_json1 *ws, const char *new_token_string) +{ + int rc; + struct afb_token *newtok, *oldtok; + + rc = afb_token_get(&newtok, new_token_string); + if (rc >= 0) { + oldtok = ws->token; + ws->token = newtok; + afb_token_unref(oldtok); + } + return rc; +} + static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg) { struct afb_ws_json1 *ws = closure; struct afb_wsreq *wsreq; + const char *tok; DEBUG("received websocket request for %s/%s: %s", api, verb, afb_wsj1_msg_object_s(msg)); + /* handle new tokens */ + tok = afb_wsj1_msg_token(msg); + if (tok) + aws_new_token(ws, tok); + /* allocate */ wsreq = calloc(1, sizeof *wsreq); if (wsreq == NULL) { @@ -193,7 +213,7 @@ static void aws_on_call_cb(void *closure, const char *api, const char *verb, str /* init the context */ afb_xreq_init(&wsreq->xreq, &afb_ws_json1_xreq_itf); - afb_context_init(&wsreq->xreq.context, ws->session, afb_wsj1_msg_token(msg)); + afb_context_init(&wsreq->xreq.context, ws->session, ws->token); if (!wsreq->xreq.context.invalidated) wsreq->xreq.context.validated = 1; -- cgit 1.2.3-korg