X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hreq.c;h=eb48a324918940bd7300be5af95fae1f111babad;hb=f3d1f19ae308cc0559728c0ccf6281cbce5ee37c;hp=a9010b8873abf20e103c59bba57d5f02fa366f3d;hpb=e08d57c0e397018f0c463a66adc232f6358caef5;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index a9010b88..eb48a324 100644
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -42,7 +42,8 @@
 #include "afb-hreq.h"
 #include "afb-hsrv.h"
 #include "afb-session.h"
-#include "afb-cred.h"
+#include "afb-token.h"
+#include "afb-error-text.h"
 #include "verbose.h"
 #include "locale-root.h"
 
@@ -343,7 +344,6 @@ static void req_destroy(struct afb_xreq *xreq)
 	json_object_put(hreq->json);
 	free((char*)hreq->xreq.request.called_api);
 	free((char*)hreq->xreq.request.called_verb);
-	afb_cred_unref(hreq->xreq.cred);
 	free(hreq);
 }
 
@@ -920,9 +920,13 @@ static struct json_object *req_json(struct afb_xreq *xreq)
 	return obj;
 }
 
+static inline const char *get_json_string(json_object *obj)
+{
+	return json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE);
+}
 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_ext(obj, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE)+pos, max) - buf;
+	ssize_t len = stpncpy(buf, get_json_string(obj)+pos, max) - buf;
 	return len ? : (ssize_t)MHD_CONTENT_READER_END_OF_STREAM;
 }
 
@@ -943,8 +947,20 @@ static void req_reply(struct afb_xreq *xreq, struct json_object *object, const c
 	if (reqid != NULL && json_object_object_get_ex(reply, "request", &sub))
 		json_object_object_add(sub, "reqid", json_object_new_string(reqid));
 
-	response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string_ext(reply, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
-	afb_hreq_reply(hreq, MHD_HTTP_OK, response, NULL);
+	response = MHD_create_response_from_callback(
+			(uint64_t)strlen(get_json_string(reply)),
+			SIZE_RESPONSE_BUFFER,
+			(void*)send_json_cb,
+			reply,
+			(void*)json_object_put);
+
+	/* handle authorisation feedback */
+	if (error == afb_error_text_invalid_token)
+		afb_hreq_reply(hreq, MHD_HTTP_UNAUTHORIZED, response, MHD_HTTP_HEADER_WWW_AUTHENTICATE, "error=\"invalid_token\"", NULL);
+	else if (error == afb_error_text_insufficient_scope)
+		afb_hreq_reply(hreq, MHD_HTTP_FORBIDDEN, response, MHD_HTTP_HEADER_WWW_AUTHENTICATE, "error=\"insufficient_scope\"", NULL);
+	else
+		afb_hreq_reply(hreq, MHD_HTTP_OK, response, NULL);
 }
 
 void afb_hreq_call(struct afb_hreq *hreq, struct afb_apiset *apiset, const char *api, size_t lenapi, const char *verb, size_t lenverb)
@@ -966,6 +982,7 @@ int afb_hreq_init_context(struct afb_hreq *hreq)
 {
 	const char *uuid;
 	const char *token;
+	struct afb_token *tok;
 
 	if (hreq->xreq.context.session != NULL)
 		return 0;
@@ -994,8 +1011,11 @@ int afb_hreq_init_context(struct afb_hreq *hreq)
 			}
 		}
 	}
+	tok = NULL;
+	if (token)
+		afb_token_get(&tok, token);
 
-	return afb_context_connect(&hreq->xreq.context, uuid, token);
+	return afb_context_connect(&hreq->xreq.context, uuid, tok, NULL);
 }
 
 int afb_hreq_init_cookie(int port, const char *path, int maxage)