kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow semicolons to be escaped, when passing arguments to the System command.

Browse Source 
(closes issue #14231)
 Reported by: jcovert
 Patches: 
       20090113__bug14231__2.diff.txt uploaded by Corydon76 (license 14)
       corrected_20090113__bug14231__2.diff.txt uploaded by jcovert (license 551)
 Tested by: jcovert


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-02-20 17:29:51 +00:00
parent fefa97001a
commit 3af1c558df
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_system.c
View File

@@ -33,6 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/app.h" #include "asterisk/app.h"
#include "asterisk/channel.h" /* autoservice */ #include "asterisk/channel.h" /* autoservice */
#include "asterisk/strings.h"
#include "asterisk/threadstorage.h"
/*** DOCUMENTATION /*** DOCUMENTATION
<application name="System" language="en_US"> <application name="System" language="en_US">
@@ -90,6 +92,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
***/ ***/
AST_THREADSTORAGE(buf_buf);
static char *app = "System"; static char *app = "System";
static char *app2 = "TrySystem"; static char *app2 = "TrySystem";
@@ -99,6 +103,7 @@ static char *chanvar = "SYSTEMSTATUS";
static int system_exec_helper(struct ast_channel *chan, void *data, int failmode) static int system_exec_helper(struct ast_channel *chan, void *data, int failmode)
{ {
int res = 0; int res = 0;
struct ast_str *buf = ast_str_thread_get(&buf_buf, 16);
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "System requires an argument(command)\n"); ast_log(LOG_WARNING, "System requires an argument(command)\n");
@@ -109,7 +114,9 @@ static int system_exec_helper(struct ast_channel *chan, void *data, int failmode
ast_autoservice_start(chan); ast_autoservice_start(chan);
/* Do our thing here */ /* Do our thing here */
res = ast_safe_system((char *)data); ast_str_get_encoded_str(&buf, 0, (char *) data);
res = ast_safe_system(ast_str_buffer(buf));
if ((res < 0) && (errno != ECHILD)) { if ((res < 0) && (errno != ECHILD)) {
ast_log(LOG_WARNING, "Unable to execute '%s'\n", (char *)data); ast_log(LOG_WARNING, "Unable to execute '%s'\n", (char *)data);
pbx_builtin_setvar_helper(chan, chanvar, "FAILURE"); pbx_builtin_setvar_helper(chan, chanvar, "FAILURE");

3
include/asterisk/app.h
View File

@@ -498,6 +498,9 @@ int ast_get_encoded_char(const char *stream, char *result, size_t *consumed);
/*! \brief Decode a stream of encoded control or extended ASCII characters */ /*! \brief Decode a stream of encoded control or extended ASCII characters */
char *ast_get_encoded_str(const char *stream, char *result, size_t result_len); char *ast_get_encoded_str(const char *stream, char *result, size_t result_len);
/*! \brief Decode a stream of encoded control or extended ASCII characters */
int ast_str_get_encoded_str(struct ast_str **str, int maxlen, const char *stream);
/*! \brief Common routine for child processes, to close all fds prior to exec(2) */ /*! \brief Common routine for child processes, to close all fds prior to exec(2) */
void ast_close_fds_above_n(int n); void ast_close_fds_above_n(int n);

27
main/app.c
View File

@@ -1846,6 +1846,33 @@ char *ast_get_encoded_str(const char *stream, char *result, size_t result_size)
return result; return result;
} }
int ast_str_get_encoded_str(struct ast_str **str, int maxlen, const char *stream)
{
char next, *buf;
size_t offset = 0;
size_t consumed;
if (strchr(stream, '\\')) {
while (!ast_get_encoded_char(stream, &next, &consumed)) {
if (offset + 2 > ast_str_size(*str) && maxlen > -1) {
ast_str_make_space(str, maxlen > 0 ? maxlen : (ast_str_size(*str) + 48) * 2 - 48);
}
if (offset + 2 > ast_str_size(*str)) {
break;
}
buf = ast_str_buffer(*str);
buf[offset++] = next;
stream += consumed;
}
buf = ast_str_buffer(*str);
buf[offset++] = '\0';
ast_str_update(*str);
} else {
ast_str_set(str, maxlen, "%s", stream);
}
return 0;
}
void ast_close_fds_above_n(int n) void ast_close_fds_above_n(int n)
{ {
#ifdef HAVE_CLOSEFROM #ifdef HAVE_CLOSEFROM