diff --git a/dvc/remote/http.py b/dvc/remote/http.py index caa094b977..c04256a462 100644 --- a/dvc/remote/http.py +++ b/dvc/remote/http.py @@ -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//* 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))