Skip to content

[Python] Cache client-side timeouts when a remote host is unreachable #5374

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

Merged
brrygrdn merged 1 commit into from
Jul 21, 2022
Merged

[Python] Cache client-side timeouts when a remote host is unreachable #5374

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
34 changes: 11 additions & 23 deletions python/lib/dependabot/python/metadata_finder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

require "dependabot/metadata_finders"
require "dependabot/metadata_finders/base"
require "dependabot/shared_helpers"
require "dependabot/registry_client"
require "dependabot/python/authed_url_builder"
require "dependabot/python/name_normaliser"

Expand Down Expand Up @@ -65,11 +65,7 @@ def source_from_description
@source_from_description ||=
potential_source_urls.find do |url|
full_url = Source.from_url(url).url
response = Excon.get(
full_url,
idempotent: true,
**SharedHelpers.excon_defaults
)
response = Dependabot::RegistryClient.get(url: full_url)
next unless response.status == 200

response.body.include?(normalised_dependency_name)
Expand All @@ -94,11 +90,7 @@ def source_from_homepage
@source_from_homepage ||=
potential_source_urls.find do |url|
full_url = Source.from_url(url).url
response = Excon.get(
full_url,
idempotent: true,
**SharedHelpers.excon_defaults
)
response = Dependabot::RegistryClient.get(url: full_url)
next unless response.status == 200

response.body.include?(normalised_dependency_name)
Expand All @@ -116,11 +108,7 @@ def homepage_body

@homepage_response ||=
begin
Excon.get(
homepage_url,
idempotent: true,
**SharedHelpers.excon_defaults
)
Dependabot::RegistryClient.get(url: homepage_url)
rescue Excon::Error::Timeout, Excon::Error::Socket,
Excon::Error::TooManyRedirects, ArgumentError
nil
Expand Down Expand Up @@ -153,15 +141,15 @@ def fetch_authed_url(url)
Regexp.last_match.captures[1].include?("@")
protocol, user, pass, url = Regexp.last_match.captures

Excon.get(
"#{protocol}://#{url}",
user: user,
password: pass,
idempotent: true,
**SharedHelpers.excon_defaults
Dependabot::RegistryClient.get(
url: "#{protocol}://#{url}",
options: {
user: user,
password: pass
}
)
else
Excon.get(url, idempotent: true, **SharedHelpers.excon_defaults)
Dependabot::RegistryClient.get(url: url)
end
end

Expand Down
8 changes: 3 additions & 5 deletions python/lib/dependabot/python/update_checker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
require "dependabot/dependency"
require "dependabot/update_checkers"
require "dependabot/update_checkers/base"
require "dependabot/shared_helpers"
require "dependabot/registry_client"
require "dependabot/errors"
require "dependabot/python/requirement"
require "dependabot/python/requirement_parser"
Expand Down Expand Up @@ -274,10 +274,8 @@ def poetry_library?
details = TomlRB.parse(pyproject.content).dig("tool", "poetry")
return false unless details

index_response = Excon.get(
"https://pypi.org/pypi/#{normalised_name(details['name'])}/json/",
idempotent: true,
**SharedHelpers.excon_defaults
index_response = Dependabot::RegistryClient.get(
url: "https://pypi.org/pypi/#{normalised_name(details['name'])}/json/"
)

return false unless index_response.status == 200
Expand Down
16 changes: 7 additions & 9 deletions python/lib/dependabot/python/update_checker/latest_version_finder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
require "dependabot/dependency"
require "dependabot/python/update_checker"
require "dependabot/update_checkers/version_filters"
require "dependabot/shared_helpers"
require "dependabot/registry_client"
require "dependabot/python/authed_url_builder"
require "dependabot/python/name_normaliser"

Expand Down Expand Up @@ -214,18 +214,16 @@ def index_urls
end

def registry_response_for_dependency(index_url)
Excon.get(
index_url + normalised_name + "/",
idempotent: true,
**SharedHelpers.excon_defaults(headers: { "Accept" => "text/html" })
Dependabot::RegistryClient.get(
url: index_url + normalised_name + "/",
headers: { "Accept" => "text/html" }
)
end

def registry_index_response(index_url)
Excon.get(
index_url,
idempotent: true,
**SharedHelpers.excon_defaults(headers: { "Accept" => "text/html" })
Dependabot::RegistryClient.get(
url: index_url,
headers: { "Accept" => "text/html" }
)
end

Expand Down