public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6732 from oconnorr/master

Browse Source 
Use mktemp to create temporary files to hold ssh host keys and authorized keys
This commit is contained in:
Wout Mertens
2015-06-02 20:34:43 +02:00
parent 0307c27219 29b7d76ec8
commit 0666ee4739
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/google-compute-image.nix
+29 -19
View File
@@ -137,40 +137,50 @@ in
after = [ "network-online.target" "ip-up.target" ]; after = [ "network-online.target" "ip-up.target" ];
wants = [ "network-online.target" "ip-up.target" ]; wants = [ "network-online.target" "ip-up.target" ];
script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'"; in script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'";
mktemp = "mktemp --tmpdir=/run"; in
'' ''
# When dealing with cryptographic keys, we want to keep things private. # When dealing with cryptographic keys, we want to keep things private.
umask 077 umask 077
# Don't download the SSH key if it has already been downloaded # Don't download the SSH key if it has already been downloaded
if ! [ -e /root/.ssh/authorized_keys ]; then if ! [ -s /root/.ssh/authorized_keys ]; then
echo "obtaining SSH key..." echo "obtaining SSH key..."
mkdir -m 0700 -p /root/.ssh mkdir -m 0700 -p /root/.ssh
${wget} -O /root/authorized-keys-metadata http://metadata.google.internal/0.1/meta-data/authorized-keys AUTH_KEYS=$(${mktemp})
if [ $? -eq 0 -a -e /root/authorized-keys-metadata ]; then ${wget} -O $AUTH_KEYS http://metadata.google.internal/0.1/meta-data/authorized-keys
cat /root/authorized-keys-metadata | cut -d: -f2- > /root/key.pub if [ -s $AUTH_KEYS ]; then
if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then KEY_PUB=$(${mktemp})
cat /root/key.pub >> /root/.ssh/authorized_keys cat $AUTH_KEYS | cut -d: -f2- > $KEY_PUB
echo "new key added to authorized_keys" if ! grep -q -f $KEY_PUB /root/.ssh/authorized_keys; then
fi cat $KEY_PUB >> /root/.ssh/authorized_keys
chmod 600 /root/.ssh/authorized_keys echo "New key added to authorized_keys."
fi fi
rm -f /root/key.pub /root/authorized-keys-metadata chmod 600 /root/.ssh/authorized_keys
rm -f $KEY_PUB
else
echo "Downloading http://metadata.google.internal/0.1/meta-data/authorized-keys failed."
false
fi
rm -f $AUTH_KEYS
fi fi
countKeys=0 countKeys=0
${flip concatMapStrings config.services.openssh.hostKeys (k : ${flip concatMapStrings config.services.openssh.hostKeys (k :
let kName = baseNameOf k.path; in '' let kName = baseNameOf k.path; in ''
PRIV_KEY=$(${mktemp})
echo "trying to obtain SSH private host key ${kName}" echo "trying to obtain SSH private host key ${kName}"
${wget} -O /root/${kName} http://metadata.google.internal/0.1/meta-data/attributes/${kName} && : ${wget} -O $PRIV_KEY http://metadata.google.internal/0.1/meta-data/attributes/${kName} && :
if [ $? -eq 0 -a -e /root/${kName} ]; then if [ $? -eq 0 -a -s $PRIV_KEY ]; then
countKeys=$((countKeys+1)) countKeys=$((countKeys+1))
mv -f /root/${kName} ${k.path} mv -f $PRIV_KEY ${k.path}
echo "downloaded ${k.path}" echo "Downloaded ${k.path}"
chmod 600 ${k.path} chmod 600 ${k.path}
${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub ${config.programs.ssh.package}/bin/ssh-keygen -y -f ${k.path} > ${k.path}.pub
chmod 644 ${k.path}.pub chmod 644 ${k.path}.pub
else
echo "Downloading http://metadata.google.internal/0.1/meta-data/attributes/${kName} failed."
fi fi
rm -f /root/${kName} rm -f $PRIV_KEY
'' ''
)} )}