From e1f0ba522854e59dab64a5293ce290a95aa198df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Sun, 1 Jul 2018 11:15:39 +0200 Subject: [PATCH] Disabled display of commands as they risk leaking Travis OpenSSL key and IV, fixed typo --- travis-deploy-key-id_rsa.enc | Bin 1680 -> 1680 bytes utils/auto-push.sh | 9 ++------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/travis-deploy-key-id_rsa.enc b/travis-deploy-key-id_rsa.enc index 20cd2f06080fea06b5aad45e14a407ca6195ccdf..425a790c0cd8dbc009c855806e639a549d78f94c 100644 GIT binary patch literal 1680 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 a7?RhnJ<{Tt)PD`}awL~+WO^YZ6ij3-9xyBb diff --git a/utils/auto-push.sh b/utils/auto-push.sh index 3476d87..5c098b0 100755 --- a/utils/auto-push.sh +++ b/utils/auto-push.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -set +x +set +x # do not display any command, as they could contain the Travis openssl key and IV. usage() { echo "Usage: $0 official_repo deploy_repo deploy_branch deploy_base_commit key_iv_id deploy_directory" @@ -27,7 +27,7 @@ deploy_base_commit="$4" # branch name or tag key_iv_id="$5" # 123456789abc, part of encrypted_123456789abc_key and encrypted_123456789abc_iv deploy_directory="$6" # directory to copy on top of deploy_base_commit key_env_var_name="encrypted_${key_iv_id}_key" -iv_env_var_name="encrypted_${key_iv_id}_key" +iv_env_var_name="encrypted_${key_iv_id}_iv" key="$(sh -c 'echo "${'"$key_env_var_name"'}"')" iv="$(sh -c 'echo "${'"$iv_env_var_name"'}"')" @@ -42,7 +42,6 @@ elif test -z "${key:-}" -o -z "${iv:-}"; then elif test ! -e travis-deploy-key-id_rsa.enc; then echo "travis-deploy-key-id_rsa.enc not present, will not deploy to ${deploy_repo}:${deploy_branch}." else - set -x echo "Automatic push to ${deploy_repo}:${deploy_branch}" # Git configuration: @@ -52,7 +51,6 @@ else # SSH configuration mkdir -p ~/.ssh chmod 700 ~/.ssh - set +x if openssl aes-256-cbc -K "$key" -iv "$iv" -in travis-deploy-key-id_rsa.enc -out travis-deploy-key-id_rsa -d >/dev/null 2>&1; then echo "Decrypted key successfully." else @@ -60,11 +58,8 @@ else exit 1 fi mv travis-deploy-key-id_rsa ~/.ssh/travis-deploy-key-id_rsa - set -x chmod 600 ~/.ssh/travis-deploy-key-id_rsa - set +x eval `ssh-agent -s` - set -x ssh-add ~/.ssh/travis-deploy-key-id_rsa TRAVIS_GH_PAGES_DIR="$HOME/travis-temp-auto-push-$(date +%s)"