mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
tools: Various fixes to set guest sshkeys script
The script would for example overwrite all existing keys in the authorized_keys file Some things in the bash script are also simplified
This commit is contained in:
parent
37874a3fa8
commit
6f244f3eac
@ -31,21 +31,17 @@ DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/*"
|
|||||||
keys_received=0
|
keys_received=0
|
||||||
file_count=0
|
file_count=0
|
||||||
|
|
||||||
for DHCP_FILE in $DHCP_FOLDERS
|
for DHCP_FILE in $DHCP_FOLDERS; do
|
||||||
do
|
if [ -f $DHCP_FILE ]; then
|
||||||
if [ -f $DHCP_FILE ]
|
|
||||||
then
|
|
||||||
file_count=$((file_count+1))
|
file_count=$((file_count+1))
|
||||||
SSHKEY_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;')
|
SSHKEY_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;')
|
||||||
|
|
||||||
if [ -n "$SSHKEY_SERVER_IP" ]
|
if [ -n "$SSHKEY_SERVER_IP" ]; then
|
||||||
then
|
|
||||||
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
||||||
|
|
||||||
publickey=$(wget -t 3 -T 20 -O - http://$SSHKEY_SERVER_IP/latest/public-keys 2>/dev/null)
|
publickey=$(wget -q -t 3 -T 20 -O - http://$SSHKEY_SERVER_IP/latest/public-keys)
|
||||||
|
|
||||||
if [ $? -eq 0 ]
|
if [ $? -eq 0 ]; then
|
||||||
then
|
|
||||||
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
||||||
keys_received=1
|
keys_received=1
|
||||||
break
|
break
|
||||||
@ -56,11 +52,10 @@ do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$keys_received" == "0" ]
|
if [ "$keys_received" == "0" ]; then
|
||||||
then
|
|
||||||
SSHKEY_SERVER_IP=$(nslookup data-server | grep Address |tr '\n' ' '| awk '{print $4}')
|
SSHKEY_SERVER_IP=$(nslookup data-server | grep Address |tr '\n' ' '| awk '{print $4}')
|
||||||
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
logger -t "cloud" "Sending request to ssh key server at $SSHKEY_SERVER_IP"
|
||||||
publickey=$(wget -t 3 -T 20 -O - http://data-server/latest/public-keys 2>/dev/null)
|
publickey=$(wget -q -t 3 -T 20 -O - http://data-server/latest/public-keys)
|
||||||
if [ $? -eq 0 ]
|
if [ $? -eq 0 ]
|
||||||
then
|
then
|
||||||
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP"
|
||||||
@ -70,39 +65,33 @@ then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# did we find the keys anywhere?
|
if [ "$keys_received" == "0" ]; then
|
||||||
if [ "$keys_received" == "0" ]
|
|
||||||
then
|
|
||||||
logger -t "cloud" "Failed to get ssh keys from any server"
|
logger -t "cloud" "Failed to get ssh keys from any server"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -z "$publickey" ]; then
|
||||||
|
logger -t "cloud" "Did not receive any keys from any server"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# set ssh public key
|
|
||||||
homedir=$(grep ^$user /etc/passwd|awk -F ":" '{print $6}')
|
homedir=$(grep ^$user /etc/passwd|awk -F ":" '{print $6}')
|
||||||
sshdir=$homedir/.ssh
|
sshdir=$homedir/.ssh
|
||||||
authorized=$sshdir/authorized_keys
|
authorized=$sshdir/authorized_keys
|
||||||
restorecon=/sbin/restorecon
|
|
||||||
|
|
||||||
|
if [ ! -e $sshdir ]; then
|
||||||
if [ ! -e $sshdir ]
|
|
||||||
then
|
|
||||||
mkdir $sshdir
|
mkdir $sshdir
|
||||||
|
chmod 700 $sshdir
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e $authorized ]
|
if [ ! -e $authorized ]; then
|
||||||
then
|
|
||||||
touch $authorized
|
touch $authorized
|
||||||
|
chmod 600 $authorized
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat $authorized|grep -v "$publickey" > $authorized
|
cat $authorized|grep -v "$publickey"|tee $authorized > /dev/null
|
||||||
echo "$publickey" >> $authorized
|
echo "$publickey" >> $authorized
|
||||||
|
|
||||||
if [ -e $restorecon ]
|
which restorecon && restorecon -R -v $sshdir
|
||||||
then
|
|
||||||
$restorecon -R -v $sshdir
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user