shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

libvirt-guest.init: quoting variables

Browse Source 
At least protect the $uri variable against further expansion by properly
quoting it. While doing that, also quote all other variables to protect
against shell meta characters.

Signed-off-by: Philipp Hahn <hahn@univention.de>
This commit is contained in:
Philipp Hahn 2011-03-09 09:54:57 +01:00 committed by Eric Blake
parent c0c074c3aa
commit fff4682965
1 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
tools/libvirt-guests.init.sh
View File

@ -66,12 +66,10 @@ run_virsh() {
shift shift
if [ "x$uri" = xdefault ]; then if [ "x$uri" = xdefault ]; then
conn= virsh "$@" </dev/null
else else
conn="-c $uri" virsh -c "$uri" "$@" </dev/null
fi fi
virsh $conn "$@" </dev/null
} }
run_virsh_c() { run_virsh_c() {
@ -81,7 +79,7 @@ run_virsh_c() {
list_guests() { list_guests() {
uri=$1 uri=$1
list=$(run_virsh_c $uri list) list=$(run_virsh_c "$uri" list)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
RETVAL=1 RETVAL=1
return 1 return 1
@ -89,7 +87,7 @@ list_guests() {
uuids= uuids=
for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do
uuid=$(run_virsh_c $uri dominfo $id | awk '/^UUID:/{print $2}') uuid=$(run_virsh_c "$uri" dominfo "$id" | awk '/^UUID:/{print $2}')
if [ -z "$uuid" ]; then if [ -z "$uuid" ]; then
RETVAL=1 RETVAL=1
return 1 return 1
@ -104,7 +102,7 @@ guest_name() {
uri=$1 uri=$1
uuid=$2 uuid=$2
name=$(run_virsh_c $uri dominfo $uuid 2>/dev/null | \ name=$(run_virsh_c "$uri" dominfo "$uuid" 2>/dev/null | \
sed -ne 's/^Name: *//p') sed -ne 's/^Name: *//p')
[ -n "$name" ] || name=$uuid [ -n "$name" ] || name=$uuid
@ -116,7 +114,7 @@ guest_is_on() {
uuid=$2 uuid=$2
guest_running=false guest_running=false
info=$(run_virsh_c $uri dominfo $uuid) info=$(run_virsh_c "$uri" dominfo "$uuid")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
RETVAL=1 RETVAL=1
return 1 return 1
@ -146,25 +144,25 @@ start() {
while read uri list; do while read uri list; do
configured=false configured=false
for confuri in $URIS; do for confuri in $URIS; do
if [ $confuri = $uri ]; then if [ "x$confuri" = "x$uri" ]; then
configured=true configured=true
break break
fi fi
done done
if ! $configured; then if ! "$configured"; then
eval_gettext "Ignoring guests on \$uri URI"; echo eval_gettext "Ignoring guests on \$uri URI"; echo
continue continue
fi fi
eval_gettext "Resuming guests on \$uri URI..."; echo eval_gettext "Resuming guests on \$uri URI..."; echo
for guest in $list; do for guest in $list; do
name=$(guest_name $uri $guest) name=$(guest_name "$uri" "$guest")
eval_gettext "Resuming guest \$name: " eval_gettext "Resuming guest \$name: "
if guest_is_on $uri $guest; then if guest_is_on "$uri" "$guest"; then
if $guest_running; then if "$guest_running"; then
gettext "already active"; echo gettext "already active"; echo
else else
retval run_virsh $uri start "$guest" >/dev/null && \ retval run_virsh "$uri" start "$name" >/dev/null && \
gettext "done"; echo gettext "done"; echo
fi fi
fi fi
@ -180,15 +178,15 @@ suspend_guest()
uri=$1 uri=$1
guest=$2 guest=$2
name=$(guest_name $uri $guest) name=$(guest_name "$uri" "$guest")
label=$(eval_gettext "Suspending \$name: ") label=$(eval_gettext "Suspending \$name: ")
printf %s "$label" printf %s "$label"
run_virsh $uri managedsave $guest >/dev/null & run_virsh "$uri" managedsave "$guest" >/dev/null &
virsh_pid=$! virsh_pid=$!
while true; do while true; do
sleep 1 sleep 1
kill -0 $virsh_pid >/dev/null 2>&1 || break kill -0 "$virsh_pid" >/dev/null 2>&1 || break
progress=$(run_virsh_c $uri domjobinfo $guest 2>/dev/null | \ progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \
awk '/^Data processed:/{print $3, $4}') awk '/^Data processed:/{print $3, $4}')
if [ -n "$progress" ]; then if [ -n "$progress" ]; then
printf '\r%s%12s ' "$label" "$progress" printf '\r%s%12s ' "$label" "$progress"
@ -196,7 +194,7 @@ suspend_guest()
printf '\r%s%-12s ' "$label" "..." printf '\r%s%-12s ' "$label" "..."
fi fi
done done
retval wait $virsh_pid && printf '\r%s%-12s\n' "$label" "$(gettext "done")" retval wait "$virsh_pid" && printf '\r%s%-12s\n' "$label" "$(gettext "done")"
} }
shutdown_guest() shutdown_guest()
@ -204,21 +202,21 @@ shutdown_guest()
uri=$1 uri=$1
guest=$2 guest=$2
name=$(guest_name $uri $guest) name=$(guest_name "$uri" "$guest")
label=$(eval_gettext "Shutting down \$name: ") label=$(eval_gettext "Shutting down \$name: ")
printf %s "$label" printf %s "$label"
retval run_virsh $uri shutdown $guest >/dev/null || return retval run_virsh "$uri" shutdown "$guest" >/dev/null || return
timeout=$SHUTDOWN_TIMEOUT timeout=$SHUTDOWN_TIMEOUT
while [ $timeout -gt 0 ]; do while [ "$timeout" -gt 0 ]; do
sleep 1 sleep 1
timeout=$((timeout - 1)) timeout=$((timeout - 1))
guest_is_on $uri $guest || return guest_is_on "$uri" "$guest" || return
$guest_running || break "$guest_running" || break
printf '\r%s%-12d ' "$label" $timeout printf '\r%s%-12d ' "$label" "$timeout"
done done
if guest_is_on $uri $guest; then if guest_is_on "$uri" "$guest"; then
if $guest_running; then if "$guest_running"; then
printf '\r%s%-12s\n' "$label" \ printf '\r%s%-12s\n' "$label" \
"$(gettext "failed to shutdown in time")" "$(gettext "failed to shutdown in time")"
else else
@ -251,35 +249,35 @@ stop() {
continue continue
fi fi
list=$(list_guests $uri) list=$(list_guests "$uri")
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
empty=true empty=true
for uuid in $list; do for uuid in $list; do
$empty || printf ", " "$empty" || printf ", "
printf %s "$(guest_name $uri $uuid)" printf %s "$(guest_name "$uri" "$uuid")"
empty=false empty=false
done done
if $empty; then if "$empty"; then
gettext "no running guests."; echo gettext "no running guests."; echo
else else
echo echo
echo $uri $list >>"$LISTFILE" echo "$uri" "$list" >>"$LISTFILE"
fi fi
fi fi
done done
while read uri list; do while read uri list; do
if $suspending; then if "$suspending"; then
eval_gettext "Suspending guests on \$uri URI..."; echo eval_gettext "Suspending guests on \$uri URI..."; echo
else else
eval_gettext "Shutting down guests on \$uri URI..."; echo eval_gettext "Shutting down guests on \$uri URI..."; echo
fi fi
for guest in $list; do for guest in $list; do
if $suspending; then if "$suspending"; then
suspend_guest $uri $guest suspend_guest "$uri" "$guest"
else else
shutdown_guest $uri $guest shutdown_guest "$uri" "$guest"
fi fi
done done
done <"$LISTFILE" done <"$LISTFILE"
@ -290,7 +288,7 @@ stop() {
gueststatus() { gueststatus() {
for uri in $URIS; do for uri in $URIS; do
echo "* $uri URI:" echo "* $uri URI:"
retval run_virsh $uri list || echo retval run_virsh "$uri" list || echo
done done
} }
@ -330,7 +328,7 @@ case "$1" in
usage 0 usage 0
;; ;;
start|stop|gueststatus) start|stop|gueststatus)
$1 "$1"
;; ;;
restart) restart)
stop && start stop && start