X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/6c822b07513496b5a7243331733f6fe570d79fa8..465e9b7cfea1879d459562f1e64da5a9ae5df7d8:/files/usr/sbin/remctl-update.sh

diff --git a/files/usr/sbin/remctl-update.sh b/files/usr/sbin/remctl-update.sh
index 7b205bf..f0254b9 100755
--- a/files/usr/sbin/remctl-update.sh
+++ b/files/usr/sbin/remctl-update.sh
@@ -46,6 +46,15 @@ update_moiragroup()
     rm -f "$MOIRATMP"
 }
 
+check_machine_name()
+{
+    machinename="$1"
+    if ! perl -0e 'exit($ARGV[0] !~ /^[A-Za-z0-9][A-Za-z0-9._-]*$/)' -- "$machinename"; then
+	echo "Bad machine name"
+	exit 1
+    fi
+}
+
 case "$1" in
     moiragroup)
 	update_moiragroup "$2"
@@ -76,6 +85,7 @@ case "$1" in
 	;;
     unregister)
 	machine="$2"
+	check_machine_name "$machine"
 	rm -f "$ACLDIR"/"$machine"
 	rm -f "$MACHINEDIR"/"$machine"
 	"$0" web
@@ -83,20 +93,15 @@ case "$1" in
     moveregister)
         oldmachine="$2"
         newmachine="$3"
+	check_machine_name "$oldmachine"
+	check_machine_name "$newmachine"
         mv "$ACLDIR"/"$oldmachine" "$ACLDIR"/"$newmachine"
         rm -f "$MACHINEDIR"/"$oldmachine"
         "$0" web
 	;;
     register)
 	machine="$2"
-	if [ "$machine" == "Domain-0" ]; then
-	    echo "No, you can't control Domain 0"
-	    exit 1
-	fi
-	if [ -e /etc/xen/"$machine" ]; then
-	    echo "Machine already exists outside database"
-	    exit 1
-	fi
+	check_machine_name "$machine"
 	if [ -e "$ACLDIR"/"$machine" ]; then
 	    echo "Machine already registered"
 	    exit 1