Merge pull request #854 from RS-PYTHON/feat-rspy544/invalid-catalog-download-links

Feat rspy544/invalid catalog download links

Author: alinbutu

services/catalog/rs_server_catalog/user_catalog.py

@@ -406,7 +406,7 @@ def update_stac_item_publication(  # pylint: disable=too-many-locals
                 if not self.check_s3_key(item, asset, s3_key):
                     # update the 'href' key with the download link
                     new_href = f"https://{request.url.netloc}/catalog/\
-collections/{user}:{collection_id}/items/{fid}/download/{asset}"
+collections/{user}:{collection_id}/items/{self.request_ids['item_id']}/download/{asset}"
                     content["assets"][asset].update({"href": new_href})
                     # Update the S3 path to use the catalog bucket and create the alternate field
                     new_s3_href = {"s3": {"href": s3_key}}
@@ -979,7 +979,7 @@ async def manage_get_response(  # pylint: disable=too-many-locals, too-many-bran
             content = self.adapt_links(
                 content,
                 self.request_ids["owner_id"],
-                self.request_ids["collection_ids"],
+                self.request_ids["collection_ids"][0],
                 "features",
             )
         elif request.scope["path"] == "/search":

services/staging/rs_server_staging/processors.py

@@ -880,7 +880,7 @@ def publish_rspy_feature(self, feature: Feature):
         try:
             response = requests.post(
                 publish_url,
-                headers={"cookie": self.headers.get("cookie", None)},
+                headers={"cookie": self.headers.get("cookie", None), "host": self.headers.get("host", None)},
                 data=feature.json(),
                 timeout=10,
             )

services/staging/tests/conftest.py

@@ -136,7 +136,7 @@ def staging(mocker):
     """Fixture to mock the Staging object"""
     # Mock dependencies for Staging
     mock_credentials = mocker.Mock()
-    mock_credentials.headers = {"cookie": "fake-cookie"}
+    mock_credentials.headers = {"cookie": "fake-cookie", "host": "fake-host"}
     mock_input_collection = mocker.Mock()
     mock_collection = "test_collection"
     mock_item = "test_item"

services/staging/tests/test_rspy_processor.py

@@ -1090,7 +1090,7 @@ def test_publish_rspy_feature_success(self, mocker, staging_instance):
         assert result is True  # Should return True for successful publishing
         mock_post.assert_called_once_with(
             f"{staging_instance.catalog_url}/catalog/collections/{staging_instance.catalog_collection}/items",
-            headers={"cookie": "fake-cookie"},
+            headers={"cookie": "fake-cookie", "host": "fake-host"},
             data=feature.json(),
             timeout=10,
         )
@@ -1119,7 +1119,7 @@ def test_publish_rspy_feature_fail(self, mocker, staging_instance):
             assert result is False  # Should return False for failure
             mock_post.assert_called_once_with(
                 f"{staging_instance.catalog_url}/catalog/collections/{staging_instance.catalog_collection}/items",
-                headers={"cookie": "fake-cookie"},
+                headers={"cookie": "fake-cookie", "host": "fake-host"},
                 data=feature.json(),
                 timeout=10,
             )