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

download_strategy: ignore query strings when parsing resolved URLs #13110

Merged
merged 1 commit into from
Apr 11, 2022
Merged

download_strategy: ignore query strings when parsing resolved URLs #13110

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions Library/Homebrew/download_strategy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def resolved_url_and_basename
@resolved_url_and_basename = [url, parse_basename(url)]
end

def parse_basename(url)
def parse_basename(url, search_query: true)
uri_path = if url.match?(URI::DEFAULT_PARSER.make_regexp)
uri = URI(url)

Expand All @@ -339,7 +339,11 @@ def parse_basename(url)
end
end

uri.query ? "#{uri.path}?#{uri.query}" : uri.path
if uri.query && search_query
"#{uri.path}?#{uri.query}"
else
uri.path
end
else
url
end
Expand Down Expand Up @@ -509,8 +513,8 @@ def resolve_url_basename_time_file_size(url, timeout: nil)
.map(&:to_i)
.last

basename = filenames.last || parse_basename(redirect_url)
is_redirection = url != redirect_url
basename = filenames.last || parse_basename(redirect_url, search_query: !is_redirection)

@resolved_info_cache[url] = [redirect_url, basename, time, file_size, is_redirection]
end
Expand Down