#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include "afb-hsrv.h"
#include "afb-session.h"
#include "afb-cred.h"
+#include "afb-token.h"
#include "verbose.h"
#include "locale-root.h"
static const char long_key_for_reqid[] = "x-afb-reqid";
static const char short_key_for_reqid[] = "reqid";
+static const char key_for_bearer[] = "Bearer";
+static const char key_for_access_token[] = "access_token";
+
static char *cookie_name = NULL;
static char *cookie_setter = NULL;
static char *tmp_pattern = NULL;
MHD_add_response_header(response, k, v);
k = va_arg(args, const char *);
}
- v = afb_context_sent_uuid(&hreq->xreq.context);
+
+ v = afb_context_uuid(&hreq->xreq.context);
if (v != NULL && asprintf(&cookie, cookie_setter, v) > 0) {
MHD_add_response_header(response, MHD_HTTP_HEADER_SET_COOKIE, cookie);
free(cookie);
return MHD_lookup_connection_value(hreq->connection, MHD_HEADER_KIND, name);
}
+const char *afb_hreq_get_authorization_bearer(struct afb_hreq *hreq)
+{
+ const char *value = afb_hreq_get_header(hreq, MHD_HTTP_HEADER_AUTHORIZATION);
+ if (value) {
+ if (strncasecmp(value, key_for_bearer, sizeof key_for_bearer - 1) == 0) {
+ value += sizeof key_for_bearer - 1;
+ if (isblank(*value++)) {
+ while (isblank(*value))
+ value++;
+ if (*value)
+ return value;
+ }
+ }
+ }
+ return NULL;
+}
+
int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data, size_t size)
{
void *p;
{
const char *uuid;
const char *token;
+ struct afb_token *tok;
if (hreq->xreq.context.session != NULL)
return 0;
+ /* get the uuid of the session */
uuid = afb_hreq_get_header(hreq, long_key_for_uuid);
- if (uuid == NULL)
+ if (uuid == NULL) {
uuid = afb_hreq_get_argument(hreq, long_key_for_uuid);
- if (uuid == NULL)
- uuid = afb_hreq_get_cookie(hreq, cookie_name);
- if (uuid == NULL)
- uuid = afb_hreq_get_argument(hreq, short_key_for_uuid);
-
- token = afb_hreq_get_header(hreq, long_key_for_token);
- if (token == NULL)
- token = afb_hreq_get_argument(hreq, long_key_for_token);
- if (token == NULL)
- token = afb_hreq_get_argument(hreq, short_key_for_token);
-
- return afb_context_connect(&hreq->xreq.context, uuid, token);
+ if (uuid == NULL) {
+ uuid = afb_hreq_get_cookie(hreq, cookie_name);
+ if (uuid == NULL)
+ uuid = afb_hreq_get_argument(hreq, short_key_for_uuid);
+ }
+ }
+
+ /* get the authorisation token */
+ token = afb_hreq_get_authorization_bearer(hreq);
+ if (token == NULL) {
+ token = afb_hreq_get_argument(hreq, key_for_access_token);
+ if (token == NULL) {
+ token = afb_hreq_get_header(hreq, long_key_for_token);
+ if (token == NULL) {
+ token = afb_hreq_get_argument(hreq, long_key_for_token);
+ if (token == NULL)
+ token = afb_hreq_get_argument(hreq, short_key_for_token);
+ }
+ }
+ }
+ tok = NULL;
+ if (token)
+ afb_token_get(&tok, token);
+
+ return afb_context_connect(&hreq->xreq.context, uuid, tok);
}
int afb_hreq_init_cookie(int port, const char *path, int maxage)