Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use upstream rustup init script download workaround for old curl version on CentOS6 #7619

Merged
merged 4 commits into from Apr 28, 2019
Merged

use upstream rustup init script download workaround for old curl version on CentOS6 #7619

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e5b819
test rustup init script fix
cosmicexplorer Apr 24, 2019
6b765bb
simplify rustup init after upstream fix
cosmicexplorer Apr 25, 2019
4fc5222
add more context about --proto workaround
cosmicexplorer Apr 27, 2019
d2b3ce1
add TODO to use more secure version of rustup after migration to centos7
cosmicexplorer Apr 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 7 additions & 31 deletions build-support/bin/native/bootstrap_rust.sh
View file
Open in desktop
Expand Up @@ -17,28 +17,6 @@ function cargo_bin() {
"${RUSTUP}" which cargo
}

# TODO(7288): RustUp tries to use a more secure protocol to avoid downgrade attacks. This, however,
# broke support for Centos6 (https://github.com/rust-lang/rustup.rs/issues/1794). So, we first try
# to use their recommend install, and downgrade to their workaround if necessary.
function curl_rustup_init_script_while_maybe_downgrading() {
if ! curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs; then
log "Initial 'curl' command failed, trying backup url..."
case "$(uname)" in
Darwin)
host_triple='x86_64-apple-darwin'
;;
Linux)
host_triple='x86_64-unknown-linux-gnu'
;;
*)
die "unrecognized platform $(uname) -- could not bootstrap rustup!"
;;
esac
full_rustup_backup_url="https://static.rust-lang.org/rustup/dist/${host_triple}/rustup-init"
curl -sSf "$full_rustup_backup_url"
fi
}

function bootstrap_rust() {
RUST_TOOLCHAIN="$(cat ${REPO_ROOT}/rust-toolchain)"
RUST_COMPONENTS=(
Expand All @@ -49,17 +27,15 @@ function bootstrap_rust() {

# Control a pants-specific rust toolchain.
if [[ ! -x "${RUSTUP}" ]]; then
# NB: rustup installs itself into CARGO_HOME, but fetches toolchains into RUSTUP_HOME.
log "A pants owned rustup installation could not be found, installing via the instructions at" \
"https://www.rustup.rs ..."
local -r rustup_tmp_dir="$(mktemp -d)"
trap "rm -rf ${rustup_tmp_dir}" EXIT
# NB: The downloaded file here *must* be named `rustup-init`, or the workaround binary fails
# with "info: caused by: No such file or directory (os error 2)".
local -r rustup_init_destination="${rustup_tmp_dir}/rustup-init"
# NB: rustup installs itself into CARGO_HOME, but fetches toolchains into RUSTUP_HOME.
curl_rustup_init_script_while_maybe_downgrading > "$rustup_init_destination"
chmod +x "$rustup_init_destination"
"$rustup_init_destination" -y --no-modify-path --default-toolchain none 1>&2
# This is the recommended installation method for Unix when '--proto' is not available on curl
# (as in CentOS6), see # https://github.com/rust-lang/rustup.rs#other-installation-methods.
# The workaround was added in https://github.com/rust-lang/rustup.rs/pull/1803.
cosmicexplorer marked this conversation as resolved.
Show resolved Hide resolved
# TODO(7288): Once we migrate to Centos7, we can go back to using RustUp's preferred and more
# secure installation method. Convert this to the snippet from https://rustup.rs.
curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain none 1>&2
fi

local -r cargo="${CARGO_HOME}/bin/cargo"
Expand Down