Add token verify in websocket request
Signed-off-by: YoungSoo Shin <shinys000114@gmail.com>
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
#include "esp_err.h"
|
||||
#include "esp_http_server.h"
|
||||
#include "esp_log.h"
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/semphr.h"
|
||||
#include "nconfig.h"
|
||||
#include "pb.h"
|
||||
@@ -203,13 +204,50 @@ static void uart_event_task(void* arg)
|
||||
|
||||
static esp_err_t ws_handler(httpd_req_t* req)
|
||||
{
|
||||
// esp_err_t err = api_auth_check(req);
|
||||
// if (err != ESP_OK) {
|
||||
// return err;
|
||||
// }
|
||||
|
||||
if (req->method == HTTP_GET)
|
||||
{
|
||||
ESP_LOGI(TAG, "WebSocket GET request received for URI: %s", req->uri);
|
||||
|
||||
char* query_str = NULL;
|
||||
size_t query_len = httpd_req_get_url_query_len(req) + 1;
|
||||
if (query_len > 1) {
|
||||
query_str = malloc(query_len);
|
||||
if (query_str == NULL) {
|
||||
ESP_LOGE(TAG, "Failed to allocate memory for query string");
|
||||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Internal Server Error");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
if (httpd_req_get_url_query_str(req, query_str, query_len) != ESP_OK) {
|
||||
ESP_LOGE(TAG, "Failed to get query string from URI: %s", req->uri);
|
||||
free(query_str);
|
||||
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Internal Server Error");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
ESP_LOGI(TAG, "Extracted query string: %s", query_str);
|
||||
}
|
||||
|
||||
char token_str[TOKEN_LENGTH];
|
||||
esp_err_t err = ESP_FAIL; // Default to fail
|
||||
|
||||
if (query_str) {
|
||||
err = httpd_query_key_value(query_str, "token", token_str, sizeof(token_str));
|
||||
free(query_str); // Free allocated query string
|
||||
}
|
||||
|
||||
if (err == ESP_OK) {
|
||||
ESP_LOGI(TAG, "Token extracted from query string, value: %s", token_str);
|
||||
if (!auth_validate_token(token_str)) {
|
||||
ESP_LOGW(TAG, "WebSocket connection attempt with invalid token for URI: %s", req->uri);
|
||||
httpd_resp_send_err(req, HTTPD_401_UNAUTHORIZED, "Invalid or expired token");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
ESP_LOGD(TAG, "WebSocket token validated for URI: %s", req->uri);
|
||||
} else {
|
||||
ESP_LOGW(TAG, "Failed to extract token from query string or query string not found, error: %s", esp_err_to_name(err));
|
||||
httpd_resp_send_err(req, HTTPD_401_UNAUTHORIZED, "Authorization token required");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
|
||||
ESP_LOGI(TAG, "Handshake done, the new connection was opened");
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user