Skip to content

pull: treat HTTP redirects without Location header as error #3169

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
merged 4 commits into from
Jan 19, 2020
Merged

pull: treat HTTP redirects without Location header as error #3169

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
968e748
pull: treat HTTP redirects without Location header as error
fabiosantoscode Jan 16, 2020
d3f925a
add missing return
fabiosantoscode Jan 16, 2020
c5eb13c
update redirect check
fabiosantoscode Jan 16, 2020
df22dd4
specifically look for Location header in response
fabiosantoscode Jan 16, 2020
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
17 changes: 16 additions & 1 deletion dvc/remote/http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,22 @@ def _request(self, method, url, **kwargs):
kwargs.setdefault("timeout", self.REQUEST_TIMEOUT)

try:
return self._session.request(method, url, **kwargs)
res = self._session.request(method, url, **kwargs)

redirect_no_location = (
kwargs["allow_redirects"]
and res.status_code in (301, 302)
and "location" not in res.headers
)

if redirect_no_location:
# AWS s3 doesn't like to add a location header to its redirects
# from https://s3.amazonaws.com/<bucket name>/* type URLs.
# This should be treated as an error
raise requests.exceptions.RequestException

return res

except requests.exceptions.RequestException:
raise DvcException("could not perform a {} request".format(method))

Expand Down