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

Implement fallback detection of redirects for the new CDNs #554

Merged
merged 5 commits into from
Dec 22, 2024
Merged

Implement fallback detection of redirects for the new CDNs #554

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6329618
Implement fallback detection of redirects for the new CDNs
baronfel Dec 20, 2024
654cfcd
Update expectations for Powershell test runs to include new domains
baronfel Dec 21, 2024
f5d3398
Apply sanitization after following redirects on the Powershell script.
baronfel Dec 21, 2024
440f968
Add direct usage of the Azure Frontdoor CNAMEs until the nice CDN ali…
baronfel Dec 21, 2024
f1d0231
Update expectations for Bash- and macOS-specific tests
baronfel Dec 22, 2024
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
275 changes: 146 additions & 129 deletions src/dotnet-install.ps1
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 64 additions & 0 deletions src/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,6 +1272,61 @@ downloadwget() {
return 0
}

extract_stem() {
local url="$1"
# extract the protocol
proto="$(echo $1 | grep :// | sed -e's,^\(.*://\).*,\1,g')"
# remove the protocol
url="${1/$proto/}"
# extract the path (if any) - since we know all of our feeds have a first path segment, we can skip the first one. otherwise we'd use -f2- to get the full path
full_path="$(echo $url | grep / | cut -d/ -f2-)"
path="$(echo $full_path | cut -d/ -f2-)"
echo $path
}

check_url_exists() {
eval $invocation
local url="$1"

local code=""
if machine_has "curl"
then
code=$(curl --head -o /dev/null -w "%{http_code}" -s --fail "$url");
elif machine_has "wget"
then
# get the http response, grab the status code
server_response=$(wget -qO- --method=HEAD --server-response "$url" 2>&1)
code=$(echo "$server_response" | grep "HTTP/" | awk '{print $2}')
fi
if [ $code = "200" ]; then
return 0
else
return 1
fi
}

sanitize_redirect_url() {
eval $invocation

local url_stem
url_stem=$(extract_stem "$1")
say_verbose "Checking configured feeds for the asset at ${yellow:-}$url_stem${normal:-}"

for feed in "${feeds[@]}"
do
local trial_url="$feed/$url_stem"
say_verbose "Checking ${yellow:-}$trial_url${normal:-}"
if check_url_exists "$trial_url"; then
say_verbose "Found a match at ${yellow:-}$trial_url${normal:-}"
echo "$trial_url"
return 0
else
say_verbose "No match at ${yellow:-}$trial_url${normal:-}"
fi
done
return 1
}

get_download_link_from_aka_ms() {
eval $invocation

Expand Down Expand Up @@ -1324,6 +1379,11 @@ get_download_link_from_aka_ms() {
return 1
fi

sanitized_redirect_url=$(sanitize_redirect_url "$aka_ms_download_link")
if [[ -n "$sanitized_redirect_url" ]]; then
aka_ms_download_link="$sanitized_redirect_url"
fi

say_verbose "The redirect location retrieved: '$aka_ms_download_link'."
return 0
else
Expand All @@ -1335,7 +1395,11 @@ get_download_link_from_aka_ms() {
get_feeds_to_use()
{
feeds=(
"https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet" # direct-access alias for builds.dotnet.microsoft.com until certs are ready for that alias
#"https://builds.dotnet.microsoft.com/dotnet"
"https://dotnetcli.azureedge.net/dotnet"
"https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public" # direct-access alias for ci.dot.net until certs are ready for that alias
#"https://ci.dot.net/public"
"https://dotnetbuilds.azureedge.net/public"
)

Expand Down
12 changes: 8 additions & 4 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=1.0.5_runtime=dotnet.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
dotnet-install: Payload URLs:
dotnet-install: URL #0 - primary: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
dotnet-install: URL #2 - primary: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-runtime-1.0.5-win-x64.zip
dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Runtime/1.0.5/dotnet-win-x64.1.0.5.zip
dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "1.0.5" -InstallDir "dotnet-sdk" -Architecture "x64" -Runtime "dotnet"
6 changes: 4 additions & 2 deletions ...ript.WhenAnExactVersionIsPassedToPowershell_version=2.1.0_runtime=aspnetcore.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
dotnet-install: Payload URLs:
dotnet-install: URL #0 - primary: https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
dotnet-install: URL #1 - primary: https://dotnetbuilds.azureedge.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
dotnet-install: URL #1 - primary: https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
dotnet-install: URL #2 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
dotnet-install: URL #3 - primary: https://dotnetbuilds.azureedge.net/public/aspnetcore/Runtime/2.1.0/aspnetcore-runtime-2.1.0-win-x64.zip
dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "2.1.0" -InstallDir "dotnet-sdk" -Architecture "x64" -Runtime "aspnetcore"
12 changes: 8 additions & 4 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=6.0.100_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
dotnet-install: Payload URLs:
dotnet-install: URL #0 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
dotnet-install: URL #2 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-sdk-6.0.100-win-x64.zip
dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/6.0.100/dotnet-dev-win-x64.6.0.100.zip
dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "6.0.100" -InstallDir "dotnet-sdk" -Architecture "x64"
12 changes: 8 additions & 4 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=8.0.303_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
dotnet-install: Payload URLs:
dotnet-install: URL #0 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
dotnet-install: URL #2 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-sdk-8.0.303-win-x64.zip
dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/8.0.303/dotnet-dev-win-x64.8.0.303.zip
dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "8.0.303" -InstallDir "dotnet-sdk" -Architecture "x64"
12 changes: 8 additions & 4 deletions ...mAScript.WhenAnExactVersionIsPassedToPowershell_version=9.0.100_runtime=null.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
dotnet-install: Payload URLs:
dotnet-install: URL #0 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
dotnet-install: URL #2 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
dotnet-install: URL #0 - primary: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #1 - legacy: https://dotnetcli-f0e9dzh5e5eze7cd.b02.azurefd.net/dotnet/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
dotnet-install: URL #2 - primary: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #3 - legacy: https://dotnetcli.azureedge.net/dotnet/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
dotnet-install: URL #4 - primary: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #5 - legacy: https://dotnetbuilds-bgf9bthjbvdca2ar.b02.azurefd.net/public/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
dotnet-install: URL #6 - primary: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-sdk-9.0.100-win-x64.zip
dotnet-install: URL #7 - legacy: https://dotnetbuilds.azureedge.net/public/Sdk/9.0.100/dotnet-dev-win-x64.9.0.100.zip
dotnet-install: Repeatable invocation: .\dotnet-install.ps1 -Version "9.0.100" -InstallDir "dotnet-sdk" -Architecture "x64"
Loading