Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 623DA10B5E for ; Tue, 27 May 2014 10:18:08 +0000 (UTC) Received: (qmail 50598 invoked by uid 500); 27 May 2014 10:18:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 50566 invoked by uid 500); 27 May 2014 10:18:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 50559 invoked by uid 99); 27 May 2014 10:18:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 10:18:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E23999A6910; Tue, 27 May 2014 10:18:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Tue, 27 May 2014 10:18:07 -0000 Message-Id: <648775794a6f4a9a8c5e5d7d64b58880@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 6f244f3 Repository: cloudstack Updated Branches: refs/heads/master 19668713e -> 6f244f3ea 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f244f3e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f244f3e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f244f3e Branch: refs/heads/master Commit: 6f244f3eac5201bef26c29e57f316378aed18953 Parents: 37874a3 Author: Wido den Hollander Authored: Tue May 27 12:16:54 2014 +0200 Committer: Wido den Hollander Committed: Tue May 27 12:17:45 2014 +0200 ---------------------------------------------------------------------- setup/bindir/cloud-set-guest-sshkey.in | 55 ++++++++++++----------------- 1 file changed, 22 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f244f3e/setup/bindir/cloud-set-guest-sshkey.in ---------------------------------------------------------------------- diff --git a/setup/bindir/cloud-set-guest-sshkey.in b/setup/bindir/cloud-set-guest-sshkey.in index 68a209f..4955dea 100755 --- a/setup/bindir/cloud-set-guest-sshkey.in +++ b/setup/bindir/cloud-set-guest-sshkey.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # # Init file for SSH Public Keys Download Client # @@ -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 @@ -31,21 +31,17 @@ DHCP_FOLDERS="/var/lib/dhclient/* /var/lib/dhcp3/*" keys_received=0 file_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)) SSHKEY_SERVER_IP=$(grep dhcp-server-identifier $DHCP_FILE | tail -1 | awk '{print $NF}' | tr -d '\;') - if [ -n "$SSHKEY_SERVER_IP" ] - then + if [ -n "$SSHKEY_SERVER_IP" ]; then 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 ] - then + if [ $? -eq 0 ]; then logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP" keys_received=1 break @@ -56,11 +52,10 @@ do fi done -if [ "$keys_received" == "0" ] -then +if [ "$keys_received" == "0" ]; then 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" - 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 ] then logger -t "cloud" "Got response from server at $SSHKEY_SERVER_IP" @@ -70,39 +65,33 @@ then 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" exit 1 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}') sshdir=$homedir/.ssh authorized=$sshdir/authorized_keys -restorecon=/sbin/restorecon - -if [ ! -e $sshdir ] -then +if [ ! -e $sshdir ]; then mkdir $sshdir + chmod 700 $sshdir fi -if [ ! -e $authorized ] -then +if [ ! -e $authorized ]; then touch $authorized + chmod 600 $authorized fi -cat $authorized|grep -v "$publickey" > $authorized +cat $authorized|grep -v "$publickey"|tee $authorized > /dev/null echo "$publickey" >> $authorized -if [ -e $restorecon ] -then - $restorecon -R -v $sshdir -fi - -exit 0 +which restorecon && restorecon -R -v $sshdir +exit 0 \ No newline at end of file