X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-hswitch.c;h=9c929e83bf34fab96706d9a63c65e10660abe784;hb=refs%2Fchanges%2F93%2F8493%2F1;hp=bdded7fb518673cd2e476560068ce646ebbbcdfd;hpb=c7e9786d408f13d8f8f43c6b68da916bbb1ed5f3;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index bdded7fb..9c929e83 100644
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
-/* 
- * Copyright (C) 2015, 2016 "IoT.bzh"
+/*
+ * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -23,11 +23,11 @@
 
 #include <microhttpd.h>
 
-#include "afb-req-itf.h"
+#include <afb/afb-req-itf.h>
 #include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-apis.h"
-#include "session.h"
+#include "afb-session.h"
 #include "afb-websock.h"
 
 int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
@@ -73,7 +73,8 @@ 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);
+	afb_hreq_redirect_to(hreq, url, 1);
+	return 1;
 }
 
 int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
@@ -86,6 +87,11 @@ int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
 		return 1;
 	}
 
+	if (!hreq->context.validated) {
+		afb_hreq_reply_error(hreq, MHD_HTTP_UNAUTHORIZED);
+		return 1;
+	}
+
 	return afb_websock_check_upgrade(hreq);
 }