X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fafb-hreq.c;h=0fe908cb6818d5d6ef11c0a8f7677c1a94675dae;hb=3bf52bb36ed428d0a7b947519fbccc7c376fd4a9;hp=1e38b412f478d5889c39b815a759349c855f1734;hpb=7e0abe76db7b90369429bf387d7aad0fb5a42328;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 1e38b412..0fe908cb 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,8 +37,10 @@
 #include "afb-msg-json.h"
 #include "afb-context.h"
 #include "afb-hreq.h"
-#include "session.h"
+#include "afb-subcall.h"
+#include "afb-session.h"
 #include "verbose.h"
+#include "locale-root.h"
 
 #define SIZE_RESPONSE_BUFFER   8192
 
@@ -75,6 +77,7 @@ static void req_success(struct afb_hreq *hreq, json_object *obj, const char *inf
 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);
 
 const struct afb_req_itf afb_hreq_req_itf = {
 	.json = (void*)req_json,
@@ -90,7 +93,8 @@ const struct afb_req_itf afb_hreq_req_itf = {
 	.session_close = (void*)afb_context_close,
 	.session_set_LOA = (void*)afb_context_change_loa,
 	.subscribe = (void*)req_subscribe_unsubscribe_error,
-	.unsubscribe = (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)
@@ -270,12 +274,22 @@ static const char *mimetype_fd_name(int fd, const char *filename)
 	const char *result = NULL;
 
 #if defined(INFER_EXTENSION)
+	/*
+	 * Set some well-known extensions
+	 * Note that it is mandatory for example for css files in order to provide
+	 * right mimetype that must be text/css (otherwise chrome browser will not
+	 * load correctly css file) while libmagic returns text/plain.
+	 */
 	const char *extension = strrchr(filename, '.');
 	if (extension) {
 		static const char *const known[][2] = {
 			{ ".js",   "text/javascript" },
 			{ ".html", "text/html" },
 			{ ".css",  "text/css" },
+			{ ".ico",  "image/x-icon"},
+			{ ".png",  "image/png" },
+			{ ".svg",  "image/svg+xml" },
+			{ ".ttf",  "application/x-font-ttf"},
 			{ NULL, NULL }
 		};
 		int i = 0;
@@ -321,6 +335,8 @@ void afb_hreq_unref(struct afb_hreq *hreq)
 	}
 	afb_context_disconnect(&hreq->context);
 	json_object_put(hreq->json);
+	free(hreq->api);
+	free(hreq->verb);
 	free(hreq);
 }
 
@@ -356,6 +372,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;
@@ -393,17 +425,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]);
@@ -475,6 +500,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;
@@ -561,7 +692,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;
@@ -572,7 +703,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)
@@ -807,6 +937,25 @@ static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_eve
 	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_req_call(struct afb_hreq *hreq, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+{
+	free(hreq->api);
+	free(hreq->verb);
+	hreq->api = strndup(api, lenapi);
+	hreq->verb = strndup(verb, lenverb);
+	if (hreq->api == NULL || hreq->verb == NULL) {
+		ERROR("Out of memory");
+		errno = ENOMEM;
+		return -1;
+	}
+	return afb_hreq_init_context(hreq);
+}
+
 int afb_hreq_init_context(struct afb_hreq *hreq)
 {
 	const char *uuid;