* limitations under the License.
*/
-#define USE_MAGIC_MIME_TYPE
#define _GNU_SOURCE
#include <stdlib.h>
#include "afb-method.h"
#include "afb-req-itf.h"
+#include "afb-msg-json.h"
+#include "afb-context.h"
#include "afb-hreq.h"
#include "session.h"
#include "verbose.h"
-#define SIZE_RESPONSE_BUFFER 8000
+#define SIZE_RESPONSE_BUFFER 8192
static char empty_string[] = "";
static char *cookie_name = NULL;
static char *cookie_setter = NULL;
+static char *tmp_pattern = NULL;
+/*
+ * Structure for storing key/values read from POST requests
+ */
struct hreq_data {
- struct hreq_data *next;
- char *key;
- size_t length;
- char *value;
- char *path;
+ struct hreq_data *next; /* chain to next data */
+ char *key; /* key name */
+ size_t length; /* length of the value (used for appending) */
+ char *value; /* the value (or original filename) */
+ char *path; /* path of the file saved */
};
static struct json_object *req_json(struct afb_hreq *hreq);
static void req_fail(struct afb_hreq *hreq, const char *status, const char *info);
static void req_success(struct afb_hreq *hreq, json_object *obj, const char *info);
static const char *req_raw(struct afb_hreq *hreq, size_t *size);
-static void req_send(struct afb_hreq *hreq, char *buffer, size_t size);
-static int req_session_create(struct afb_hreq *hreq);
-static int req_session_check(struct afb_hreq *hreq, int refresh);
-static void req_session_close(struct afb_hreq *hreq);
+static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size);
static const struct afb_req_itf afb_hreq_itf = {
.json = (void*)req_json,
.fail = (void*)req_fail,
.raw = (void*)req_raw,
.send = (void*)req_send,
- .session_create = (void*)req_session_create,
- .session_check = (void*)req_session_check,
- .session_close = (void*)req_session_close
+ .context_get = (void*)afb_context_get,
+ .context_set = (void*)afb_context_set,
+ .addref = (void*)afb_hreq_addref,
+ .unref = (void*)afb_hreq_unref
};
static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create)
return 1;
}
-#if defined(USE_MAGIC_MIME_TYPE)
-
-#if !defined(MAGIC_DB)
-#define MAGIC_DB "/usr/share/misc/magic.mgc"
-#endif
-
static void afb_hreq_reply_v(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, va_list args)
{
char *cookie;
const char *k, *v;
+
+ if (hreq->replied != 0)
+ return;
+
k = va_arg(args, const char *);
while (k != NULL) {
v = va_arg(args, const char *);
MHD_add_response_header(response, k, v);
k = va_arg(args, const char *);
}
- if (hreq->context != NULL && asprintf(&cookie, cookie_setter, hreq->context->uuid)) {
+ v = afb_context_sent_uuid(&hreq->context);
+ if (v != NULL && asprintf(&cookie, cookie_setter, v) > 0) {
MHD_add_response_header(response, MHD_HTTP_HEADER_SET_COOKIE, cookie);
free(cookie);
}
MHD_queue_response(hreq->connection, status, response);
MHD_destroy_response(response);
+
+ hreq->replied = 1;
+ if (hreq->suspended != 0) {
+ extern void run_micro_httpd(struct afb_hsrv *hsrv);
+ MHD_resume_connection (hreq->connection);
+ hreq->suspended = 0;
+ run_micro_httpd(hreq->hsrv);
+ }
}
void afb_hreq_reply(struct afb_hreq *hreq, unsigned status, struct MHD_Response *response, ...)
va_end(args);
}
-void afb_hreq_reply_static(struct afb_hreq *hreq, unsigned status, size_t size, char *buffer, ...)
+void afb_hreq_reply_static(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...)
{
va_list args;
va_start(args, buffer);
- afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, buffer, MHD_RESPMEM_PERSISTENT), args);
+ afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, (char*)buffer, MHD_RESPMEM_PERSISTENT), args);
va_end(args);
}
-void afb_hreq_reply_copy(struct afb_hreq *hreq, unsigned status, size_t size, char *buffer, ...)
+void afb_hreq_reply_copy(struct afb_hreq *hreq, unsigned status, size_t size, const char *buffer, ...)
{
va_list args;
va_start(args, buffer);
- afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, buffer, MHD_RESPMEM_MUST_COPY), args);
+ afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer((unsigned)size, (char*)buffer, MHD_RESPMEM_MUST_COPY), args);
va_end(args);
}
va_end(args);
}
+#if defined(USE_MAGIC_MIME_TYPE)
+
+#if !defined(MAGIC_DB)
+#define MAGIC_DB "/usr/share/misc/magic.mgc"
+#endif
+
static magic_t lazy_libmagic()
{
static int done = 0;
/* MAGIC_MIME tells magic to return a mime of the file,
but you can specify different things */
if (verbosity)
- printf("Loading mimetype default magic database\n");
+ fprintf(stderr, "Loading mimetype default magic database\n");
result = magic_open(MAGIC_MIME_TYPE);
if (result == NULL) {
const char *extension = strrchr(filename, '.');
if (extension) {
static const char *const known[][2] = {
- { ".js", "text/javascript" },
+ { ".js", "text/javascript" },
{ ".html", "text/html" },
+ { ".css", "text/css" },
{ NULL, NULL }
};
int i = 0;
return result;
}
-void afb_hreq_free(struct afb_hreq *hreq)
+void afb_hreq_addref(struct afb_hreq *hreq)
+{
+ hreq->refcount++;
+}
+
+void afb_hreq_unref(struct afb_hreq *hreq)
{
struct hreq_data *data;
- if (hreq != NULL) {
- if (hreq->postform != NULL)
- MHD_destroy_post_processor(hreq->postform);
- for (data = hreq->data; data; data = hreq->data) {
- hreq->data = data->next;
- if (data->path) {
- unlink(data->path);
- free(data->path);
- }
- free(data->key);
- free(data->value);
- free(data);
+
+ if (hreq == NULL || --hreq->refcount)
+ return;
+
+ if (hreq->postform != NULL)
+ MHD_destroy_post_processor(hreq->postform);
+ for (data = hreq->data; data; data = hreq->data) {
+ hreq->data = data->next;
+ if (data->path) {
+ unlink(data->path);
+ free(data->path);
}
- ctxClientPut(hreq->context);
- json_object_put(hreq->json);
- free(hreq);
+ free(data->key);
+ free(data->value);
+ free(data);
}
+ afb_context_disconnect(&hreq->context);
+ json_object_put(hreq->json);
+ free(hreq);
}
/*
return 1;
}
+int afb_hreq_init_download_path(const char *directory)
+{
+ struct stat st;
+ size_t n;
+ char *p;
+
+ if (access(directory, R_OK|W_OK)) {
+ /* no read/write access */
+ return -1;
+ }
+ if (stat(directory, &st)) {
+ /* can't get info */
+ return -1;
+ }
+ if (!S_ISDIR(st.st_mode)) {
+ /* not a directory */
+ errno = ENOTDIR;
+ return -1;
+ }
+ n = strlen(directory);
+ while(n > 1 && directory[n-1] == '/') n--;
+ p = malloc(n + 8);
+ if (p == NULL) {
+ /* can't allocate memory */
+ errno = ENOMEM;
+ return -1;
+ }
+ memcpy(p, directory, n);
+ p[n++] = '/';
+ p[n++] = 'X';
+ p[n++] = 'X';
+ p[n++] = 'X';
+ p[n++] = 'X';
+ p[n++] = 'X';
+ p[n++] = 'X';
+ p[n] = 0;
+ free(tmp_pattern);
+ tmp_pattern = p;
+ return 0;
+}
+
static int opentempfile(char **path)
{
int fd;
char *fname;
- fname = strdup("XXXXXX"); /* TODO improve the path */
+ fname = strdup(tmp_pattern ? : "XXXXXX"); /* TODO improve the path */
if (fname == NULL)
return -1;
struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
{
- return (struct afb_req){ .itf = &afb_hreq_itf, .data = hreq };
+ return (struct afb_req){ .itf = &afb_hreq_itf, .closure = hreq };
}
static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
return result;
}
-static void req_send(struct afb_hreq *hreq, char *buffer, size_t size)
+static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size)
{
- afb_hreq_reply_free(hreq, MHD_HTTP_OK, size, buffer, NULL);
+ afb_hreq_reply_copy(hreq, MHD_HTTP_OK, size, buffer, NULL);
}
static ssize_t send_json_cb(json_object *obj, uint64_t pos, char *buf, size_t max)
{
ssize_t len = stpncpy(buf, json_object_to_json_string(obj)+pos, max) - buf;
- return len ? : -1;
+ return len ? : (ssize_t)MHD_CONTENT_READER_END_OF_STREAM;
}
static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp)
{
- json_object *root, *request;
+ struct json_object *reply;
+ const char *token, *uuid;
struct MHD_Response *response;
- root = json_object_new_object();
- json_object_object_add(root, "jtype", json_object_new_string("afb-reply"));
- request = json_object_new_object();
- json_object_object_add(root, "request", request);
- json_object_object_add(request, "status", json_object_new_string(status));
- if (info)
- json_object_object_add(request, "info", json_object_new_string(info));
- if (resp)
- json_object_object_add(root, "response", resp);
- if (hreq->context) {
- json_object_object_add(request, uuid_arg, json_object_new_string(hreq->context->uuid));
- json_object_object_add(request, token_arg, json_object_new_string(hreq->context->token));
- }
+ token = afb_context_sent_token(&hreq->context);
+ uuid = afb_context_sent_uuid(&hreq->context);
- response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, SIZE_RESPONSE_BUFFER, (void*)send_json_cb, root, (void*)json_object_put);
+ reply = afb_msg_json_reply(status, info, resp, token, uuid);
+ response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string(reply)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
afb_hreq_reply(hreq, retcode, response, NULL);
}
req_reply(hreq, MHD_HTTP_OK, "success", info, obj);
}
-struct AFB_clientCtx *afb_hreq_context(struct afb_hreq *hreq)
+int afb_hreq_init_context(struct afb_hreq *hreq)
{
const char *uuid;
-
- if (hreq->context == NULL) {
- uuid = afb_hreq_get_header(hreq, uuid_header);
- if (uuid == NULL)
- uuid = afb_hreq_get_argument(hreq, uuid_arg);
- if (uuid == NULL)
- uuid = afb_hreq_get_cookie(hreq, cookie_name);
- hreq->context = ctxClientGetForUuid(uuid);
- }
- return hreq->context;
-}
-
-static int req_session_create(struct afb_hreq *hreq)
-{
- struct AFB_clientCtx *context = afb_hreq_context(hreq);
- if (context == NULL)
- return 0;
- if (context->created)
- return 0;
- return req_session_check(hreq, 1);
-}
-
-static int req_session_check(struct afb_hreq *hreq, int refresh)
-{
const char *token;
- struct AFB_clientCtx *context = afb_hreq_context(hreq);
-
- if (context == NULL)
+ if (hreq->context.session != NULL)
return 0;
+ uuid = afb_hreq_get_header(hreq, uuid_header);
+ if (uuid == NULL)
+ uuid = afb_hreq_get_argument(hreq, uuid_arg);
+ if (uuid == NULL)
+ uuid = afb_hreq_get_cookie(hreq, cookie_name);
+
token = afb_hreq_get_header(hreq, token_header);
if (token == NULL)
token = afb_hreq_get_argument(hreq, token_arg);
if (token == NULL)
token = afb_hreq_get_cookie(hreq, token_cookie);
- if (token == NULL)
- return 0;
- if (!ctxTokenCheck (context, token))
- return 0;
-
- if (refresh) {
- ctxTokenNew (context);
- }
-
- return 1;
-}
-
-static void req_session_close(struct afb_hreq *hreq)
-{
- struct AFB_clientCtx *context = afb_hreq_context(hreq);
- if (context != NULL)
- ctxClientClose(context);
+ return afb_context_connect(&hreq->context, uuid, token);
}
int afb_hreq_init_cookie(int port, const char *path, int maxage)
Code Review / src / app-framework-binder.git / blobdiff