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

Merge pull request #509 from talmakion/dev-xmlcurl-cfg 

[mod_xml_curl] Allow XML_CURL_MAX_BYTES to be configured at runtime
This commit is contained in:
Chris Rienzo 2021-02-13 13:01:20 -05:00 committed by GitHub
parent 6a19627dcd dbea1482e7
commit 7d0909d4a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/xml_int/mod_xml_curl/conf/autoload_configs/xml_curl.conf.xml
View File

@ -44,6 +44,10 @@
<!-- one or more of these imply you want to pick the exact variables that are transmitted --> <!-- one or more of these imply you want to pick the exact variables that are transmitted -->
<!--<param name="enable-post-var" value="Unique-ID"/>--> <!--<param name="enable-post-var" value="Unique-ID"/>-->
<!-- optional: maximum response size for this binding in bytes.
Defaults to XML_CURL_MAX_BYTES (1MB) if omitted -->
<!--<param name="response-max-bytes" value="10485760"/>-->
</binding> </binding>
</bindings> </bindings>
</configuration> </configuration>

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

@ -59,6 +59,7 @@ struct xml_binding {
int use_dynamic_url; int use_dynamic_url;
long auth_scheme; long auth_scheme;
int timeout; int timeout;
switch_size_t curl_max_bytes;
}; };
static int keep_files_around = 0; static int keep_files_around = 0;
@ -218,7 +219,7 @@ static switch_xml_t xml_url_fetch(const char *section, const char *tag_name, con
memset(&config_data, 0, sizeof(config_data)); memset(&config_data, 0, sizeof(config_data));
config_data.name = filename; config_data.name = filename;
config_data.max_bytes = XML_CURL_MAX_BYTES; config_data.max_bytes = binding->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 (!zstr(binding->cred)) { if (!zstr(binding->cred)) {
@ -364,6 +365,7 @@ static switch_status_t do_config(void)
char *method = NULL; char *method = NULL;
int disable100continue = 1; int disable100continue = 1;
int use_dynamic_url = 0, timeout = 0; int use_dynamic_url = 0, timeout = 0;
switch_size_t curl_max_bytes = XML_CURL_MAX_BYTES;
uint32_t enable_cacert_check = 0; uint32_t enable_cacert_check = 0;
char *ssl_cert_file = NULL; char *ssl_cert_file = NULL;
char *ssl_key_file = NULL; char *ssl_key_file = NULL;
@ -452,6 +454,13 @@ static switch_status_t do_config(void)
} }
} else if (!strcasecmp(var, "bind-local")) { } else if (!strcasecmp(var, "bind-local")) {
bind_local = val; bind_local = val;
} else if (!strcasecmp(var, "response-max-bytes")) {
int tmp = atoi(val);
if (tmp >= 0) {
curl_max_bytes = tmp;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't set a negative maximum response bytes!\n");
}
} }
} }
@ -540,6 +549,8 @@ static switch_status_t do_config(void)
} }
binding->curl_max_bytes = curl_max_bytes;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n",
zstr(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all"); zstr(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all");
switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding); switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding);