Authentication fix

Author: snbianco

astroquery/mast/missions.py

@@ -17,6 +17,7 @@
 
 import astropy.units as u
 import numpy as np
+import requests
 from astropy.coordinates import Angle, BaseCoordinateFrame, SkyCoord
 from astropy.io import fits
 from astropy.table import Column, Row, Table, vstack
@@ -1023,9 +1024,19 @@ def read_product(self, uri, *, mission=None, **kwargs):
                                       'Roman Space Telescope mission. Please install it with `pip install {package}` '
                                       'or install astroquery with optional dependencies using '
                                       '`pip install astroquery[all]`.', ImportWarning)
-                # Use fsspec to open the file directly from the
+
+                # Make an authenticated request to get the presigned S3 URL for the ASDF file
+                headers = {"Authorization": f"token {self._auth_obj.session.cookies['mast_token']}"}
+                resp = requests.get(
+                    download_url,
+                    headers=headers,
+                    allow_redirects=False,
+                )
+                resp.raise_for_status()
+
+                # Use fsspec to open the file directly from the S3 URL, and then read it with asdf
                 fs = fsspec.filesystem("https")
-                f = fs.open(download_url, "rb")
+                f = fs.open(resp.headers["Location"], "rb")
                 return asdf.open(f, **kwargs)
             else:
                 raise InvalidQueryError(f"Unsupported file type for reading: {uri}. "

astroquery/mast/tests/test_mast.py

@@ -765,6 +765,16 @@ def mock_asdf_open(mocker):
     pytest.importorskip("asdf")
     pytest.importorskip("fsspec")
 
+    # Mock response from requests.get for the initial URL fetch
+    mock_response = MagicMock()
+    mock_response.status_code = 307
+    mock_response.headers = {
+        "Location": "https://example-bucket.s3.amazonaws.com/test.asdf?signature=abc123"
+    }
+    mock_requests = MagicMock()
+    mock_requests.get.return_value = mock_response
+    mocker.patch("requests.get", mock_requests)
+
     # Mock fsspec.filesystem and the file handle
     mock_fs = MagicMock()
     mock_file = MagicMock()