/*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <sys/stat.h>
#include <microhttpd.h>
-#include <json.h>
+#include <json-c/json.h>
#if defined(USE_MAGIC_MIME_TYPE)
#include <magic.h>
#endif
#include "afb-method.h"
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
#include "afb-msg-json.h"
#include "afb-context.h"
#include "afb-hreq.h"
static char empty_string[] = "";
-static const char uuid_header[] = "x-afb-uuid";
-static const char uuid_arg[] = "uuid";
-static const char uuid_cookie[] = "uuid";
+static const char key_for_uuid[] = "x-afb-uuid";
+static const char old_key_for_uuid[] = "uuid";
-static const char token_header[] = "x-afb-token";
-static const char token_arg[] = "token";
-static const char token_cookie[] = "token";
+static const char key_for_token[] = "x-afb-token";
+static const char old_key_for_token[] = "token";
static char *cookie_name = NULL;
static char *cookie_setter = NULL;
done = 1;
/* MAGIC_MIME tells magic to return a mime of the file,
but you can specify different things */
- if (verbosity)
- fprintf(stderr, "Loading mimetype default magic database\n");
-
+ INFO("Loading mimetype default magic database");
result = magic_open(MAGIC_MIME_TYPE);
if (result == NULL) {
- fprintf(stderr,"ERROR: unable to initialize magic library\n");
+ ERROR("unable to initialize magic library");
}
/* Warning: should not use NULL for DB
[libmagic bug wont pass efence check] */
else if (magic_load(result, MAGIC_DB) != 0) {
- fprintf(stderr,"cannot load magic database - %s\n",
- magic_error(result));
+ ERROR("cannot load magic database: %s", magic_error(result));
magic_close(result);
result = NULL;
}
if (inm && 0 == strcmp(inm, etag)) {
/* etag ok, return NOT MODIFIED */
close(fd);
- if (verbosity)
- fprintf(stderr, "Not Modified: [%s]\n", filename);
+ DEBUG("Not Modified: [%s]", filename);
response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT);
status = MHD_HTTP_NOT_MODIFIED;
} else {
int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url)
{
+ /* TODO: append the query part! */
afb_hreq_reply_static(hreq, MHD_HTTP_MOVED_PERMANENTLY, 0, NULL,
MHD_HTTP_HEADER_LOCATION, url, NULL);
- if (verbosity)
- fprintf(stderr, "redirect from [%s] to [%s]\n", hreq->url, url);
+ DEBUG("redirect from [%s] to [%s]", hreq->url, url);
return 1;
}
if (hreq->context.session != NULL)
return 0;
- uuid = afb_hreq_get_header(hreq, uuid_header);
+ uuid = afb_hreq_get_header(hreq, key_for_uuid);
if (uuid == NULL)
- uuid = afb_hreq_get_argument(hreq, uuid_arg);
+ uuid = afb_hreq_get_argument(hreq, key_for_uuid);
if (uuid == NULL)
uuid = afb_hreq_get_cookie(hreq, cookie_name);
+ if (uuid == NULL)
+ uuid = afb_hreq_get_argument(hreq, old_key_for_uuid);
- token = afb_hreq_get_header(hreq, token_header);
+ token = afb_hreq_get_header(hreq, key_for_token);
if (token == NULL)
- token = afb_hreq_get_argument(hreq, token_arg);
+ token = afb_hreq_get_argument(hreq, key_for_token);
if (token == NULL)
- token = afb_hreq_get_cookie(hreq, token_cookie);
+ token = afb_hreq_get_argument(hreq, old_key_for_token);
return afb_context_connect(&hreq->context, uuid, token);
}
cookie_setter = NULL;
path = path ? : "/";
- rc = asprintf(&cookie_name, "x-afb-uuid-%d", port);
+ rc = asprintf(&cookie_name, "%s-%d", key_for_uuid, port);
if (rc < 0)
return 0;
rc = asprintf(&cookie_setter, "%s=%%s; Path=%s; Max-Age=%d; HttpOnly",