kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

pbx.c: Allow dangerous functions when adding a hint to dialplan.

Browse Source 
We can allow dangerous functions when adding a hint since altering
dialplan is itself a privileged activity.  Otherwise, we could never
execute dangerous functions.

ASTERISK-25996 #close
Reported by: Andrew Nagy

Change-Id: I4929ff100ad1200a0198262d069a34f2296e77ba
This commit is contained in:
Richard Mudgett
2016-07-27 17:17:53 -05:00
parent 4cbb735c28
commit 68ebf86e2f
3 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/asterisk/pbx.h
View File

@@ -1618,6 +1618,18 @@ void pbx_live_dangerously(int new_live_dangerously);
*/ */
int ast_thread_inhibit_escalations(void); int ast_thread_inhibit_escalations(void);
/*!
* \brief Swap the current thread escalation inhibit setting.
* \since 11.24.0
*
* \param inhibit New setting. Non-zero to inhibit.
*
* \retval 1 if dangerous function execution was inhibited.
* \retval 0 if dangerous function execution was allowed.
* \retval -1 on error.
*/
int ast_thread_inhibit_escalations_swap(int inhibit);
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} }
#endif #endif

12
main/pbx.c
View File

@@ -7153,13 +7153,25 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
/* If we are adding a hint evalulate in variables and global variables */ /* If we are adding a hint evalulate in variables and global variables */
if (priority == PRIORITY_HINT && strstr(application, "${") && extension[0] != '_') { if (priority == PRIORITY_HINT && strstr(application, "${") && extension[0] != '_') {
int inhibited;
struct ast_channel *c = ast_dummy_channel_alloc(); struct ast_channel *c = ast_dummy_channel_alloc();
if (c) { if (c) {
ast_channel_exten_set(c, extension); ast_channel_exten_set(c, extension);
ast_channel_context_set(c, con->name); ast_channel_context_set(c, con->name);
} }
/*
* We can allow dangerous functions when adding a hint since
* altering dialplan is itself a privileged activity. Otherwise,
* we could never execute dangerous functions.
*/
inhibited = ast_thread_inhibit_escalations_swap(0);
pbx_substitute_variables_helper(c, application, expand_buf, sizeof(expand_buf)); pbx_substitute_variables_helper(c, application, expand_buf, sizeof(expand_buf));
if (0 < inhibited) {
ast_thread_inhibit_escalations();
}
application = expand_buf; application = expand_buf;
if (c) { if (c) {
ast_channel_unref(c); ast_channel_unref(c);

19
main/pbx_functions.c
View File

@@ -482,7 +482,6 @@ int ast_thread_inhibit_escalations(void)
thread_inhibit_escalations = ast_threadstorage_get( thread_inhibit_escalations = ast_threadstorage_get(
&thread_inhibit_escalations_tl, sizeof(*thread_inhibit_escalations)); &thread_inhibit_escalations_tl, sizeof(*thread_inhibit_escalations));
if (thread_inhibit_escalations == NULL) { if (thread_inhibit_escalations == NULL) {
ast_log(LOG_ERROR, "Error inhibiting privilege escalations for current thread\n"); ast_log(LOG_ERROR, "Error inhibiting privilege escalations for current thread\n");
return -1; return -1;
@@ -492,6 +491,23 @@ int ast_thread_inhibit_escalations(void)
return 0; return 0;
} }
int ast_thread_inhibit_escalations_swap(int inhibit)
{
int *thread_inhibit_escalations;
int orig;
thread_inhibit_escalations = ast_threadstorage_get(
&thread_inhibit_escalations_tl, sizeof(*thread_inhibit_escalations));
if (thread_inhibit_escalations == NULL) {
ast_log(LOG_ERROR, "Error swapping privilege escalations inhibit for current thread\n");
return -1;
}
orig = *thread_inhibit_escalations;
*thread_inhibit_escalations = !!inhibit;
return orig;
}
/*! /*!
* \brief Indicates whether the current thread inhibits the execution of * \brief Indicates whether the current thread inhibits the execution of
* dangerous functions. * dangerous functions.
@@ -505,7 +521,6 @@ static int thread_inhibits_escalations(void)
thread_inhibit_escalations = ast_threadstorage_get( thread_inhibit_escalations = ast_threadstorage_get(
&thread_inhibit_escalations_tl, sizeof(*thread_inhibit_escalations)); &thread_inhibit_escalations_tl, sizeof(*thread_inhibit_escalations));
if (thread_inhibit_escalations == NULL) { if (thread_inhibit_escalations == NULL) {
ast_log(LOG_ERROR, "Error checking thread's ability to run dangerous functions\n"); ast_log(LOG_ERROR, "Error checking thread's ability to run dangerous functions\n");
/* On error, assume that we are inhibiting */ /* On error, assume that we are inhibiting */