michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: lib: http_server: Prefer explicitly defined resources over FS ones

Browse Source 
Do direct resource path comparison on all registered resources before
falling back to fnmatch() so that exact path matches get always
preference.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos
2026-01-13 15:25:49 +01:00
committed by Alberto Escolar
parent 59b653bb4f
commit 10b9520cac
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
subsys/net/lib/http/http_server_core.c
View File

@@ -780,22 +780,28 @@ struct http_resource_detail *get_resource_detail(const struct http_service_desc
continue;
}
if (IS_ENABLED(CONFIG_HTTP_SERVER_RESOURCE_WILDCARD)) {
if (compare_strings(path, resource->resource) == 0) {
NET_DBG("Got match for %s", resource->resource);
*path_len = strlen(resource->resource);
return resource->detail;
}
}
if (IS_ENABLED(CONFIG_HTTP_SERVER_RESOURCE_WILDCARD)) {
HTTP_SERVICE_FOREACH_RESOURCE(service, resource) {
int ret;
if (skip_this(resource, is_websocket)) {
continue;
}
ret = fnmatch(resource->resource, path, (FNM_PATHNAME | FNM_LEADING_DIR));
if (ret == 0) {
*path_len = path_len_without_query(path);
return resource->detail;
}
}
if (compare_strings(path, resource->resource) == 0) {
NET_DBG("Got match for %s", resource->resource);
*path_len = strlen(resource->resource);
return resource->detail;
}
}
if (service->res_fallback != NULL) {