Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 172441 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r172441 | tilghman | 2009-01-29 17:15:40 -0600 (Thu, 29 Jan 2009) | 16 lines
  
  Merged revisions 172438 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r172438 | tilghman | 2009-01-29 16:54:29 -0600 (Thu, 29 Jan 2009) | 9 lines
    
    Lose the CAP_NET_ADMIN at every fork, instead of at startup.  Otherwise, if
    Asterisk runs as a non-root user and the administrator does a 'restart now',
    Asterisk loses the ability to set QOS on packets.
    (closes issue #14004)
     Reported by: nemo
     Patches: 
           20090105__bug14004.diff.txt uploaded by Corydon76 (license 14)
     Tested by: Corydon76
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@172503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Tilghman Lesher 17 years ago
parent 12782036b0
commit 407d3d8861
12 changed files with 169 additions and 11 deletions
Show Stats Download Patch File Download Diff File

17
apps/app_dahdiras.c
Unescape View File

@ -27,6 +27,7 @@
/*** MODULEINFO /*** MODULEINFO
<depend>dahdi</depend> <depend>dahdi</depend>
<depend>working_fork</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"
@ -42,6 +43,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#endif /* __linux__ */ #endif /* __linux__ */
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include <dahdi/user.h> #include <dahdi/user.h>
@ -76,6 +80,9 @@ static pid_t spawn_ras(struct ast_channel *chan, char *args)
int argc = 0; int argc = 0;
char *stringp=NULL; char *stringp=NULL;
sigset_t fullset, oldset; sigset_t fullset, oldset;
#ifdef HAVE_CAP
cap_t cap;
#endif
sigfillset(&fullset); sigfillset(&fullset);
pthread_sigmask(SIG_BLOCK, &fullset, &oldset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
@ -87,6 +94,16 @@ static pid_t spawn_ras(struct ast_channel *chan, char *args)
return pid; return pid;
} }
#ifdef HAVE_CAP
cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
/* Restore original signal handlers */ /* Restore original signal handlers */
for (x=0;x<NSIG;x++) for (x=0;x<NSIG;x++)
signal(x, SIG_DFL); signal(x, SIG_DFL);

16
apps/app_externalivr.c
Unescape View File

@ -31,11 +31,18 @@
* \ingroup applications * \ingroup applications
*/ */
/*** MODULEINFO
<depend>working_fork</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <signal.h> #include <signal.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/file.h" #include "asterisk/file.h"
@ -362,6 +369,15 @@ static int app_exec(struct ast_channel *chan, void *data)
if (!pid) { if (!pid) {
/* child process */ /* child process */
int i; int i;
#ifdef HAVE_CAP
cap_t cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
pthread_sigmask(SIG_UNBLOCK, &fullset, NULL); pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);

19
apps/app_festival.c
Unescape View File

@ -27,6 +27,10 @@
* \ingroup applications * \ingroup applications
*/ */
/*** MODULEINFO
<depend>working_fork</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@ -39,6 +43,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/file.h" #include "asterisk/file.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"
@ -123,6 +130,9 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
char c; char c;
#endif #endif
sigset_t fullset, oldset; sigset_t fullset, oldset;
#ifdef HAVE_CAP
cap_t cap;
#endif
sigfillset(&fullset); sigfillset(&fullset);
pthread_sigmask(SIG_BLOCK, &fullset, &oldset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
@ -134,6 +144,15 @@ static int send_waveform_to_fd(char *waveform, int length, int fd)
pthread_sigmask(SIG_SETMASK, &oldset, NULL); pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return res; return res;
} }
#ifdef HAVE_CAP
cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
for (x = 0; x < 256; x++) { for (x = 0; x < 256; x++) {
if (x != fd) if (x != fd)
close(x); close(x);

20
apps/app_ices.c
Unescape View File

@ -27,6 +27,10 @@
* \ingroup applications * \ingroup applications
*/ */
/*** MODULEINFO
<depend>working_fork</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@ -34,6 +38,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <signal.h> #include <signal.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */ #include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */
#include "asterisk/lock.h" #include "asterisk/lock.h"
@ -64,6 +71,9 @@ static int icesencode(char *filename, int fd)
int res; int res;
int x; int x;
sigset_t fullset, oldset; sigset_t fullset, oldset;
#ifdef HAVE_CAP
cap_t cap;
#endif
sigfillset(&fullset); sigfillset(&fullset);
pthread_sigmask(SIG_BLOCK, &fullset, &oldset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
@ -80,6 +90,16 @@ static int icesencode(char *filename, int fd)
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
pthread_sigmask(SIG_UNBLOCK, &fullset, NULL); pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
#ifdef HAVE_CAP
cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
if (ast_opt_high_priority) if (ast_opt_high_priority)
ast_set_priority(0); ast_set_priority(0);
dup2(fd, STDIN_FILENO); dup2(fd, STDIN_FILENO);

22
apps/app_mp3.c
Unescape View File

@ -25,12 +25,19 @@
* \ingroup applications * \ingroup applications
*/ */
/*** MODULEINFO
<depend>working_fork</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/time.h> #include <sys/time.h>
#include <signal.h> #include <signal.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/file.h" #include "asterisk/file.h"
@ -58,6 +65,9 @@ static int mp3play(char *filename, int fd)
int res; int res;
int x; int x;
sigset_t fullset, oldset; sigset_t fullset, oldset;
#ifdef HAVE_CAP
cap_t cap;
#endif
sigfillset(&fullset); sigfillset(&fullset);
pthread_sigmask(SIG_BLOCK, &fullset, &oldset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
@ -69,6 +79,15 @@ static int mp3play(char *filename, int fd)
pthread_sigmask(SIG_SETMASK, &oldset, NULL); pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return res; return res;
} }
#ifdef HAVE_CAP
cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
if (ast_opt_high_priority) if (ast_opt_high_priority)
ast_set_priority(0); ast_set_priority(0);
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
@ -76,8 +95,7 @@ static int mp3play(char *filename, int fd)
dup2(fd, STDOUT_FILENO); dup2(fd, STDOUT_FILENO);
for (x=STDERR_FILENO + 1;x<256;x++) { for (x=STDERR_FILENO + 1;x<256;x++) {
if (x != STDOUT_FILENO) close(x);
close(x);
} }
/* Execute mpg123, but buffer if it's a net connection */ /* Execute mpg123, but buffer if it's a net connection */
if (!strncasecmp(filename, "http://", 7)) { if (!strncasecmp(filename, "http://", 7)) {

19
apps/app_nbscat.c
Unescape View File

@ -25,6 +25,10 @@
* \ingroup applications * \ingroup applications
*/ */
/*** MODULEINFO
<depend>working_fork</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@ -33,6 +37,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <signal.h> #include <signal.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/file.h" #include "asterisk/file.h"
@ -63,6 +70,9 @@ static int NBScatplay(int fd)
int res; int res;
int x; int x;
sigset_t fullset, oldset; sigset_t fullset, oldset;
#ifdef HAVE_CAP
cap_t cap;
#endif
sigfillset(&fullset); sigfillset(&fullset);
pthread_sigmask(SIG_BLOCK, &fullset, &oldset); pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
@ -77,6 +87,15 @@ static int NBScatplay(int fd)
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
pthread_sigmask(SIG_UNBLOCK, &fullset, NULL); pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
#ifdef HAVE_CAP
cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
if (ast_opt_high_priority) if (ast_opt_high_priority)
ast_set_priority(0); ast_set_priority(0);

2
autoconf/ast_func_fork.m4
Unescape View File

@ -39,6 +39,8 @@ else
fi fi
if test "x$ac_cv_func_fork_works" = xyes; then if test "x$ac_cv_func_fork_works" = xyes; then
AC_DEFINE(HAVE_WORKING_FORK, 1, [Define to 1 if `fork' works.]) AC_DEFINE(HAVE_WORKING_FORK, 1, [Define to 1 if `fork' works.])
PBX_WORKING_FORK=1
AC_SUBST(PBX_WORKING_FORK)
fi fi
])# AST_FUNC_FORK ])# AST_FUNC_FORK

1
build_tools/menuselect-deps.in
Unescape View File

@ -47,4 +47,5 @@ USB=@PBX_USB@
VORBIS=@PBX_VORBIS@ VORBIS=@PBX_VORBIS@
VPBAPI=@PBX_VPB@ VPBAPI=@PBX_VPB@
WINARCH=@WINARCH@ WINARCH=@WINARCH@
WORKING_VFORK=@WORKING_VFORK@
ZLIB=@PBX_ZLIB@ ZLIB=@PBX_ZLIB@

8
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 163169 . # From configure.ac Revision: 164265 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # Generated by GNU Autoconf 2.61 for asterisk 1.6.
# #
@ -951,6 +951,7 @@ ZLIB_DIR
PBX_ZLIB PBX_ZLIB
ALLOCA ALLOCA
LIBOBJS LIBOBJS
PBX_WORKING_FORK
POW_LIB POW_LIB
HAS_POLL HAS_POLL
PBX_PTHREAD_RWLOCK_INITIALIZER PBX_PTHREAD_RWLOCK_INITIALIZER
@ -12902,6 +12903,8 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_WORKING_FORK 1 #define HAVE_WORKING_FORK 1
_ACEOF _ACEOF
PBX_WORKING_FORK=1
fi fi
{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
@ -50538,6 +50541,7 @@ ZLIB_DIR!$ZLIB_DIR$ac_delim
PBX_ZLIB!$PBX_ZLIB$ac_delim PBX_ZLIB!$PBX_ZLIB$ac_delim
ALLOCA!$ALLOCA$ac_delim ALLOCA!$ALLOCA$ac_delim
LIBOBJS!$LIBOBJS$ac_delim LIBOBJS!$LIBOBJS$ac_delim
PBX_WORKING_FORK!$PBX_WORKING_FORK$ac_delim
POW_LIB!$POW_LIB$ac_delim POW_LIB!$POW_LIB$ac_delim
HAS_POLL!$HAS_POLL$ac_delim HAS_POLL!$HAS_POLL$ac_delim
PBX_PTHREAD_RWLOCK_INITIALIZER!$PBX_PTHREAD_RWLOCK_INITIALIZER$ac_delim PBX_PTHREAD_RWLOCK_INITIALIZER!$PBX_PTHREAD_RWLOCK_INITIALIZER$ac_delim
@ -50575,7 +50579,7 @@ CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

13
main/asterisk.c
Unescape View File

@ -873,6 +873,15 @@ int ast_safe_system(const char *s)
#endif #endif
if (pid == 0) { if (pid == 0) {
#ifdef HAVE_CAP
cap_t cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
#ifdef HAVE_WORKING_FORK #ifdef HAVE_WORKING_FORK
if (ast_opt_high_priority) if (ast_opt_high_priority)
ast_set_priority(0); ast_set_priority(0);
@ -897,7 +906,7 @@ int ast_safe_system(const char *s)
} }
ast_unreplace_sigchld(); ast_unreplace_sigchld();
#else #else /* !defined(HAVE_WORKING_FORK) && !defined(HAVE_WORKING_VFORK) */
res = -1; res = -1;
#endif #endif
@ -3197,7 +3206,7 @@ int main(int argc, char *argv[])
if (has_cap) { if (has_cap) {
cap_t cap; cap_t cap;
cap = cap_from_text("cap_net_admin=ep"); cap = cap_from_text("cap_net_admin=eip");
if (cap_set_proc(cap)) if (cap_set_proc(cap))
ast_log(LOG_WARNING, "Unable to install capabilities.\n"); ast_log(LOG_WARNING, "Unable to install capabilities.\n");

17
res/res_agi.c
Unescape View File

@ -23,6 +23,10 @@
* \author Mark Spencer <markster@digium.com> * \author Mark Spencer <markster@digium.com>
*/ */
/*** MODULEINFO
<depend>working_fork</depend>
***/
#include "asterisk.h" #include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@ -33,6 +37,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <pthread.h> #include <pthread.h>
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/paths.h" /* use many ast_config_AST_*_DIR */ #include "asterisk/paths.h" /* use many ast_config_AST_*_DIR */
#include "asterisk/network.h" #include "asterisk/network.h"
@ -667,6 +674,16 @@ static enum agi_result launch_script(struct ast_channel *chan, char *script, cha
return AGI_RESULT_FAILURE; return AGI_RESULT_FAILURE;
} }
if (!pid) { if (!pid) {
#ifdef HAVE_CAP
cap_t cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
/* Careful with order! Logging cannot happen after we close FDs */
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
/* Pass paths to AGI via environmental variables */ /* Pass paths to AGI via environmental variables */
setenv("AST_CONFIG_DIR", ast_config_AST_CONFIG_DIR, 1); setenv("AST_CONFIG_DIR", ast_config_AST_CONFIG_DIR, 1);
setenv("AST_CONFIG_FILE", ast_config_AST_CONFIG_FILE, 1); setenv("AST_CONFIG_FILE", ast_config_AST_CONFIG_FILE, 1);

26
res/res_musiconhold.c
Unescape View File

@ -28,6 +28,7 @@
/*** MODULEINFO /*** MODULEINFO
<conflict>win32</conflict> <conflict>win32</conflict>
<use>dahdi</use> <use>dahdi</use>
<depend>working_fork</depend>
***/ ***/
#include "asterisk.h" #include "asterisk.h"
@ -49,6 +50,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#ifdef HAVE_DAHDI #ifdef HAVE_DAHDI
#include <dahdi/user.h> #include <dahdi/user.h>
#endif #endif
#ifdef HAVE_CAP
#include <sys/capability.h>
#endif /* HAVE_CAP */
#include "asterisk/lock.h" #include "asterisk/lock.h"
#include "asterisk/file.h" #include "asterisk/file.h"
@ -491,7 +495,15 @@ static int spawn_mp3(struct mohclass *class)
return -1; return -1;
} }
if (!class->pid) { if (!class->pid) {
/* Child */
int x; int x;
#ifdef HAVE_CAP
cap_t cap;
#endif
if (strcasecmp(class->dir, "nodir") && chdir(class->dir) < 0) {
ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
_exit(1);
}
if (ast_opt_high_priority) if (ast_opt_high_priority)
ast_set_priority(0); ast_set_priority(0);
@ -500,6 +512,14 @@ static int spawn_mp3(struct mohclass *class)
signal(SIGPIPE, SIG_DFL); signal(SIGPIPE, SIG_DFL);
pthread_sigmask(SIG_UNBLOCK, &signal_set, NULL); pthread_sigmask(SIG_UNBLOCK, &signal_set, NULL);
#ifdef HAVE_CAP
cap = cap_from_text("cap_net_admin-eip");
if (cap_set_proc(cap)) {
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
}
cap_free(cap);
#endif
close(fds[0]); close(fds[0]);
/* Stdout goes to pipe */ /* Stdout goes to pipe */
dup2(fds[1], STDOUT_FILENO); dup2(fds[1], STDOUT_FILENO);
@ -509,12 +529,8 @@ static int spawn_mp3(struct mohclass *class)
close(x); close(x);
} }
} }
/* Child */
if (strcasecmp(class->dir, "nodir") && chdir(class->dir) < 0) {
ast_log(LOG_WARNING, "chdir() failed: %s\n", strerror(errno));
_exit(1);
}
setpgid(0, getpid()); setpgid(0, getpid());
if (ast_test_flag(class, MOH_CUSTOM)) { if (ast_test_flag(class, MOH_CUSTOM)) {
execv(argv[0], argv); execv(argv[0], argv);
} else { } else {

Write Preview
Loading…
Cancel
Save