From 12ac051e8f0bcece6fb4efbf085f4c590812ec2a Mon Sep 17 00:00:00 2001 From: Hanjo Meinhardt Date: Sat, 27 Jan 2018 14:20:10 +0100 Subject: [PATCH] correct secret handling --- sendxmpp.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sendxmpp.sh b/sendxmpp.sh index 4641bad..90e2423 100644 --- a/sendxmpp.sh +++ b/sendxmpp.sh @@ -1,14 +1,14 @@ #!/bin/sh -[ -n PLUGIN_USERNAME ] && PLUGIN_USERNAME="${SENDXMPP_USERNAME}" -[ -n PLUGIN_PASSWORD ] && PLUGIN_PASSWORD="${SENDXMPP_PASSWORD}" +# set username from secret if not supplied +[ -z $PLUGIN_USERNAME ] && [ -n $SENDXMPP_USERNAME ] && PLUGIN_USERNAME="${SENDXMPP_USERNAME}" +[ -z $PLUGIN_PASSWORD ] && [ -n $SENDXMPP_PASSWORD ] && PLUGIN_PASSWORD="${SENDXMPP_PASSWORD}" -: ${PLUGIN_USERNAME?"missing username"} -: ${PLUGIN_JSERVER?"missing jserver"} -: ${PLUGIN_PASSWORD?"missing password"} -: ${PLUGIN_RECIPIENT?"missing recipient"} - -env | grep DRONE +# check if all required fields are set +[ -z "$PLUGIN_USERNAME" ] && echo "missing password or sendxmpp_password secret" && exit 1 +[ -z "$PLUGIN_PASSWORD" ] && echo "missing username or sendxmpp_username secret" && exit 1 +[ -z "$PLUGIN_JSERVER" ] && echo "missing jserver" && exit 1 +[ -z "$PLUGIN_RECIPIENT" ] && echo "missing recipient" && exit 1 MSG="drone ist da" @@ -21,4 +21,6 @@ CMD="sendxmpp \ --no-tls-verify ${PLUGIN_RECIPIENT}" +env | grep "DRONE_" + echo $MSG | $CMD