afb-hswitch: Improve HTTP scanning of API/VERB

The previous version wasn't accepting verbs containing
slashes (/) but the websocket did.

Some interesting use-cases are allowed by accepting to
include slashes in verbs.

Change-Id: I2786b5ed0e2686c3e68bb9b74923064d8953243c
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

diff --git a/src/afb-hswitch.c b/src/afb-hswitch.c
index 77c67df..e1cc087 100644 (file)
--- a/src/afb-hswitch.c
+++ b/src/afb-hswitch.c
@@ -31,19 +31,34 @@
 
 int afb_hswitch_apis(struct afb_hreq *hreq, void *data)
 {
-       const char *api, *verb;
+       const char *api, *verb, *i;
        size_t lenapi, lenverb;
        struct afb_apiset *apiset = data;
 
-       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;
-
+       /* 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;
 }