From 37874a3fa86e1e644bf1ff1353d3504025a19ebf Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@widodh.nl>
Date: Tue, 27 May 2014 11:36:20 +0200
Subject: [PATCH] tools: Various fixes to password set script

The exit status of wget was not checked properly since it would
check the exit status of the 'echo' command.

Also fix some indentation in the script and remove whitespace
---
 setup/bindir/cloud-set-guest-password.in | 86 +++++++++++-------------
 1 file changed, 39 insertions(+), 47 deletions(-)

diff --git a/setup/bindir/cloud-set-guest-password.in b/setup/bindir/cloud-set-guest-password.in
index 321589466c4..4c7c57577ff 100755
--- a/setup/bindir/cloud-set-guest-password.in
+++ b/setup/bindir/cloud-set-guest-password.in
@@ -12,9 +12,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,49 +28,46 @@ user=root
 
 # Add your DHCP lease folders here
 DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/* /var/lib/dhcp/*"
+PASSWORD_SERVER_PORT=8080
 password_received=0
 file_count=0
 error_count=0
 
-for DHCP_FILE in $DHCP_FOLDERS
-do
-	if [ -f $DHCP_FILE ]
-	then
+for DHCP_FILE in $DHCP_FOLDERS; do
+	if [ -f $DHCP_FILE ]; then
 		file_count=$((file_count+1))
 		PASSWORD_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;')
 
-		if [ -n "$PASSWORD_SERVER_IP" ]
-		then
+		if [ -n "$PASSWORD_SERVER_IP" ]; then
 			logger -t "cloud" "Found password server IP $PASSWORD_SERVER_IP in $DHCP_FILE"
 			logger -t "cloud" "Sending request to password server at $PASSWORD_SERVER_IP"
-			password=$(wget -q -t 3 -T 20 -O - --header "DomU_Request: send_my_password" $PASSWORD_SERVER_IP:8080)
-			password=$(echo $password | tr -d '\r')
 
-			if [ $? -eq 0 ]
-			then
+			password=$(wget -q -t 3 -T 20 -O - --header "DomU_Request: send_my_password" $PASSWORD_SERVER_IP:$PASSWORD_SERVER_PORT)
+
+			if [ $? -eq 0 ]; then
+				password=$(echo $password | tr -d '\r')
 				logger -t "cloud" "Got response from server at $PASSWORD_SERVER_IP"
 
 				case $password in
-				
-				"")					logger -t "cloud" "Password server at $PASSWORD_SERVER_IP did not have any password for the VM"
-									continue
-									;;
-				
-				"bad_request")		logger -t "cloud" "VM sent an invalid request to password server at $PASSWORD_SERVER_IP"
-									error_count=$((error_count+1))
-									continue
-									;;
-									
-				"saved_password") 	logger -t "cloud" "VM has already saved a password from the password server at $PASSWORD_SERVER_IP"
-									continue
-									;;
-									
-				*)					logger -t "cloud" "VM got a valid password from server at $PASSWORD_SERVER_IP"
-									password_received=1
-									break
-									;;
-									
-				esac
+					"")
+						logger -t "cloud" "Password server at $PASSWORD_SERVER_IP did not have any password for the VM"
+						continue
+						;;
+					"bad_request")
+						logger -t "cloud" "VM sent an invalid request to password server at $PASSWORD_SERVER_IP"
+						error_count=$((error_count+1))
+						continue
+						;;
+					"saved_password")
+				 		logger -t "cloud" "VM has already saved a password from the password server at $PASSWORD_SERVER_IP"
+						continue
+						;;
+					*)
+						logger -t "cloud" "VM got a valid password from server at $PASSWORD_SERVER_IP"
+						password_received=1
+						break
+						;;
+					esac
 			else
 				logger -t "cloud" "Failed to send request to password server at $PASSWORD_SERVER_IP"
 				error_count=$((error_count+1))
@@ -82,10 +79,8 @@ do
 	fi
 done
 
-if [ "$password_received" == "0" ]
-then
-	if [ "$error_count" == "$file_count" ]
-	then
+if [ "$password_received" == "0" ]; then
+	if [ "$error_count" == "$file_count" ]; then
 		logger -t "cloud" "Failed to get password from any server"
 		exit 1
 	else
@@ -94,23 +89,20 @@ then
 	fi
 fi
 
-logger -t "cloud" "Changing password ..."
+logger -t "cloud" "Changing password for user $user"
 echo $user:$password | chpasswd
-						
-if [ $? -gt 0 ]
-then
+
+if [ $? -gt 0 ]; then
 	usermod -p `mkpasswd -m SHA-512 $password` $user
-		
-	if [ $? -gt 0 ]
-	then
+
+	if [ $? -gt 0 ]; then
 		logger -t "cloud" "Failed to change password for user $user"
 		exit 1
 	else
 		logger -t "cloud" "Successfully changed password for user $user"
 	fi
 fi
-						
-logger -t "cloud" "Sending acknowledgment to password server at $PASSWORD_SERVER_IP"
-wget -t 3 -T 20 -O - --header "DomU_Request: saved_password" $PASSWORD_SERVER_IP:8080
-exit 0
 
+logger -t "cloud" "Sending acknowledgment to password server at $PASSWORD_SERVER_IP"
+wget -q -t 3 -T 20 -O - --header "DomU_Request: saved_password" $PASSWORD_SERVER_IP:$PASSWORD_SERVER_PORT
+exit 0