Update copyright dates

[src/app-framework-binder.git] / src / afb-hswitch.c

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index eab5b9b..9e55f29 100644 (file)
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -23,31 +23,43 @@
 
 #include <microhttpd.h>
 
-#include <afb/afb-req-itf.h>
 #include "afb-context.h"
 #include "afb-hreq.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-session.h"
 #include "afb-websock.h"
 
 int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
 {
-       const char *api, *verb;
+       const char *api, *verb, *i;
        size_t lenapi, lenverb;
-
-       api = &hreq->tail[strspn(hreq->tail, "/")];
-       lenapi = strcspn(api, "/");
-       verb = &api[lenapi];
-       verb = &verb[strspn(verb, "/")];
-       lenverb = strcspn(verb, "/");
-
-       if (!(*api && *verb && lenapi && lenverb))
-               return 0;
-
-       if (afb_hreq_init_req_call(hreq, api, lenapi, verb, lenverb) < 0)
-               afb_hreq_reply_error(hreq, MHD_HTTP_INTERNAL_SERVER_ERROR);
-       else
-               afb_apis_xcall(&hreq->xreq);
+       struct afb_apiset *apiset = data;
+
+       /* api is the first hierarchical item */
+       i = hreq->tail;
+       while (*i == '/')
+               i++;
+       if (!*i)
+               return 0; /* no API */
+       api = i;
+
+       /* search end of the api and get its length */
+       while (*++i && *i != '/');
+       lenapi = (size_t)(i - api);
+
+       /* search the verb */
+       while (*i == '/')
+               i++;
+       if (!*i)
+               return 0; /* no verb */
+       verb = i;
+
+       /* get the verb length */
+       while (*++i);
+       lenverb = (size_t)(i - verb);
+
+       /* found api + verb so process the call */
+       afb_hreq_call(hreq, apiset, api, lenapi, verb, lenverb);
        return 1;
 }
 
@@ -79,6 +91,8 @@ int afb_hswitch_one_page_api_redirect(struct afb_hreq *hreq, void *data)
 
 int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
 {
+       struct afb_apiset *apiset = data;
+
        if (hreq->lentail != 0)
                return 0;
 
@@ -87,12 +101,7 @@ int afb_hswitch_websocket_switch(struct afb_hreq *hreq, void *data)
                return 1;
        }
 
-       if (!hreq->xreq.context.validated) {
-               afb_hreq_reply_error(hreq, MHD_HTTP_UNAUTHORIZED);
-               return 1;
-       }
-
-       return afb_websock_check_upgrade(hreq);
+       return afb_websock_check_upgrade(hreq, apiset);
 }