X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=885a45614f81687e5c1e1a50eb2a980fa0570dc1;hb=9c4961a0e68458061171aef5f3b30a9b1fa8e333;hp=5f9ca5108cea69d459d232f64c5ad438403cc1f1;hpb=bf9d05d3ba3c482a75cfa6aedf661f6e51728e3e;p=src%2Fapp-framework-binder.git diff --git a/src/afb-hreq.c b/src/afb-hreq.c index 5f9ca510..885a4561 100644 --- a/src/afb-hreq.c +++ b/src/afb-hreq.c @@ -37,8 +37,10 @@ #include "afb-msg-json.h" #include "afb-context.h" #include "afb-hreq.h" +#include "afb-subcall.h" #include "session.h" #include "verbose.h" +#include "locale-root.h" #define SIZE_RESPONSE_BUFFER 8192 @@ -74,8 +76,10 @@ 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, const char *buffer, size_t size); +static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event); +static void req_subcall(struct afb_hreq *hreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure); -static const struct afb_req_itf afb_hreq_itf = { +const struct afb_req_itf afb_hreq_req_itf = { .json = (void*)req_json, .get = (void*)req_get, .success = (void*)req_success, @@ -87,7 +91,10 @@ static const struct afb_req_itf afb_hreq_itf = { .addref = (void*)afb_hreq_addref, .unref = (void*)afb_hreq_unref, .session_close = (void*)afb_context_close, - .session_set_LOA = (void*)afb_context_change_loa + .session_set_LOA = (void*)afb_context_change_loa, + .subscribe = (void*)req_subscribe_unsubscribe_error, + .unsubscribe = (void*)req_subscribe_unsubscribe_error, + .subcall = (void*)req_subcall }; static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create) @@ -353,6 +360,22 @@ void afb_hreq_reply_error(struct afb_hreq *hreq, unsigned int status) afb_hreq_reply_empty(hreq, status, NULL); } +int afb_hreq_redirect_to_ending_slash_if_needed(struct afb_hreq *hreq) +{ + char *tourl; + + if (hreq->url[hreq->lenurl - 1] == '/') + return 0; + + /* the redirect is needed for reliability of relative path */ + tourl = alloca(hreq->lenurl + 2); + memcpy(tourl, hreq->url, hreq->lenurl); + tourl[hreq->lenurl] = '/'; + tourl[hreq->lenurl + 1] = 0; + afb_hreq_redirect_to(hreq, tourl, 1); + return 1; +} + int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *filename) { int rc; @@ -390,17 +413,10 @@ int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *f /* serve directory */ if (S_ISDIR(st.st_mode)) { - if (hreq->url[hreq->lenurl - 1] != '/') { - /* the redirect is needed for reliability of relative path */ - char *tourl = alloca(hreq->lenurl + 2); - memcpy(tourl, hreq->url, hreq->lenurl); - tourl[hreq->lenurl] = '/'; - tourl[hreq->lenurl + 1] = 0; - rc = afb_hreq_redirect_to(hreq, tourl, 1); - } else { + rc = afb_hreq_redirect_to_ending_slash_if_needed(hreq); + if (rc == 0) { static const char *indexes[] = { "index.html", NULL }; int i = 0; - rc = 0; while (indexes[i] != NULL) { if (faccessat(fd, indexes[i], R_OK, 0) == 0) { rc = afb_hreq_reply_file_if_exist(hreq, fd, indexes[i]); @@ -472,6 +488,112 @@ int afb_hreq_reply_file(struct afb_hreq *hreq, int dirfd, const char *filename) return 1; } +int afb_hreq_reply_locale_file_if_exist(struct afb_hreq *hreq, struct locale_search *search, const char *filename) +{ + int rc; + int fd; + unsigned int status; + struct stat st; + char etag[1 + 2 * 8]; + const char *inm; + struct MHD_Response *response; + const char *mimetype; + + /* Opens the file or directory */ + fd = locale_search_open(search, filename[0] ? filename : ".", O_RDONLY); + if (fd < 0) { + if (errno == ENOENT) + return 0; + afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN); + return 1; + } + + /* Retrieves file's status */ + if (fstat(fd, &st) != 0) { + close(fd); + afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR); + return 1; + } + + /* serve directory */ + if (S_ISDIR(st.st_mode)) { + rc = afb_hreq_redirect_to_ending_slash_if_needed(hreq); + if (rc == 0) { + static const char *indexes[] = { "index.html", NULL }; + int i = 0; + size_t length = strlen(filename); + char *extname = alloca(length + 30); /* 30 is enough to old data of indexes */ + memcpy(extname, filename, length); + if (length && extname[length - 1] != '/') + extname[length++] = '/'; + while (rc == 0 && indexes[i] != NULL) { + strcpy(extname + length, indexes[i++]); + rc = afb_hreq_reply_locale_file_if_exist(hreq, search, extname); + } + } + close(fd); + return rc; + } + + /* Don't serve special files */ + if (!S_ISREG(st.st_mode)) { + close(fd); + afb_hreq_reply_error(hreq, MHD_HTTP_FORBIDDEN); + return 1; + } + + /* Check the method */ + if ((hreq->method & (afb_method_get | afb_method_head)) == 0) { + close(fd); + afb_hreq_reply_error(hreq, MHD_HTTP_METHOD_NOT_ALLOWED); + return 1; + } + + /* computes the etag */ + sprintf(etag, "%08X%08X", ((int)(st.st_mtim.tv_sec) ^ (int)(st.st_mtim.tv_nsec)), (int)(st.st_size)); + + /* checks the etag */ + inm = MHD_lookup_connection_value(hreq->connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_IF_NONE_MATCH); + if (inm && 0 == strcmp(inm, etag)) { + /* etag ok, return NOT MODIFIED */ + close(fd); + DEBUG("Not Modified: [%s]", filename); + response = MHD_create_response_from_buffer(0, empty_string, MHD_RESPMEM_PERSISTENT); + status = MHD_HTTP_NOT_MODIFIED; + } else { + /* check the size */ + if (st.st_size != (off_t) (size_t) st.st_size) { + close(fd); + afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR); + return 1; + } + + /* create the response */ + response = MHD_create_response_from_fd((size_t) st.st_size, fd); + status = MHD_HTTP_OK; + + /* set the type */ + mimetype = mimetype_fd_name(fd, filename); + if (mimetype != NULL) + MHD_add_response_header(response, MHD_HTTP_HEADER_CONTENT_TYPE, mimetype); + } + + /* fills the value and send */ + afb_hreq_reply(hreq, status, response, + MHD_HTTP_HEADER_CACHE_CONTROL, hreq->cacheTimeout, + MHD_HTTP_HEADER_ETAG, etag, + NULL); + return 1; +} + +int afb_hreq_reply_locale_file(struct afb_hreq *hreq, struct locale_search *search, const char *filename) +{ + int rc = afb_hreq_reply_locale_file_if_exist(hreq, search, filename); + if (rc == 0) + afb_hreq_reply_error(hreq, MHD_HTTP_NOT_FOUND); + return 1; +} + struct _mkq_ { int count; size_t length; @@ -558,7 +680,7 @@ static char *url_with_query(struct afb_hreq *hreq, const char *url) return mkq.text; } -int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url, int add_query_part) +void afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url, int add_query_part) { const char *to; char *wqp; @@ -569,7 +691,6 @@ int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url, int add_query_p MHD_HTTP_HEADER_LOCATION, to, NULL); DEBUG("redirect from [%s] to [%s]", hreq->url, url); free(wqp); - return 1; } const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name) @@ -697,7 +818,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, .closure = hreq }; + return (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq }; } static struct afb_arg req_get(struct afb_hreq *hreq, const char *name) @@ -774,20 +895,15 @@ static ssize_t send_json_cb(json_object *obj, uint64_t pos, char *buf, size_t ma static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp) { - struct json_object *reply, *request; - const char *token, *uuid, *reqid; + struct json_object *reply; + const char *reqid; struct MHD_Response *response; - token = afb_context_sent_token(&hreq->context); - uuid = afb_context_sent_uuid(&hreq->context); - - 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)); + + reply = afb_msg_json_reply(status, info, resp, &hreq->context, reqid); response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string_ext(reply, JSON_C_TO_STRING_PLAIN)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put); afb_hreq_reply(hreq, retcode, response, NULL); @@ -803,6 +919,17 @@ static void req_success(struct afb_hreq *hreq, json_object *obj, const char *inf req_reply(hreq, MHD_HTTP_OK, "success", info, obj); } +static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event) +{ + errno = EINVAL; + return -1; +} + +static void req_subcall(struct afb_hreq *hreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure) +{ + afb_subcall(&hreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq }); +} + int afb_hreq_init_context(struct afb_hreq *hreq) { const char *uuid;