X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=d1ba0c13a2494f56e77bc166b27880ce48920c0a;hb=04b1757467bcb4e287dd1c34d5a21f76705340d6;hp=045a0d60d949839f3ea4f66d7dee4f251dca1d71;hpb=37d39868e7eed7ff3c8420dec0e3e82caa7cd868;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 045a0d60..d1ba0c13 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 <stdlib.h>
@@ -35,6 +34,7 @@
 
 #include "afb-method.h"
 #include "afb-req-itf.h"
+#include "afb-msg-json.h"
 #include "afb-hreq.h"
 #include "session.h"
 #include "verbose.h"
@@ -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;
@@ -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)
@@ -617,24 +662,19 @@ 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)
 {
-	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;
 	}
+	reply = afb_msg_json_reply(status, info, resp, token, uuid);
 
-	response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, SIZE_RESPONSE_BUFFER, (void*)send_json_cb, root, (void*)json_object_put);
+	response = MHD_create_response_from_callback(MHD_SIZE_UNKNOWN, SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
 	afb_hreq_reply(hreq, retcode, response, NULL);
 }