Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/http_client_null_auth_header_v3.1' into 'release/v3.1'

Browse source 
esp_http_client: Fixed exception on 401 without Www-Authenticate header (backport v3.1)

See merge request idf/esp-idf!2978
This commit is contained in:
Angus Gratton 2018-08-13 11:48:26 +08:00
parent d91c425178 9a273863ba
commit 695d95c983
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/esp_http_client/esp_http_client.c
View file

@ -557,10 +557,10 @@ static esp_err_t esp_http_check_response(esp_http_client_handle_t client)
break;
case HttpStatus_Unauthorized:
auth_header = client->auth_header;
http_utils_trim_whitespace(&auth_header);
ESP_LOGI(TAG, "UNAUTHORIZED: %s", auth_header);
client->redirect_counter ++;
if (auth_header) {
http_utils_trim_whitespace(&auth_header);
ESP_LOGD(TAG, "UNAUTHORIZED: %s", auth_header);
client->redirect_counter ++;
if (http_utils_str_starts_with(auth_header, "Digest") == 0) {
ESP_LOGD(TAG, "type = Digest");
client->connection_info.auth_type = HTTP_AUTH_TYPE_DIGEST;
@ -569,7 +569,7 @@ static esp_err_t esp_http_check_response(esp_http_client_handle_t client)
client->connection_info.auth_type = HTTP_AUTH_TYPE_BASIC;
} else {
client->connection_info.auth_type = HTTP_AUTH_TYPE_NONE;
ESP_LOGE(TAG, "Unsupport Auth Type");
ESP_LOGE(TAG, "This authentication method is not supported: %s", auth_header);
break;
}
@ -584,6 +584,9 @@ static esp_err_t esp_http_check_response(esp_http_client_handle_t client)
client->auth_data->nonce = http_utils_get_string_between(auth_header, "nonce=\"", "\"");
client->auth_data->opaque = http_utils_get_string_between(auth_header, "opaque=\"", "\"");
client->process_again = 1;
} else {
client->connection_info.auth_type = HTTP_AUTH_TYPE_NONE;
ESP_LOGW(TAG, "This request requires authentication, but does not provide header information for that");
}
}
return ESP_OK;

10
components/esp_http_client/lib/http_utils.c
View file

@ -63,8 +63,14 @@ char *http_utils_assign_string(char **str, const char *new_str, int len)
void http_utils_trim_whitespace(char **str)
{
char *end;
char *start = *str;
char *end, *start;
if (str == NULL) {
return;
}
start = *str;
if (start == NULL) {
return;
}
// Trim leading space
while (isspace((unsigned char)*start)) start ++;