Take advantage of Dist.content_headers_for() to no-cache repomd and f…

…riends.

Requires pulpcore support release in core/3.28.

fixes pulp#2947.

CHANGES/2947.feature

@@ -0,0 +1,4 @@
+Added NOCACHE_LIST config to enable specifying files to be served with a no-cache header.
+
+By default, repomd.xml, repomd.key, and repomd.key.asc are served with
+Cache-control: no-cache.

pulp_rpm/app/models/repository.py

@@ -1,3 +1,4 @@
+import os
 import textwrap
 
 from gettext import gettext as _
@@ -490,6 +491,14 @@ def content_handler(self, path):
 
             return Response(body=val)
 
+    def content_headers_for(self, path):
+        """Return per-file http-headers."""
+        headers = super().content_headers_for(path)
+        base = os.path.basename(path)  # path.strip("/").split("/")[-1]
+        if base in settings.NOCACHE_LIST:
+            headers.update({"Cache-Control": "no-cache"})
+        return headers
+
     def content_handler_list_directory(self, rel_path):
         """Return the extra dir entries."""
         retval = set()

pulp_rpm/app/settings.py

@@ -15,3 +15,4 @@
 KEEP_CHANGELOG_LIMIT = 10
 SOLVER_DEBUG_LOGS = True
 RPM_METADATA_USE_REPO_PACKAGE_TIME = False
+NOCACHE_LIST = ["repomd.xml", "repomd.xml.asc", "repomd.xml.key"]

pulp_rpm/tests/functional/api/test_consume_content.py

@@ -207,3 +207,24 @@ def test_config_dot_repo(
 
     if has_signing_service:
         assert f"gpgkey={distribution.base_url}repodata/repomd.xml.key" in content
+
+
+@pytest.mark.parallel
+def test_repomd_headers(
+    create_distribution,
+    http_get_headers,
+):
+    """Test if repomd.xml is returned with Cache-control: no-cache header."""
+    distribution = create_distribution(gpgcheck=1, repo_gpgcheck=1, has_signing_service=True)
+    assert (
+        http_get_headers(f"{distribution.base_url}repodata/repomd.xml").get("Cache-control", "")
+        == "no-cache"
+    )
+    assert (
+        not http_get_headers(f"{distribution.base_url}config.repo").get("Cache-control", "")
+        == "no-cache"
+    )
+    assert (
+        http_get_headers(f"{distribution.base_url}repodata/repomd.xml.key").get("Cache-control", "")
+        == "no-cache"
+    )

pulp_rpm/tests/functional/conftest.py

@@ -1,7 +1,9 @@
+import asyncio
 import json
 import uuid
 from tempfile import NamedTemporaryFile
 
+import aiohttp
 import pytest
 
 from pulpcore.client.pulp_rpm import (
@@ -342,3 +344,17 @@ def _cleanup_domains(
                     assert content_api_client.list(pulp_domain=domain.name).count == 0
 
     return _cleanup_domains
+
+
+@pytest.fixture(scope="session")
+def http_get_headers():
+    def _http_get_headers(url, **kwargs):
+        async def _send_request():
+            async with aiohttp.ClientSession(raise_for_status=True) as session:
+                async with session.get(url) as response:
+                    return response.headers
+
+        headers = asyncio.run(_send_request())
+        return headers
+
+    return _http_get_headers

requirements.txt

@@ -3,6 +3,6 @@ django_readonly_field~=1.1.1
 jsonschema>=4.6,<5.0
 libcomps>=0.1.15.post1,<0.2
 productmd~=1.33.0
-pulpcore>=3.25.0,<3.40
+pulpcore>=3.28.0,<3.40
 solv~=0.7.21
 aiohttp_xmlrpc~=1.5.0