Skip to content

[Backport v4.0-branch] net: http: server: The detail length of wildcard detail was wrong #90156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 4, 2025
Merged

[Backport v4.0-branch] net: http: server: The detail length of wildcard detail was wrong #90156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eabd25
net: http: server: The detail length of wildcard detail was wrong
jukkar Mar 5, 2025
e13bc36
net: http: server: Select POSIX_C_LIB_EXT instead of FNMATCH
jukkar Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion subsys/net/lib/http/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ config HTTP_SERVER_WEBSOCKET

config HTTP_SERVER_RESOURCE_WILDCARD
bool "Allow wildcard matching of resources"
select FNMATCH
# The POSIX_C_LIB_EXT will get fnmatch() support
select POSIX_C_LIB_EXT
help
Allow user to specify wildcards when setting up resource strings.
This means that instead of specifying multiple resources with exact
Expand Down
13 changes: 12 additions & 1 deletion subsys/net/lib/http/http_server_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,17 @@ static int compare_strings(const char *s1, const char *s2)
return 1; /* Strings are not equal */
}

static int path_len_without_query(const char *path)
{
int len = 0;

while ((path[len] != '\0') && (path[len] != '?')) {
len++;
}

return len;
}

static bool skip_this(struct http_resource_desc *resource, bool is_websocket)
{
struct http_resource_detail *detail;
Expand Down Expand Up @@ -713,7 +724,7 @@ struct http_resource_detail *get_resource_detail(const char *path,
ret = fnmatch(resource->resource, path,
(FNM_PATHNAME | FNM_LEADING_DIR));
if (ret == 0) {
*path_len = strlen(resource->resource);
*path_len = path_len_without_query(path);
return resource->detail;
}
}
Expand Down
21 changes: 21 additions & 0 deletions tests/net/lib/http_server/common/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ HTTP_RESOURCE_DEFINE(resource_6, service_D, "/fo*", RES(1));
HTTP_RESOURCE_DEFINE(resource_7, service_D, "/f[ob]o3.html", RES(1));
HTTP_RESOURCE_DEFINE(resource_8, service_D, "/fb?3.htm", RES(0));
HTTP_RESOURCE_DEFINE(resource_9, service_D, "/f*4.html", RES(3));
HTTP_RESOURCE_DEFINE(resource_11, service_D, "/foo/*", RES(3));
HTTP_RESOURCE_DEFINE(resource_12, service_D, "/foo/b?r", RES(3));

ZTEST(http_service, test_HTTP_SERVICE_DEFINE)
{
Expand Down Expand Up @@ -345,6 +347,25 @@ ZTEST(http_service, test_HTTP_RESOURCE_WILDCARD)
zassert_not_null(res, "Cannot find resource");
zassert_true(len > 0, "Length not set");
zassert_equal(res, RES(5), "Resource mismatch");

res = CHECK_PATH("/foo/bar", &len);
zassert_not_null(res, "Resource not found");
zassert_true(len == (sizeof("/foo/bar") - 1), "Length not set correctly");
zassert_equal(res, RES(3), "Resource mismatch");

res = CHECK_PATH("/foo/bar?param=value", &len);
zassert_not_null(res, "Resource not found");
zassert_true(len == (sizeof("/foo/bar") - 1), "Length not set correctly");
zassert_equal(res, RES(3), "Resource mismatch");

res = CHECK_PATH("/bar?foo=value", &len);
zassert_is_null(res, "Resource found");
zassert_equal(len, 0, "Length set");

res = CHECK_PATH("/foo/bar?param=value", &len);
zassert_not_null(res, "Resource not found");
zassert_true(len == (sizeof("/foo/bar") - 1), "Length not set correctly");
zassert_equal(res, RES(3), "Resource mismatch");
}

extern void http_server_get_content_type_from_extension(char *url, char *content_type,
Expand Down
Loading