Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_http_server): fixes websocket recv error handling

Browse Source 
Closes https://github.com/espressif/esp-idf/issues/18483
This commit is contained in:
Ashish Sharma
2026-05-10 19:26:08 +08:00
parent 1d573ef72c
commit f8dec92a06
3 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_http_server/test_apps/main/CMakeLists.txt
+2 -2
View File
@@ -1,3 +1,3 @@
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "."
PRIV_REQUIRES esp_http_server test_utils unity)
PRIV_INCLUDE_DIRS "." "../../src" "../../src/port/esp32"
PRIV_REQUIRES esp_http_server test_utils unity esp_timer)
components/esp_http_server/test_apps/main/test_http_server.c
+55
View File
@@ -10,6 +10,10 @@
#include <esp_http_server.h>
#include <esp_heap_caps.h>
#ifdef CONFIG_HTTPD_WS_SUPPORT
#include "../../src/esp_httpd_priv.h"
#endif
#include "unity.h"
#include "test_utils.h"
@@ -45,6 +49,25 @@ static httpd_uri_t handler_limit_ws_uri(char *path, const char *subprotocol)
};
return uri;
}
static int ws_recv_fail_handler_calls;
static int ws_recv_fail_override(httpd_handle_t hd, int sockfd, char *buf, size_t buf_len, int flags)
{
(void)hd;
(void)sockfd;
(void)buf;
(void)buf_len;
(void)flags;
return HTTPD_SOCK_ERR_FAIL;
}
static esp_err_t ws_counting_handler(httpd_req_t *req)
{
(void)req;
ws_recv_fail_handler_calls++;
return ESP_OK;
}
#endif /* CONFIG_HTTPD_WS_SUPPORT */
static inline unsigned num_digits(unsigned x)
@@ -325,6 +348,38 @@ TEST_CASE("httpd_resp_set_type rejects CRLF in content type", "[HTTP SERVER][sec
httpd_resp_set_type(&fake_req, "text/html\nX-Injected: pwned"));
}
#ifdef CONFIG_HTTPD_WS_SUPPORT
TEST_CASE("WS recv failure marks close without dispatching handler", "[HTTP SERVER][websocket]")
{
httpd_config_t config = HTTPD_DEFAULT_CONFIG();
struct httpd_data hd = {0};
struct sock_db session = {0};
hd.config = config;
hd.hd_req_aux.resp_hdrs = calloc(config.max_resp_headers, sizeof(*hd.hd_req_aux.resp_hdrs));
TEST_ASSERT_NOT_NULL(hd.hd_req_aux.resp_hdrs);
session.fd = 123;
session.handle = (httpd_handle_t) &hd;
session.recv_fn = ws_recv_fail_override;
session.ws_handshake_done = true;
session.ws_handler = ws_counting_handler;
session.ws_control_frames = false;
session.ws_close = false;
ws_recv_fail_handler_calls = 0;
esp_err_t ret = httpd_req_new(&hd, &session);
TEST_ASSERT_EQUAL(ESP_OK, ret);
TEST_ASSERT_EQUAL(0, ws_recv_fail_handler_calls);
TEST_ASSERT_TRUE(session.ws_close);
TEST_ASSERT_EQUAL(HTTPD_WS_TYPE_CLOSE, hd.hd_req_aux.ws_type);
free(hd.hd_req_aux.resp_hdrs);
}
#endif /* CONFIG_HTTPD_WS_SUPPORT */
void app_main(void)
{
unity_run_menu();