diff --git a/utils/cranspasswords b/utils/cranspasswords index 6e35c169..0dd7f115 100644 --- a/utils/cranspasswords +++ b/utils/cranspasswords @@ -23,8 +23,8 @@ SRV=vert.adm.crans.org REP=/root -TMP=`if which tempfile &> /dev/null; then tempfile -m 600; else mktemp -t cranspasswords.XXXX; fi` -trap "rm -f ${TMP} ${TMP}.asc" EXIT +TMP=`if which tempfile &> /dev/null; then tempfile -m 600; else mktemp; fi` +#trap "rm -f ${TMP} ${TMP}.asc" EXIT ############################################################################## # parsage des arguments @@ -69,7 +69,7 @@ function dechiffre () { ssh ${SRV} -t "sudo -p 'Mot de passe sudo : ' echo -n" 2> /dev/null echo echo -e "\033[1;34mRécupération du fichier et déchifrage\033[1;0m" - ssh ${SRV} "sudo cat ${REP}/$CHOIX.asc 2> /dev/null" | gpg --decrypt 2> /dev/null > ${TMP} + ssh ${SRV} "sudo cat ${REP}/$CHOIX.asc" | gpg --decrypt > ${TMP} echo } @@ -78,34 +78,36 @@ function chiffre () { echo -e "\033[1;34mChiffrage et envoi sur ${SRV}\033[1;0m" if [[ ! -s ${TMP} ]] ; then echo -e "\033[1;31mFichier vide, abandon...\033[1;0m" - exit 1 + return fi - RECIPIENTS=$(while read a b c; do echo -n "--recipient $c "; done << EOF + full_rec=( + xavier.lagorce@crans.org # 0BF3708E + jdimino@dptinfo.ens-cachan.fr # 2127F85A + alexandre@alexandre-bos.fr # 3603EFD9 + parret-freaud@crans.org # 7D980513 + adg@crans.org # 8E96ACDA + dandrimont@crans.org # 9AA56A6D + bruot@crans.org # A8A4F83E + blockelet@crans.org # AF087A52 + Bobot@crans.org # B7B4AEA6 + vincent.thomas@crans.org # C5C4ACC0 + carlos@crans.org # D6ADFD5A + olivier.huber@crans.org # E0DCF376 + pierre.chambart@crans.org # F2530FCE + Stephane.Glondu@crans.org # FCE03DAA + ) + count=${#full_rec[@]} + RECIPIENTS=$(index=0; while [ "$index" -lt "$count" ]; do echo -n "-r "; echo -n ${full_rec[$index]}; echo -n " "; ((index++)); done) + yes | gpg --armor --encrypt ${RECIPIENTS} ${TMP} + # 6D1DF0FA pauget@crans.org - # BD156CC4 dubost@crans.org - # 98E76332 etienne.chove@crans.org # 4EF9E1D1 xavier.pessoles@crans.org # F22A794E Vincent.Bernat@crans.org # FBFA4781 Nicolas.Stransky@crans.org - # FCE03DAA Stephane.Glondu@crans.org - # B7B4AEA6 Bobot@crans.org - # 7D980513 parret-freaud@crans.org - # CDF91D96 cohen@crans.org # 81DDB065 gregoire.detrez@crans.org - # 3603EFD9 alexandre@alexandre-bos.fr - # 9132B8AB jeremie@dimino.org - # C5C4ACC0 vincent.thomas@crans.org - # F2530FCE pierre.chambart@crans.org - # D6ADFD5A carlos@crans.org - # 9AA56A6D dandrimont@crans.org - # 8E96ACDA adg@crans.org - # AF087A52 blockelet@crans.org - # 0BF3708E Xavier.Lagorce@crans.org - # E0DCF376 olivier.huber@crans.org -EOF -) - gpg --armor --encrypt ${RECIPIENTS} ${TMP} - + # 98E76332 etienne.chove@crans.org + # BD156CC4 dubost@crans.org + # CDF91D96 cohen@crans.org [[ "$#" == "0" ]] && ssh ${SRV} "sudo sh -c \"cat > ${REP}/${CHOIX}.asc\"" < ${TMP}.asc || echo -e "\033[1;31mErreur, abandon...\033[1;0m" }