Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 22:43:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix regression related to https lookups

Browse Source 
Reducing the buffer size of HTTPS responses broke DHT nodelist fetching. This change
puts the old buffer size back and converts all stack allocations of the read buffer
to heap allocations.
This commit is contained in:
jfreegman 2020-10-27 12:34:12 -04:00
parent 3cdcfbf4e5
commit 4d96d6a753
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bootstrap.c
View File

@ -241,6 +241,7 @@ on_exit:
* Return -2 if http lookup failed. * Return -2 if http lookup failed.
* Return -3 if http reponse was empty. * Return -3 if http reponse was empty.
* Return -4 if data could not be written to disk. * Return -4 if data could not be written to disk.
* Return -5 if memory allocation fails.
*/ */
static int update_DHT_nodeslist(const char *nodes_path) static int update_DHT_nodeslist(const char *nodes_path)
{ {
@ -254,26 +255,34 @@ static int update_DHT_nodeslist(const char *nodes_path)
return -1; return -1;
} }
struct Recv_Curl_Data recv_data; struct Recv_Curl_Data *recv_data = calloc(1, sizeof(struct Recv_Curl_Data));
memset(&recv_data, 0, sizeof(struct Recv_Curl_Data)); if (recv_data == NULL) {
fclose(fp);
return -5;
}
if (curl_fetch_nodes_JSON(&recv_data) == -1) { if (curl_fetch_nodes_JSON(recv_data) == -1) {
free(recv_data);
fclose(fp); fclose(fp);
return -2; return -2;
} }
if (recv_data.length == 0) { if (recv_data->length == 0) {
free(recv_data);
fclose(fp); fclose(fp);
return -3; return -3;
} }
if (fwrite(recv_data.data, recv_data.length, 1, fp) != 1) { if (fwrite(recv_data->data, recv_data->length, 1, fp) != 1) {
free(recv_data);
fclose(fp); fclose(fp);
return -4; return -4;
} }
free(recv_data);
fclose(fp); fclose(fp);
return 1; return 1;
} }

2
src/curl_util.h
View File

@ -27,7 +27,7 @@
#define TLS_CIPHER_SUITE_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK" #define TLS_CIPHER_SUITE_LIST "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK"
/* Max size of an http response that we can store in Recv_Data */ /* Max size of an http response that we can store in Recv_Data */
#define MAX_RECV_CURL_DATA_SIZE 1024 #define MAX_RECV_CURL_DATA_SIZE 32767
/* Holds data received from curl lookup */ /* Holds data received from curl lookup */
struct Recv_Curl_Data { struct Recv_Curl_Data {

12
src/name_lookup.c
View File

@ -265,9 +265,12 @@ void *lookup_thread_func(void *data)
kill_lookup_thread(); kill_lookup_thread();
} }
struct Recv_Curl_Data recv_data; struct Recv_Curl_Data *recv_data = calloc(1, sizeof(struct Recv_Curl_Data));
memset(&recv_data, 0, sizeof(struct Recv_Curl_Data)); if (recv_data == NULL) {
lookup_error(self, "memory allocation error");
kill_lookup_thread();
}
char post_data[MAX_STR_SIZE + 30]; char post_data[MAX_STR_SIZE + 30];
@ -285,7 +288,7 @@ void *lookup_thread_func(void *data)
curl_easy_setopt(c_handle, CURLOPT_WRITEFUNCTION, curl_cb_write_data); curl_easy_setopt(c_handle, CURLOPT_WRITEFUNCTION, curl_cb_write_data);
curl_easy_setopt(c_handle, CURLOPT_WRITEDATA, &recv_data); curl_easy_setopt(c_handle, CURLOPT_WRITEDATA, recv_data);
curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0"); curl_easy_setopt(c_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
@ -334,7 +337,7 @@ void *lookup_thread_func(void *data)
} }
} }
if (process_response(&recv_data) == -1) { if (process_response(recv_data) == -1) {
lookup_error(self, "Bad response."); lookup_error(self, "Bad response.");
goto on_exit; goto on_exit;
} }
@ -344,6 +347,7 @@ void *lookup_thread_func(void *data)
pthread_mutex_unlock(&Winthread.lock); pthread_mutex_unlock(&Winthread.lock);
on_exit: on_exit:
free(recv_data);
curl_slist_free_all(headers); curl_slist_free_all(headers);
curl_easy_cleanup(c_handle); curl_easy_cleanup(c_handle);
kill_lookup_thread(); kill_lookup_thread();