Skip to content

pipelines/git,fetch: obscure half of found git commit and sha to avoid copy pasting #2458

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

Open
vishal-chdhry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pipelines/git,fetch: obscure half of found git commit and sha to avoid copy pasting #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions pkg/build/pipelines/fetch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,32 @@ pipeline:
wget '-T${{inputs.timeout}}' '--dns-timeout=${{inputs.dns-timeout}}' '--tries=${{inputs.retry-limit}}' --random-wait --retry-connrefused --continue '${{inputs.uri}}'
fi

# Obscure the second half of a string with asterisks
obscure_half() {
local s="$1" len half
len=${#s}
half=$((len / 2))
prefix=$(echo "$s" | cut -c1-"$half")
suffix=$(echo "$s" | cut -c$((half + 1))-"$len" | sed 's/./*/g')
echo "${prefix}${suffix}"
}

if [ "${{inputs.expected-none}}" != "" ]; then
printf "fetch: Checksum validation skipped\n"
elif [ "${{inputs.expected-sha256}}" != "" ]; then
printf "fetch: Expected sha256: ${{inputs.expected-sha256}}\n"
sum=$(sha256sum $bn | awk '{print $1}')
if [ "${{inputs.expected-sha256}}" != "$sum" ]; then
printf "fetch: Expected sha256 does not match found: $sum\n"
obs_sum=$(obscure_half "$sum")
printf "fetch: Expected sha256 does not match found: $obs_sum\n"
exit 1
fi
else
printf "fetch: Expected sha512: ${{inputs.expected-sha512}}\n"
sum=$(sha512sum $bn | awk '{print $1}')
if [ "${{inputs.expected-sha512}}" != "$sum" ]; then
printf "fetch: Expected sha512 does not match found: $sum\n"
obs_sum=$(obscure_half "$sum")
printf "fetch: Expected sha512 does not match found: $obs_sum\n"
exit 1
fi
fi
Expand Down
26 changes: 19 additions & 7 deletions pkg/build/pipelines/git-checkout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ pipeline:
fail() { msg FAIL "$@"; exit 1; }
vr() { msg "execute:" "$@"; "$@"; }

# Obscure the second half of a string with asterisks
obscure_half() {
local s="$1" len half
len=${#s}
half=$((len / 2))
prefix=$(echo "$s" | cut -c1-"$half")
suffix=$(echo "$s" | cut -c$((half + 1))-"$len" | sed 's/./*/g')
echo "${prefix}${suffix}"
}

# Retry function with exponential backoff and jitter
retry_with_backoff() {
local max_retries=$1
Expand Down Expand Up @@ -316,20 +326,21 @@ pipeline:
vr cd "$dest_fullpath"
vr git config --global --add safe.directory "$dest_fullpath"

local foundcommit="" tagobj=""
local foundcommit="" obs_foundcommit="" tagobj=""
if [ -z "$tag" ]; then
foundcommit=$(git rev-parse --verify HEAD)
obs_foundcommit=$(obscure_half "$foundcommit")
if [ -n "$expcommit" ] && [ "$expcommit" != "$foundcommit" ]; then
if [ "$depth" = "-1" ]; then
msg "expected commit $expcommit on ${branch:-HEAD}," \
"got $foundcommit, performing reset"
"got $obs_foundcommit, performing reset"
vr git reset --hard "$expcommit"
else
fail "expected commit $expcommit on ${branch:-HEAD}," \
"got $foundcommit, set depth to -1 to attempt a reset"
"got $obs_foundcommit, set depth to -1 to attempt a reset"
fi
fi
msg "tip of ${branch:-HEAD} is commit $foundcommit"
msg "tip of ${branch:-HEAD} is commit $obs_foundcommit"
process_cherry_picks "$cherry_pick" || fail "failed to apply cherry-pick"
return 0
fi
Expand All @@ -342,8 +353,9 @@ pipeline:
vr git checkout $quiet "$remote/tags/$tag"

foundcommit=$(git rev-parse --verify HEAD)
obs_foundcommit=$(obscure_half "$foundcommit")
if [ -z "$expcommit" ] || [ "$expcommit" = "$foundcommit" ]; then
msg "tag $tag is $foundcommit"
msg "tag $tag is $obs_foundcommit"
else
# If it's a tag, then it could be a lightweight or annotated tag.
# Lightweight tags point directly to the commit and do not have
Expand All @@ -356,12 +368,12 @@ pipeline:
if [ "$expcommit" != "$tagobj" ]; then
[ "$tagobj" != "$expcommit" ] &&
msg "tag object hash was $tagobj"
fail "Expected commit $expcommit for $tag, found $foundcommit"
fail "Expected commit $expcommit for $tag, found $obs_foundcommit"
fi

msg "Warning: The provided expected-commit ($expcommit)"
msg "was the hash of the annotated tag object for $tag."
msg "Update to set expected-commit to $foundcommit"
msg "Update to set expected-commit to $obs_foundcommit"
fi

process_cherry_picks "$cherry_pick" ||
Expand Down
Loading