extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-08-17 20:26:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow non-root to run many 'show' commands

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep
2017-12-28 10:33:12 -08:00
parent c9b58e203b
commit d8a22d13dd
2 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Shorewall/lib.cli-std
View File

@@ -47,11 +47,10 @@ get_config() {
fi
fi
if [ "$(id -u)" -eq 0 ]; then
config=$(find_file ${PRODUCT}.conf)
else
[ -n "$g_shorewalldir" ] || fatal_error "Ordinary users may not $COMMAND the $CONFDIR/$PRODUCT configuration"
if [ -n "$g_shorewalldir" ]; then
config="$g_shorewalldir/$PRODUCT.conf"
else
config=$(find_file ${PRODUCT}.conf)
fi
if [ -f $config ]; then
@@ -363,6 +362,17 @@ get_config() {
[ -f $lib ] && . $lib
}
#
# Ensure that the effective UID is 0 or that we are dealing with a private configuration
#
ensure_root() {
if [ $(id -u) -ne 0 ]; then
if [ -z "$g_shorewalldir" -o "$g_shorewalldir" = $CONFDIR/$PRODUCT ]; then
startup_error "Ordinary users may not $COMMAND the $CONFDIR/$PRODUCT configuration"
fi
fi
}
#
# Determine if there are config files newer than the passed object
#
@@ -413,11 +423,7 @@ compiler() {
pc=${LIBEXECDIR}/shorewall/compiler.pl
if [ $(id -u) -ne 0 ]; then
if [ -z "$g_shorewalldir" -o "$g_shorewalldir" = $CONFDIR/$PRODUCT ]; then
startup_error "Ordinary users may not $COMMAND the $CONFDIR/$PRODUCT configuration"
fi
fi
ensure_root
#
# We've now set g_shorewalldir so recalculate CONFIG_PATH
#
@@ -1741,6 +1747,7 @@ compiler_command() {
compile_command $@
;;
refresh)
only_root
get_config Yes Yes
shift
refresh_command $@
@@ -1762,11 +1769,13 @@ compiler_command() {
export_command $@
;;
try)
only_root
get_config Yes
shift
try_command $@
;;
safe-reload|safe-restart|safe-start)
only_root
get_config Yes
shift
safe_commands $@