X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=2e74f2d423595cc896bd9d2ff94f786f47d1176c;hb=97c02cb6f98727942bbbdd38b3ecbc1366894ed6;hp=9984cbcbe9d63fff1f803594f05394c19e2bc403;hpb=fcef933b69ccc363ad10d9f7308f02c5dc474ff6;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hreq.c b/src/afb-hreq.c index 9984cbcb..2e74f2d4 100644 --- a/src/afb-hreq.c +++ b/src/afb-hreq.c @@ -15,7 +15,6 @@ * limitations under the License. */ -#define USE_MAGIC_MIME_TYPE #define _GNU_SOURCE #include @@ -35,11 +34,12 @@ #include "afb-method.h" #include "afb-req-itf.h" +#include "afb-msg-json.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[] = ""; @@ -53,6 +53,7 @@ static const char token_cookie[] = "token"; static char *cookie_name = NULL; static char *cookie_setter = NULL; +static char *tmp_pattern = NULL; struct hreq_data { struct hreq_data *next; @@ -81,7 +82,9 @@ static const struct afb_req_itf afb_hreq_itf = { .send = (void*)req_send, .session_create = (void*)req_session_create, .session_check = (void*)req_session_check, - .session_close = (void*)req_session_close + .session_close = (void*)req_session_close, + .context_get = (void*)afb_context_get, + .context_set = (void*)afb_context_set }; static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create) @@ -145,12 +148,6 @@ static int validsubpath(const char *subpath) 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; @@ -209,6 +206,12 @@ void afb_hreq_reply_free(struct afb_hreq *hreq, unsigned status, size_t size, ch 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; @@ -219,7 +222,7 @@ static magic_t lazy_libmagic() /* 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) { @@ -254,8 +257,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; @@ -492,12 +496,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; @@ -542,7 +587,7 @@ int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *f 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, .req_closure = hreq }; } static struct afb_arg req_get(struct afb_hreq *hreq, const char *name) @@ -612,29 +657,23 @@ static void req_send(struct afb_hreq *hreq, char *buffer, size_t size) 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 ? : 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)); + if (hreq->context == NULL) { + token = uuid = NULL; + } else { + token = hreq->context->token; + uuid = hreq->context->uuid; } - - 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); }