X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-hswitch.c;h=c6552d44948121782fa559b94631baa7daa01aad;hb=bbddc1e584dd01b60042f622f8cecfc69361020b;hp=d531155db1391a4d7cf77dfcb4d66d5e06951e65;hpb=6ea1d50ab6571551e1d0379940349911956c97ee;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index d531155d..c6552d44 100644
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2015 "IoT.bzh"
+/*
+ * Copyright (C) 2015, 2016 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -21,7 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "afb-req-itf.h"
+#include <microhttpd.h>
+
+#include <afb/afb-req-itf.h>
+#include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-apis.h"
 #include "session.h"
@@ -31,7 +34,6 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
 {
 	const char *api, *verb;
 	size_t lenapi, lenverb;
-	struct AFB_clientCtx *context;
 
 	api = &hreq->tail[strspn(hreq->tail, "/")];
 	lenapi = strcspn(api, "/");
@@ -42,8 +44,10 @@ int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
 	if (!(*api && *verb && lenapi && lenverb))
 		return 0;
 
-	context = afb_hreq_context(hreq);
-	afb_apis_call(afb_hreq_to_req(hreq), context, api, lenapi, verb, lenverb);
+	if (afb_hreq_init_context(hreq) < 0)
+		afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+	else
+		afb_apis_call(afb_hreq_to_req(hreq), &hreq->context, api, lenapi, verb, lenverb);
 	return 1;
 }
 
@@ -69,7 +73,7 @@ int afb_hswitch_one_page_api_redirect(struct afb_hreq *hreq, void *data)
 	url[plen++] = '#';
 	url[plen++] = '!';
 	memcpy(&url[plen], &hreq->tail[1], hreq->lentail);
-	return afb_hreq_redirect_to(hreq, url);
+	return afb_hreq_redirect_to(hreq, url, 1);
 }
 
 int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
@@ -77,8 +81,17 @@ int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
 	if (hreq->lentail != 0)
 		return 0;
 
-	return afb_websock_check_upgrade(hreq /* TODO: protocols here */);
-}
+	if (afb_hreq_init_context(hreq) < 0) {
+		afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
+		return 1;
+	}
 
+	if (!hreq->context.validated) {
+		afb_hreq_reply_error(hreq, MHD_HTTP_UNAUTHORIZED);
+		return 1;
+	}
+
+	return afb_websock_check_upgrade(hreq);
+}