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

Merge pull request #2727 from ar45/mod_curl_allow_more_argv 

[mod_curl] Increase argument limit and enforce max args constraint
This commit is contained in:
Andrey Volk 2025-01-15 03:17:25 +03:00 committed by GitHub
parent e9be0fab8a e359409cae
commit ad5fe8bcff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_curl/mod_curl.c
View File

@ -57,6 +57,10 @@ static char *SYNTAX = "curl url [headers|json|content-type <mime-type>|connect-t
#define HTTP_MAX_APPEND_HEADERS 10 #define HTTP_MAX_APPEND_HEADERS 10
#define HTTP_DEFAULT_MAX_BYTES 64000 #define HTTP_DEFAULT_MAX_BYTES 64000
#ifndef MOD_CURL_MAX_ARGS
#define MOD_CURL_MAX_ARGS 30
#endif
static struct { static struct {
switch_memory_pool_t *pool; switch_memory_pool_t *pool;
switch_event_node_t *node; switch_event_node_t *node;
@ -866,7 +870,7 @@ SWITCH_STANDARD_APP(curl_app_function)
{ {
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
char *argv[10] = { 0 }; char *argv[MOD_CURL_MAX_ARGS + 1] = { 0 };
int argc; int argc;
char *mydata = NULL; char *mydata = NULL;
@ -894,6 +898,9 @@ SWITCH_STANDARD_APP(curl_app_function)
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
if (argc == 0) { if (argc == 0) {
switch_goto_status(SWITCH_STATUS_SUCCESS, usage); switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
} else if (argc >= MOD_CURL_MAX_ARGS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Max args exceeded: %d\n", MOD_CURL_MAX_ARGS);
switch_goto_status(SWITCH_STATUS_FALSE, done);
} }
url = switch_core_strdup(pool, argv[0]); url = switch_core_strdup(pool, argv[0]);
@ -982,7 +989,7 @@ SWITCH_STANDARD_APP(curl_app_function)
SWITCH_STANDARD_API(curl_function) SWITCH_STANDARD_API(curl_function)
{ {
switch_status_t status; switch_status_t status;
char *argv[10] = { 0 }; char *argv[MOD_CURL_MAX_ARGS + 1] = { 0 };
int argc; int argc;
char *mydata = NULL; char *mydata = NULL;
char *url = NULL; char *url = NULL;
@ -1014,6 +1021,9 @@ SWITCH_STANDARD_API(curl_function)
if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
if (argc < 1) { if (argc < 1) {
switch_goto_status(SWITCH_STATUS_SUCCESS, usage); switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
} else if (argc >= MOD_CURL_MAX_ARGS) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Max args exceeded: %d\n", MOD_CURL_MAX_ARGS);
switch_goto_status(SWITCH_STATUS_FALSE, done);
} }
url = switch_core_strdup(pool, argv[0]); url = switch_core_strdup(pool, argv[0]);