espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/softap_prov_session_v3.3' into 'release/v3.3'

Browse Source 
protocomm_httpd: Restart security session if request is received on a new session (v3.3)

See merge request espressif/esp-idf!9118
This commit is contained in:
Mahavir Jain
2020-08-31 13:01:12 +08:00
parent 41debcfbd2 52c089fba7
commit cfcc189a89
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/protocomm/src/transports/protocomm_httpd.c
View File

@ -31,6 +31,17 @@ static uint32_t session_id = PROTOCOMM_NO_SESSION_ID;
#define MAX_REQ_BODY_LEN 4096 #define MAX_REQ_BODY_LEN 4096
static void protocomm_httpd_session_close(void *ctx)
{
if (pc_httpd->sec && pc_httpd->sec->close_transport_session) {
ESP_LOGW(TAG, "Closing session as socket %d was closed", session_id);
if (pc_httpd->sec->close_transport_session(session_id) != ESP_OK) {
ESP_LOGW(TAG, "Error closing session with ID: %d", session_id);
}
}
session_id = PROTOCOMM_NO_SESSION_ID;
}
static esp_err_t common_post_handler(httpd_req_t *req) static esp_err_t common_post_handler(httpd_req_t *req)
{ {
esp_err_t ret; esp_err_t ret;
@ -42,6 +53,7 @@ static esp_err_t common_post_handler(httpd_req_t *req)
int cur_session_id = httpd_req_to_sockfd(req); int cur_session_id = httpd_req_to_sockfd(req);
if (cur_session_id != session_id) { if (cur_session_id != session_id) {
ESP_LOGI(TAG, "Creating new session: %d", cur_session_id);
/* Initialize new security session */ /* Initialize new security session */
if (session_id != PROTOCOMM_NO_SESSION_ID) { if (session_id != PROTOCOMM_NO_SESSION_ID) {
ESP_LOGD(TAG, "Closing session with ID: %d", session_id); ESP_LOGD(TAG, "Closing session with ID: %d", session_id);
@ -62,6 +74,8 @@ static esp_err_t common_post_handler(httpd_req_t *req)
ret = ESP_FAIL; ret = ESP_FAIL;
goto out; goto out;
} }
req->free_ctx = protocomm_httpd_session_close;
} }
session_id = cur_session_id; session_id = cur_session_id;
ESP_LOGD(TAG, "New session with ID: %d", cur_session_id); ESP_LOGD(TAG, "New session with ID: %d", cur_session_id);