Add global explorers su, sudo and sucmd.

This commit is contained in:
Darko Poljak 2016-04-15 08:37:33 +02:00
parent a1e86a481c
commit cd78d4140a
4 changed files with 69 additions and 27 deletions

View file

@ -17,11 +17,18 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# This explorer returns script code string for running a command with su.
# If no su is found then it returns empty string.
# It uses two arguments, first user and the second command to run.
# If the result string is assigned to foo it is used as:
# $ $foo user command
#
which su > /dev/null 2>&1 which su > /dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo yes su_func='f() { su -c "$2" $1 ; }'
echo "eval '${su_func}' ; f "
else else
echo no echo ""
fi fi

46
cdist/conf/explorer/sucmd Normal file
View file

@ -0,0 +1,46 @@
#!/bin/sh
#
# 2016 Darko Poljak (darko.poljak at gmail.com)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
# This explorer returns script code string for running a command with su
# or sudo, whichever it founds. If searches the command in the order of
# first sudo and then su if sudo is not found.
# If no sudo nor su is found then it returns string script code to run
# bare command.
# It uses two arguments, first user and the second command to run.
# If the result string is assigned to foo it is used as:
# $ $foo user command
#
# first check sudo
which sudo > /dev/null 2>&1
if [ $? -eq 0 ]
then
func='f() { sudo -H -u $1 $2; }'
else
# if no sudo then check su
which su > /dev/null 2>&1
if [ $? -eq 0 ]
then
func='f() { su -c "$2" $1 ; }'
else
# if no sudo nor su then run bare command
func='f() { $2 ; }'
fi
fi
echo "eval '${func}' ; f "

View file

@ -17,11 +17,18 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# This explorer returns script code string for running a command with sudo.
# If no sudo is found then it returns empty string.
# It uses two arguments, first user and the second command to run.
# If the result string is assigned to foo it is used as:
# $ $foo user command
#
which sudo > /dev/null 2>&1 which sudo > /dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo yes sudo_func='f() { sudo -H -u $1 $2; }'
echo "eval '${sudo_func}' ; f "
else else
echo no echo ""
fi fi

View file

@ -45,42 +45,24 @@ runasparam="$__object/parameter/runas"
if [ -f "$runasparam" ] if [ -f "$runasparam" ]
then then
runas=$(cat "$runasparam") runas=$(cat "$runasparam")
has_sudo=$(cat "$__object/explorer/sudo") runas_cmd=$(cat "$__global/explorer/sucmd")
if [ "$has_sudo" = "yes" ]
then
runas_cmd="sudo"
else
has_su=$(cat "$__object/explorer/su")
if [ "$has_su" = "yes" ]
then
runas_cmd="su"
else
runas_cmd=""
fi
fi
else else
runas_cmd="" runas_cmd=""
fi fi
case "$state_should" in case "$state_should" in
present) present)
if [ "$runas_cmd" = "sudo" ] if [ "$runas_cmd" ]
then then
echo sudo -H -u $runas $pip install -q "$name" echo "$runas_cmd $runas \"$pip install -q $name\""
elif [ "$runas_cmd" = "su" ]
then
echo su $runas -c \"$pip install -q "$name"\"
else else
echo $pip install -q "$name" echo $pip install -q "$name"
fi fi
;; ;;
absent) absent)
if [ "$runas_cmd" = "sudo" ] if [ "$runas_cmd" ]
then then
echo sudo -H -u $runas $pip uninstall -q -y "$name" echo "$runas_cmd $runas \"$pip uninstall -q -y $name\""
elif [ "$runas_cmd" = "su" ]
then
echo su $runas -c \"$pip uninstall -q -y "$name"\"
else else
echo $pip uninstall -q -y "$name" echo $pip uninstall -q -y "$name"
fi fi