Skip to content

Commit

Permalink
Don't leak GitHub tokens during network failures
Browse files Browse the repository at this point in the history
If git is unable to resolve the repo address (which includes the token),
it will print a message to stderr with the path to the repo, thus
leaking the token. Avoid doing this, and also suppress stdout to be
extra careful.
  • Loading branch information
aneeshusa committed Oct 4, 2016
1 parent 76a8bd9 commit 630b523
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions etc/ci/update_brew.sh
Expand Up @@ -16,7 +16,6 @@ PACKAGENAME=$(basename ${PACKAGEPATH})
REGEX="s/servo-.*\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\).tar.gz/\1.\2.\3/p"
VERSION=$(echo ${PACKAGENAME}| sed -n "${REGEX}")
SHA=$(shasum -a 256 ${PACKAGEPATH} | sed -e 's/ .*//')
GIT="https://${TOKEN}@github.com/servo/homebrew-servo.git"

# See upload_nightly.sh
PACKAGEURL="https://download.servo.org/nightly/macbrew/${PACKAGENAME}"
Expand All @@ -31,7 +30,7 @@ cd ${TMP_DIR}
echo ${TMP_DIR}

echo "Cloning"
git clone ${GIT}
git clone https://github.com/servo/homebrew-servo.git
cd homebrew-servo

# Not using "/" as it's used in PACKAGEURL
Expand All @@ -43,5 +42,7 @@ cat ${SCRIPTDIR}/servo-binary-formula.rb.in | sed \
git add ./Formula/servo-bin.rb
git commit -m "Version bump: ${VERSION}"

git push -q ${GIT} master
git push -qf \
"https://${TOKEN}@github.com/servo/homebrew-servo.git" master \
>/dev/null 2>&1
rm -rf ${TMP_DIR}
4 changes: 3 additions & 1 deletion etc/ci/upload_docs.sh
Expand Up @@ -27,4 +27,6 @@ cp apis.html ../../target/doc/servo/
cd ../..

ghp-import -n target/doc
git push -qf "https://${TOKEN}@github.com/servo/doc.servo.org.git" gh-pages
git push -qf \
"https://${TOKEN}@github.com/servo/doc.servo.org.git" gh-pages \
>/dev/null 2>&1

0 comments on commit 630b523

Please sign in to comment.