kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

limit bytes read by xml_curl to 1 meg 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12570 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-03-11 16:54:38 +00:00
parent 00cc2b4520
commit 0e88941983
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod/xml_int/mod_xml_curl/mod_xml_curl.c
View File

@ -54,9 +54,14 @@ static int keep_files_around = 0;
typedef struct xml_binding xml_binding_t; typedef struct xml_binding xml_binding_t;
#define XML_CURL_MAX_BYTES 1024 * 1024
struct config_data { struct config_data {
char *name; char *name;
int fd; int fd;
switch_size_t bytes;
switch_size_t max_bytes;
int err;
}; };
typedef struct hash_node { typedef struct hash_node {
@ -102,6 +107,15 @@ static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data)
register unsigned int realsize = (unsigned int) (size * nmemb); register unsigned int realsize = (unsigned int) (size * nmemb);
struct config_data *config_data = data; struct config_data *config_data = data;
int x; int x;
config_data->bytes += realsize;
if (config_data->bytes > config_data->max_bytes) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oversized file detected [%ld bytes]\n", config_data->bytes);
config_data->err = 1;
return 0;
}
x = write(config_data->fd, ptr, realsize); x = write(config_data->fd, ptr, realsize);
if (x != (int) realsize) { if (x != (int) realsize) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write! %d out of %d\n", x, realsize); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write! %d out of %d\n", x, realsize);
@ -185,6 +199,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
} }
config_data.name = filename; config_data.name = filename;
config_data.max_bytes = XML_CURL_MAX_BYTES;
if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) {
if (!switch_strlen_zero(binding->cred)) { if (!switch_strlen_zero(binding->cred)) {
curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY); curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
@ -222,6 +237,10 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening temp file!\n");
} }
if (config_data.err) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error encountered!\n");
xml = NULL;
} else {
if (httpRes == 200) { if (httpRes == 200) {
if (!(xml = switch_xml_parse_file(filename))) { if (!(xml = switch_xml_parse_file(filename))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing Result!\n");
@ -230,6 +249,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received HTTP error %ld trying to fetch %s\ndata: [%s]\n", httpRes, binding->url, data); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received HTTP error %ld trying to fetch %s\ndata: [%s]\n", httpRes, binding->url, data);
xml = NULL; xml = NULL;
} }
}
/* Debug by leaving the file behind for review */ /* Debug by leaving the file behind for review */
if (keep_files_around) { if (keep_files_around) {