X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=4239670de8149a5b74ea09fb35972539096a277f;hb=9d59db317f2ac51c3eb058fe740bd39b3021fbcd;hp=badddd1e812045e971210995b7b71e123805815c;hpb=8d036c20b1e6e6134817bfc4cb152e4e2469dba5;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hreq.c b/src/afb-hreq.c index badddd1e..4239670d 100644 --- a/src/afb-hreq.c +++ b/src/afb-hreq.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 IoT.bzh + * Copyright (C) 2016 "IoT.bzh" * Author: José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,7 +15,6 @@ * limitations under the License. */ -#define USE_MAGIC_MIME_TYPE #define _GNU_SOURCE #include @@ -27,62 +26,73 @@ #include #include +#include #if defined(USE_MAGIC_MIME_TYPE) #include #endif -#include "local-def.h" #include "afb-method.h" -#include "afb-req-itf.h" +#include +#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 const char uuid_header[] = "x-afb-uuid"; -static const char uuid_arg[] = "uuid"; -static const char uuid_cookie[] = "uuid"; +static const char long_key_for_uuid[] = "x-afb-uuid"; +static const char short_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 long_key_for_token[] = "x-afb-token"; +static const char short_key_for_token[] = "token"; +static const char long_key_for_reqid[] = "x-afb-reqid"; +static const char short_key_for_reqid[] = "reqid"; +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 struct afb_arg req_get(struct afb_hreq *hreq, const char *name); -static void req_iterate(struct afb_hreq *hreq, int (*iterator)(void *closure, struct afb_arg arg), void *closure); 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 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 const char *req_raw(struct afb_hreq *hreq, size_t *size); +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, .get = (void*)req_get, - .iterate = (void*)req_iterate, - .fail = (void*)req_fail, .success = (void*)req_success, - .session_create = (void*)req_session_create, - .session_check = (void*)req_session_check, - .session_close = (void*)req_session_close + .fail = (void*)req_fail, + .raw = (void*)req_raw, + .send = (void*)req_send, + .context_get = (void*)afb_context_get, + .context_set = (void*)afb_context_set, + .addref = (void*)afb_hreq_addref, + .unref = (void*)afb_hreq_unref, + .session_close = (void*)afb_context_close, + .session_set_LOA = (void*)afb_context_change_loa }; static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create) { struct hreq_data *data = hreq->data; - if (key == NULL) - key = empty_string; while (data != NULL) { if (!strcasecmp(data->key, key)) return data; @@ -141,6 +151,77 @@ static int validsubpath(const char *subpath) return 1; } +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 *); + } + 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_list args; + va_start(args, response); + afb_hreq_reply_v(hreq, status, response, args); + va_end(args); +} + +void afb_hreq_reply_empty(struct afb_hreq *hreq, unsigned status, ...) +{ + va_list args; + va_start(args, status); + afb_hreq_reply_v(hreq, status, MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT), args); + va_end(args); +} + +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, (char*)buffer, MHD_RESPMEM_PERSISTENT), args); + va_end(args); +} + +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, (char*)buffer, MHD_RESPMEM_MUST_COPY), args); + va_end(args); +} + +void afb_hreq_reply_free(struct afb_hreq *hreq, unsigned status, size_t size, 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_FREE), args); + va_end(args); +} + #if defined(USE_MAGIC_MIME_TYPE) #if !defined(MAGIC_DB) @@ -156,18 +237,15 @@ static magic_t lazy_libmagic() done = 1; /* 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"); - + 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; } @@ -192,8 +270,9 @@ static const char *mimetype_fd_name(int fd, const char *filename) 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; @@ -213,21 +292,33 @@ static const char *mimetype_fd_name(int fd, const char *filename) 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; - 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); - free(hreq); + free(data->key); + free(data->value); + free(data); } + afb_context_disconnect(&hreq->context); + json_object_put(hreq->json); + free(hreq); } /* @@ -259,20 +350,7 @@ int afb_hreq_valid_tail(struct afb_hreq *hreq) void afb_hreq_reply_error(struct afb_hreq *hreq, unsigned int status) { - char *buffer; - int length; - struct MHD_Response *response; - - length = asprintf(&buffer, "error %u", status); - if (length > 0) - response = MHD_create_response_from_buffer((unsigned)length, buffer, MHD_RESPMEM_MUST_FREE); - else { - buffer = "error"; - response = MHD_create_response_from_buffer(strlen(buffer), buffer, MHD_RESPMEM_PERSISTENT); - } - if (!MHD_queue_response(hreq->connection, status, response)) - fprintf(stderr, "Failed to reply error code %u", status); - MHD_destroy_response(response); + afb_hreq_reply_empty(hreq, status, NULL); } int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *filename) @@ -357,8 +435,7 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f 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 { @@ -380,10 +457,10 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f } /* fills the value and send */ - MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, hreq->session->cacheTimeout); - MHD_add_response_header(response, MHD_HTTP_HEADER_ETAG, etag); - MHD_queue_response(hreq->connection, status, response); - MHD_destroy_response(response); + afb_hreq_reply(hreq, status, response, + MHD_HTTP_HEADER_CACHE_CONTROL, hreq->cacheTimeout, + MHD_HTTP_HEADER_ETAG, etag, + NULL); return 1; } @@ -397,14 +474,10 @@ int afb_hreq_reply_file(struct afb_hreq *hreq, int dirfd, const char *filename) int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url) { - struct MHD_Response *response; - - response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT); - MHD_add_response_header(response, MHD_HTTP_HEADER_LOCATION, url); - MHD_queue_response(hreq->connection, MHD_HTTP_MOVED_PERMANENTLY, response); - MHD_destroy_response(response); - if (verbosity) - fprintf(stderr, "redirect from [%s] to [%s]\n", hreq->url, url); + /* TODO: append the query part! */ + afb_hreq_reply_static(hreq, MHD_HTTP_MOVED_PERMANENTLY, 0, NULL, + MHD_HTTP_HEADER_LOCATION, url, NULL); + DEBUG("redirect from [%s] to [%s]", hreq->url, url); return 1; } @@ -442,12 +515,53 @@ int afb_hreq_post_add(struct afb_hreq *hreq, const char *key, const char *data, 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; @@ -465,7 +579,6 @@ int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *f ssize_t sz; struct hreq_data *hdat = get_data(hreq, key, 1); -fprintf(stderr, "%s=%s %s=%s %s\n",key,hdat->key,file,hdat->value,hdat->path); if (hdat->value == NULL) { hdat->value = strdup(file); if (hdat->value == NULL) @@ -493,91 +606,100 @@ fprintf(stderr, "%s=%s %s=%s %s\n",key,hdat->key,file,hdat->value,hdat->path); 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) { + const char *value; struct hreq_data *hdat = get_data(hreq, name, 0); if (hdat) return (struct afb_arg){ .name = hdat->key, .value = hdat->value, - .size = hdat->length, .path = hdat->path }; - + + value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name); return (struct afb_arg){ - .name = name, - .value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name), - .size = 0, + .name = value == NULL ? NULL : name, + .value = value, .path = NULL }; } -struct iterdata +static int _iterargs_(struct json_object *obj, enum MHD_ValueKind kind, const char *key, const char *value) { - struct afb_hreq *hreq; - int (*iterator)(void *closure, struct afb_arg arg); - void *closure; -}; + json_object_object_add(obj, key, value ? json_object_new_string(value) : NULL); + return 1; +} -static int _iterargs_(struct iterdata *id, enum MHD_ValueKind kind, const char *key, const char *value) +static struct json_object *req_json(struct afb_hreq *hreq) { - if (get_data(id->hreq, key, 0)) - return 1; - return id->iterator(id->closure, (struct afb_arg){ - .name = key, - .value = value ? : "", - .size = value ? strlen(value) : 0, - .path = NULL - }); + struct hreq_data *hdat; + struct json_object *obj, *val; + + obj = hreq->json; + if (obj == NULL) { + hreq->json = obj = json_object_new_object(); + if (obj == NULL) { + } else { + MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_iterargs_, obj); + for (hdat = hreq->data ; hdat ; hdat = hdat->next) { + if (hdat->path == NULL) + val = hdat->value ? json_object_new_string(hdat->value) : NULL; + else { + val = json_object_new_object(); + if (val == NULL) { + } else { + json_object_object_add(val, "file", json_object_new_string(hdat->value)); + json_object_object_add(val, "path", json_object_new_string(hdat->path)); + } + } + json_object_object_add(obj, hdat->key, val); + } + } + } + return obj; } -static void req_iterate(struct afb_hreq *hreq, int (*iterator)(void *closure, struct afb_arg arg), void *closure) +static const char *req_raw(struct afb_hreq *hreq, size_t *size) { - struct iterdata id = { .hreq = hreq, .iterator = iterator, .closure = closure }; - struct hreq_data *hdat = hreq->data; - while (hdat) { - if (!iterator(closure, (struct afb_arg){ - .name = hdat->key, - .value = hdat->value, - .size = hdat->length, - .path = hdat->path})) - return; - hdat = hdat->next; - } - MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_iterargs_, &id); + const char *result = json_object_get_string(req_json(hreq)); + *size = result ? strlen(result) : 0; + return result; +} + +static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size) +{ + 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, *request; + const char *token, *uuid, *reqid; 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); - MHD_queue_response(hreq->connection, retcode, response); - MHD_destroy_response(response); + reply = afb_msg_json_reply(status, info, resp, token, uuid); + + reqid = afb_hreq_get_argument(hreq, long_key_for_reqid); + if (reqid == NULL) + reqid = afb_hreq_get_argument(hreq, short_key_for_reqid); + if (reqid != NULL && json_object_object_get_ex(reply, "request", &request)) + json_object_object_add (request, short_key_for_reqid, json_object_new_string(reqid)); + + 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); } static void req_fail(struct afb_hreq *hreq, const char *status, const char *info) @@ -590,64 +712,49 @@ static void req_success(struct afb_hreq *hreq, json_object *obj, const char *inf 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, uuid_cookie); - 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; - token = afb_hreq_get_header(hreq, token_header); - if (token == NULL) - token = afb_hreq_get_argument(hreq, token_arg); + uuid = afb_hreq_get_header(hreq, long_key_for_uuid); + 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_cookie(hreq, token_cookie); + token = afb_hreq_get_argument(hreq, long_key_for_token); if (token == NULL) - return 0; - - if (!ctxTokenCheck (context, token)) - return 0; + token = afb_hreq_get_argument(hreq, short_key_for_token); - if (refresh) { - ctxTokenNew (context); - } - - return 1; + return afb_context_connect(&hreq->context, uuid, token); } -static void req_session_close(struct afb_hreq *hreq) +int afb_hreq_init_cookie(int port, const char *path, int maxage) { - struct AFB_clientCtx *context = afb_hreq_context(hreq); - if (context != NULL) - ctxClientClose(context); -} + int rc; + + free(cookie_name); + free(cookie_setter); + cookie_name = NULL; + cookie_setter = NULL; + path = path ? : "/"; + rc = asprintf(&cookie_name, "%s-%d", long_key_for_uuid, port); + if (rc < 0) + return 0; + rc = asprintf(&cookie_setter, "%s=%%s; Path=%s; Max-Age=%d; HttpOnly", + cookie_name, path, maxage); + if (rc < 0) + return 0; + return 1; +}