adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

net: http_server: fix URL matching with '?' character in resource

Browse source 
Fixes #84198.

If a '?' character is used as part of a wildcard resource, do not treat
this as the end of the string when comparing with a path from the HTTP
request. Only the path from the HTTP request may be terminated by '?'
(in the case of a request with query parameters).

Signed-off-by: Matt Rodgers <mrodgers@witekio.com>
This commit is contained in:
Matt Rodgers 2025-01-20 09:48:04 +00:00 committed by Benjamin Cabé
parent 8ef1b348c2
commit d1d85fa40b
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subsys/net/lib/http/http_server_core.c
View file

@ -700,16 +700,19 @@ closing:
return ret; return ret;
} }
/* Compare two strings where the terminator is either "\0" or "?" */ /* Compare a path and a resource string. The path string comes from the HTTP request and may be
static int compare_strings(const char *s1, const char *s2) * terminated by either '?' or '\0'. The resource string is registered along with the resource and
* may only be terminated by `\0`.
*/
static int compare_strings(const char *path, const char *resource)
{ {
while ((*s1 && *s2) && (*s1 == *s2) && (*s1 != '?')) { while ((*path && *resource) && (*path == *resource) && (*path != '?')) {
s1++; path++;
s2++; resource++;
} }
/* Check if both strings have reached their terminators or '?' */ /* Check if both strings have reached their terminators */
if ((*s1 == '\0' || *s1 == '?') && (*s2 == '\0' || *s2 == '?')) { if ((*path == '\0' || *path == '?') && (*resource == '\0')) {
return 0; /* Strings are equal */ return 0; /* Strings are equal */
} }

4
tests/net/lib/http_server/common/src/main.c
View file

@ -342,6 +342,10 @@ ZTEST(http_service, test_HTTP_RESOURCE_WILDCARD)
zassert_true(len > 0, "Length not set"); zassert_true(len > 0, "Length not set");
zassert_equal(res, RES(3), "Resource mismatch"); zassert_equal(res, RES(3), "Resource mismatch");
res = CHECK_PATH(service_D, "/fb", &len);
zassert_is_null(res, "Resource found");
zassert_equal(len, 0, "Length set");
res = CHECK_PATH(service_A, "/fs/index.html", &len); res = CHECK_PATH(service_A, "/fs/index.html", &len);
zassert_not_null(res, "Cannot find resource"); zassert_not_null(res, "Cannot find resource");
zassert_true(len > 0, "Length not set"); zassert_true(len > 0, "Length not set");