pulp-python 3.34.0__py3-none-any.whl → 3.36.0__py3-none-any.whl

pulp_python/app/__init__.py

@@ -12,7 +12,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_python.app"
     label = "python"
-    version = "3.34.0"
+    version = "3.36.0"
     python_package_name = "pulp-python"
     domain_compatible = True
 
@@ -28,6 +28,7 @@ class PulpPythonPluginAppConfig(PulpPluginAppConfig):
 
 # TODO: Remove this when https://github.com/pulp/pulpcore/issues/5500 is resolved
 def _populate_pypi_access_policies(sender, apps, verbosity, **kwargs):
+    from pulp_python.app.pypi.feeds import FeedView
     from pulp_python.app.pypi.views import MetadataView, PyPIView, SimpleView, UploadView
 
     try:
@@ -37,7 +38,7 @@ def _populate_pypi_access_policies(sender, apps, verbosity, **kwargs):
             print(_("AccessPolicy model does not exist. Skipping initialization."))
         return
 
-    for viewset in (PyPIView, SimpleView, UploadView, MetadataView):
+    for viewset in (PyPIView, SimpleView, UploadView, MetadataView, FeedView):
         access_policy = getattr(viewset, "DEFAULT_ACCESS_POLICY", None)
         if access_policy is not None:
             viewset_name = viewset.urlpattern()

pulp_python/app/pypi/feeds.py

@@ -0,0 +1,252 @@
+import re
+from email.utils import getaddresses
+from urllib.parse import urljoin
+
+from django.db.models import F, FilteredRelation, Min, Q
+from django.http.response import HttpResponse, HttpResponseNotFound
+from django.utils.decorators import method_decorator
+from django.utils.feedgenerator import Rss201rev2Feed
+from django.views.decorators.cache import cache_control
+from django.views.decorators.http import condition
+from drf_spectacular.utils import extend_schema
+from packaging.utils import canonicalize_name
+from rest_framework.viewsets import ViewSet
+
+from pulp_python.app.cache import PythonApiCache, find_base_path_cached
+from pulp_python.app.pypi.views import PyPIMixin, _etag_func
+
+UPDATES_LIMIT = 100
+PACKAGES_LIMIT = 40
+PROJECT_RELEASES_LIMIT = 40
+RSS_CONTENT_TYPE = "application/rss+xml; charset=utf-8"
+
+# XML 1.0 disallowed characters (Django still escapes <>&).
+_INVALID_XML_CHARS = re.compile("[\x00-\x08\x0b\x0c\x0e-\x1f\ud800-\udfff\ufffe\uffff]")
+
+
+def sanitize_xml_text(value):
+    """Return a string safe to place in an RSS text field."""
+    if not value:
+        return ""
+    return _INVALID_XML_CHARS.sub("", str(value))
+
+
+def format_author(author_email):
+    """Return an RSS author email, or None if the value is not a usable address."""
+    if not author_email:
+        return None
+    emails = []
+    for _, email in getaddresses([author_email]):
+        if "@" not in email:
+            return None
+        emails.append(email)
+    return ", ".join(emails) or None
+
+
+def annotate_added_at(content, repo_ver):
+    """Annotate each package file with when it was added to this repository."""
+    return content.annotate(
+        active_membership=FilteredRelation(
+            "version_memberships",
+            condition=Q(
+                version_memberships__repository=repo_ver.repository,
+                version_memberships__version_removed=None,
+            ),
+        ),
+        file_added_at=F("active_membership__pulp_created"),
+    )
+
+
+def iter_releases(content, repo_ver, name_normalized=None, limit=UPDATES_LIMIT):
+    """Yield latest (name, version) releases in the served repository version."""
+    qs = annotate_added_at(content, repo_ver)
+    if name_normalized:
+        qs = qs.filter(name_normalized=name_normalized)
+    return (
+        qs.order_by()
+        .values("name_normalized", "version")
+        .annotate(
+            added_at=Min("file_added_at"),
+            name=Min("name"),
+            summary=Min("summary"),
+            author_email=Min("author_email"),
+        )
+        .order_by("-added_at", "name_normalized", "version")[:limit]
+    )
+
+
+def iter_projects(content, repo_ver, limit=PACKAGES_LIMIT):
+    """Yield latest newly added projects in the served repository version."""
+    qs = annotate_added_at(content, repo_ver)
+    return (
+        qs.order_by()
+        .values("name_normalized")
+        .annotate(
+            added_at=Min("file_added_at"),
+            name=Min("name"),
+            summary=Min("summary"),
+            author_email=Min("author_email"),
+        )
+        .order_by("-added_at", "name_normalized")[:limit]
+    )
+
+
+def _item_dict(title, link, description, author_email, pubdate):
+    return {
+        "title": sanitize_xml_text(title),
+        "link": link,
+        "description": sanitize_xml_text(description),
+        "author_email": format_author(author_email),
+        "pubdate": pubdate,
+        "unique_id": link,
+    }
+
+
+def render_rss(title, link, description, items):
+    """Render an RSS 2.0 document from item dicts produced by `_item_dict`."""
+    feed = Rss201rev2Feed(
+        title=sanitize_xml_text(title),
+        link=link,
+        description=sanitize_xml_text(description),
+        language="en",
+    )
+    for item in items:
+        feed.add_item(
+            title=item["title"],
+            link=item["link"],
+            description=item["description"],
+            author_email=item["author_email"],
+            pubdate=item["pubdate"],
+            unique_id=item["unique_id"],
+            unique_id_is_permalink=True,
+        )
+    return feed.writeString("utf-8")
+
+
+def _release_link(index_url, name_normalized, version):
+    return urljoin(index_url, f"pypi/{name_normalized}/{version}/json")
+
+
+def _project_link(index_url, name_normalized):
+    return urljoin(index_url, f"pypi/{name_normalized}/json")
+
+
+def render_updates_feed(index_url, releases):
+    items = [
+        _item_dict(
+            title=f"{release['name']} {release['version']}",
+            link=_release_link(index_url, release["name_normalized"], release["version"]),
+            description=release["summary"],
+            author_email=release["author_email"],
+            pubdate=release["added_at"],
+        )
+        for release in releases
+    ]
+    return render_rss(
+        title="Recent updates",
+        link=index_url,
+        description="Recent updates to this Python package index",
+        items=items,
+    )
+
+
+def render_packages_feed(index_url, projects):
+    items = [
+        _item_dict(
+            title=f"{project['name']} added to index",
+            link=_project_link(index_url, project["name_normalized"]),
+            description=project["summary"],
+            author_email=project["author_email"],
+            pubdate=project["added_at"],
+        )
+        for project in projects
+    ]
+    return render_rss(
+        title="Newest packages",
+        link=index_url,
+        description="Newest packages registered on this Python package index",
+        items=items,
+    )
+
+
+def render_project_releases_feed(index_url, project_name, releases):
+    project_link = _project_link(index_url, canonicalize_name(project_name))
+    items = [
+        _item_dict(
+            title=release["version"],
+            link=_release_link(index_url, release["name_normalized"], release["version"]),
+            description=release["summary"],
+            author_email=release["author_email"],
+            pubdate=release["added_at"],
+        )
+        for release in releases
+    ]
+    return render_rss(
+        title=f"Recent updates for {project_name}",
+        link=project_link,
+        description=f"Recent updates to {project_name} on this Python package index",
+        items=items,
+    )
+
+
+class FeedView(PyPIMixin, ViewSet):
+    """View for PyPI-compatible RSS feeds on a distribution."""
+
+    endpoint_name = "rss"
+    DEFAULT_ACCESS_POLICY = {
+        "statements": [
+            {
+                "action": ["updates", "packages", "project_releases"],
+                "principal": "*",
+                "effect": "allow",
+            },
+        ],
+    }
+
+    def _index_url(self, path):
+        return urljoin(self.base_api_url, f"{path}/")
+
+    def _rss_response(self, xml):
+        return HttpResponse(xml, content_type=RSS_CONTENT_TYPE)
+
+    @extend_schema(summary="Get latest updates RSS feed")
+    @method_decorator(cache_control(max_age=600, public=True))
+    @method_decorator(condition(etag_func=_etag_func))
+    @PythonApiCache(base_key=find_base_path_cached)
+    def updates(self, request, path):
+        """Latest releases added to this index, analogous to PyPI `/rss/updates.xml`."""
+        repo_ver, content = self.get_rvc()
+        index_url = self._index_url(path)
+        releases = list(iter_releases(content, repo_ver)) if content is not None else []
+        return self._rss_response(render_updates_feed(index_url, releases))
+
+    @extend_schema(summary="Get newest packages RSS feed")
+    @method_decorator(cache_control(max_age=600, public=True))
+    @method_decorator(condition(etag_func=_etag_func))
+    @PythonApiCache(base_key=find_base_path_cached)
+    def packages(self, request, path):
+        """Latest newly added projects, analogous to PyPI `/rss/packages.xml`."""
+        repo_ver, content = self.get_rvc()
+        index_url = self._index_url(path)
+        projects = list(iter_projects(content, repo_ver)) if content is not None else []
+        return self._rss_response(render_packages_feed(index_url, projects))
+
+    @extend_schema(summary="Get project releases RSS feed")
+    @method_decorator(cache_control(max_age=600, public=True))
+    @method_decorator(condition(etag_func=_etag_func))
+    @PythonApiCache(base_key=find_base_path_cached)
+    def project_releases(self, request, path, package):
+        """Latest releases for one project, analogous to PyPI `/rss/project/<name>/releases.xml`."""
+        repo_ver, content = self.get_rvc()
+        normalized = canonicalize_name(package)
+        if content is None or not content.filter(name_normalized=normalized).exists():
+            return HttpResponseNotFound(f"{normalized} does not exist.")
+
+        index_url = self._index_url(path)
+        releases = list(
+            iter_releases(
+                content, repo_ver, name_normalized=normalized, limit=PROJECT_RELEASES_LIMIT
+            )
+        )
+        project_name = releases[0]["name"] if releases else package
+        return self._rss_response(render_project_releases_feed(index_url, project_name, releases))

pulp_python/app/pypi/views.py

@@ -72,17 +72,32 @@ PYPI_SIMPLE_V1_HTML = "application/vnd.pypi.simple.v1+html"
 PYPI_SIMPLE_V1_JSON = "application/vnd.pypi.simple.v1+json"
 
 
-def _etag_func(request, path, **kwargs):
-    """Compute unquoted ETag for the condition decorator. Returns None if no repo."""
+def _get_repo_version(path):
+    """Resolve path to a RepositoryVersion, or None if not found."""
     try:
         distro = PyPIMixin.get_distribution(path)
-        repo_ver = PyPIMixin.get_repository_version(distro)
+        return PyPIMixin.get_repository_version(distro)
     except Http404:
         return None
+
+
+def _etag_func(request, path, **kwargs):
+    """Compute unquoted ETag for the condition decorator. Returns None if no repo."""
+    repo_ver = _get_repo_version(path)
+    if repo_ver is None:
+        return None
     raw = f"{repo_ver.number}:{repo_ver.pulp_created.isoformat()}"
     return hashlib.sha256(raw.encode()).hexdigest()[:16]
 
 
+def _last_modified_func(request, path, **kwargs):
+    """Return the repository version creation timestamp for Last-Modified."""
+    repo_ver = _get_repo_version(path)
+    if repo_ver is None:
+        return None
+    return repo_ver.pulp_created
+
+
 class PyPISimpleHTMLRenderer(TemplateHTMLRenderer):
     media_type = PYPI_SIMPLE_V1_HTML
 
@@ -317,7 +332,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
 
     @extend_schema(summary="Get index simple page")
     @method_decorator(cache_control(max_age=600, public=True))
-    @method_decorator(condition(etag_func=_etag_func))
+    @method_decorator(condition(etag_func=_etag_func, last_modified_func=_last_modified_func))
     @PythonApiCache(base_key=find_base_path_cached)
     def list(self, request, path):
         """Gets the simple api html page for the index."""
@@ -379,7 +394,7 @@ class SimpleView(PackageUploadMixin, ViewSet):
 
     @extend_schema(operation_id="pypi_simple_package_read", summary="Get package simple page")
     @method_decorator(cache_control(max_age=600, public=True))
-    @method_decorator(condition(etag_func=_etag_func))
+    @method_decorator(condition(etag_func=_etag_func, last_modified_func=_last_modified_func))
     @PythonApiCache(base_key=find_base_path_cached)
     def retrieve(self, request, path, package):
         """Retrieves the simple api html/json page for a package."""
@@ -482,6 +497,8 @@ class MetadataView(PyPIMixin, ViewSet):
         responses={200: PackageMetadataSerializer},
         summary="Get package metadata",
     )
+    @method_decorator(cache_control(max_age=900, public=True))
+    @method_decorator(condition(etag_func=_etag_func, last_modified_func=_last_modified_func))
     def retrieve(self, request, path, meta):
         """
         Retrieves the package's core-metadata specified by

pulp_python/app/tasks/repair.py

@@ -50,18 +50,29 @@ def repair(repository_pk: UUID) -> None:
     num_repaired, pkgs_not_repaired, num_metadata_repaired, pkgs_metadata_not_repaired = (
         repair_metadata(content)
     )
-    # Convert set() to 0
-    if not pkgs_not_repaired:
-        pkgs_not_repaired = 0
-    if not pkgs_metadata_not_repaired:
-        pkgs_metadata_not_repaired = 0
+
+    def _format_pkg_set(pk_set):
+        """Resolve a set of package PKs to 'name-version (pk)' strings."""
+        if not pk_set:
+            return "none"
+        packages = PythonPackageContent.objects.filter(pk__in=pk_set).values_list(
+            "name", "version", "pk"
+        )
+        return ", ".join(f"{name}-{version} ({pk})" for name, version, pk in packages)
 
     log.info(
         _(
-            "{} packages' metadata repaired. Not repaired packages due to either "
-            "inaccessible URL or mismatched sha256: {}. "
-            "{} metadata files repaired. Packages whose metadata files could not be repaired: {}."
-        ).format(num_repaired, pkgs_not_repaired, num_metadata_repaired, pkgs_metadata_not_repaired)
+            "Repository: %s. "
+            "%d packages' metadata repaired. "
+            "Not repaired packages due to either inaccessible URL or mismatched sha256: [%s]. "
+            "%d metadata files repaired. "
+            "Packages whose metadata files could not be repaired: [%s]."
+        ),
+        repository.name,
+        num_repaired,
+        _format_pkg_set(pkgs_not_repaired),
+        num_metadata_repaired,
+        _format_pkg_set(pkgs_metadata_not_repaired),
     )
 
 

pulp_python/app/urls.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.urls import path
 
+from pulp_python.app.pypi.feeds import FeedView
 from pulp_python.app.pypi.views import (
     MetadataView,
     ProvenanceView,
@@ -43,5 +44,20 @@ urlpatterns = [
     ),
     path(PYPI_API_URL + "yank/", YankView.as_view({"post": "yank"}), name="yank"),
     path(PYPI_API_URL + "unyank/", YankView.as_view({"post": "unyank"}), name="unyank"),
+    path(
+        PYPI_API_URL + "rss/updates.xml",
+        FeedView.as_view({"get": "updates"}),
+        name="rss-updates",
+    ),
+    path(
+        PYPI_API_URL + "rss/packages.xml",
+        FeedView.as_view({"get": "packages"}),
+        name="rss-packages",
+    ),
+    path(
+        PYPI_API_URL + "rss/project/<str:package>/releases.xml",
+        FeedView.as_view({"get": "project_releases"}),
+        name="rss-project-releases",
+    ),
     path(PYPI_API_URL, PyPIView.as_view({"get": "retrieve"}), name="pypi-detail"),
 ]

pulp_python/tests/functional/api/test_pypi_feeds.py

@@ -0,0 +1,132 @@
+from urllib.parse import urljoin, urlsplit
+from xml.etree import ElementTree as ET
+
+import pytest
+import requests
+
+from pulp_python.tests.functional.constants import (
+    PYTHON_EGG_FILENAME,
+    PYTHON_EGG_URL,
+    PYTHON_FIXTURES_URL,
+    PYTHON_WHEEL_FILENAME,
+    PYTHON_WHEEL_URL,
+    TWINE_EGG_FILENAME,
+    TWINE_EGG_URL,
+    TWINE_WHEEL_FILENAME,
+    TWINE_WHEEL_URL,
+)
+
+TWINE_500_WHEEL_FILENAME = "twine-5.0.0-py3-none-any.whl"
+TWINE_500_WHEEL_URL = urljoin(urljoin(PYTHON_FIXTURES_URL, "packages/"), TWINE_500_WHEEL_FILENAME)
+
+
+def _index_url(distro, bindings_cfg):
+    """Build the index URL using the same origin the API client uses."""
+    path = urlsplit(distro.base_url).path
+    if not path.endswith("/"):
+        path += "/"
+    return bindings_cfg.host.rstrip("/") + path
+
+
+def _get_feed(distro, relative, bindings_cfg):
+    return requests.get(urljoin(_index_url(distro, bindings_cfg), relative))
+
+
+def _parse_items(response):
+    assert response.status_code == 200, response.text
+    assert "application/rss+xml" in response.headers["Content-Type"]
+    root = ET.fromstring(response.content)
+    assert root.tag == "rss"
+    channel = root.find("channel")
+    assert channel is not None
+    return channel.findall("item")
+
+
+def _titles(items):
+    return [item.findtext("title") for item in items]
+
+
+@pytest.mark.parallel
+def test_empty_feeds(bindings_cfg, python_empty_repo_distro):
+    """Empty indexes return valid RSS documents with no items."""
+    _, distro = python_empty_repo_distro()
+
+    for relative in ("rss/updates.xml", "rss/packages.xml"):
+        items = _parse_items(_get_feed(distro, relative, bindings_cfg))
+        assert items == []
+
+    response = _get_feed(distro, "rss/project/shelf-reader/releases.xml", bindings_cfg)
+    assert response.status_code == 404
+
+
+@pytest.mark.parallel
+def test_feeds_projects_releases_and_files(
+    bindings_cfg, python_content_factory, python_empty_repo_distro
+):
+    """Feeds collapse files to releases, track new projects vs new versions, and stay per-index."""
+    repo, distro = python_empty_repo_distro()
+    _, other_distro = python_empty_repo_distro()
+
+    python_content_factory(PYTHON_EGG_FILENAME, url=PYTHON_EGG_URL, repository=repo)
+    python_content_factory(PYTHON_WHEEL_FILENAME, url=PYTHON_WHEEL_URL, repository=repo)
+
+    update_titles = _titles(_parse_items(_get_feed(distro, "rss/updates.xml", bindings_cfg)))
+    package_titles = _titles(_parse_items(_get_feed(distro, "rss/packages.xml", bindings_cfg)))
+    release_titles = _titles(
+        _parse_items(_get_feed(distro, "rss/project/shelf-reader/releases.xml", bindings_cfg))
+    )
+
+    assert update_titles == ["shelf-reader 0.1"]
+    assert package_titles == ["shelf-reader added to index"]
+    assert release_titles == ["0.1"]
+    assert _parse_items(_get_feed(other_distro, "rss/updates.xml", bindings_cfg)) == []
+
+    python_content_factory(TWINE_500_WHEEL_FILENAME, url=TWINE_500_WHEEL_URL, repository=repo)
+
+    update_titles = _titles(_parse_items(_get_feed(distro, "rss/updates.xml", bindings_cfg)))
+    package_titles = _titles(_parse_items(_get_feed(distro, "rss/packages.xml", bindings_cfg)))
+    assert update_titles == ["twine 5.0.0", "shelf-reader 0.1"]
+    assert package_titles == ["twine added to index", "shelf-reader added to index"]
+
+    python_content_factory(TWINE_WHEEL_FILENAME, url=TWINE_WHEEL_URL, repository=repo)
+    python_content_factory(TWINE_EGG_FILENAME, url=TWINE_EGG_URL, repository=repo)
+
+    update_titles = _titles(_parse_items(_get_feed(distro, "rss/updates.xml", bindings_cfg)))
+    package_titles = _titles(_parse_items(_get_feed(distro, "rss/packages.xml", bindings_cfg)))
+    twine_releases = _titles(
+        _parse_items(_get_feed(distro, "rss/project/twine/releases.xml", bindings_cfg))
+    )
+
+    assert update_titles == ["twine 5.1.0", "twine 5.0.0", "shelf-reader 0.1"]
+    assert package_titles == ["twine added to index", "shelf-reader added to index"]
+    assert twine_releases == ["5.1.0", "5.0.0"]
+
+    response = _get_feed(distro, "rss/project/does-not-exist/releases.xml", bindings_cfg)
+    assert response.status_code == 404
+    assert _parse_items(_get_feed(other_distro, "rss/updates.xml", bindings_cfg)) == []
+
+
+@pytest.mark.parallel
+def test_pinned_version_feeds(
+    bindings_cfg,
+    python_content_factory,
+    python_distribution_factory,
+    python_repo_factory,
+):
+    """Feeds for a pinned repository version stay frozen, as publication-backed indexes do."""
+    repo = python_repo_factory()
+    python_content_factory(PYTHON_EGG_FILENAME, url=PYTHON_EGG_URL, repository=repo)
+    distro = python_distribution_factory(repository=repo, version="1")
+
+    update_titles = _titles(_parse_items(_get_feed(distro, "rss/updates.xml", bindings_cfg)))
+    package_titles = _titles(_parse_items(_get_feed(distro, "rss/packages.xml", bindings_cfg)))
+    assert update_titles == ["shelf-reader 0.1"]
+    assert package_titles == ["shelf-reader added to index"]
+
+    item = _parse_items(_get_feed(distro, "rss/updates.xml", bindings_cfg))[0]
+    assert item.findtext("link").endswith("pypi/shelf-reader/0.1/json")
+    assert item.findtext("guid").endswith("pypi/shelf-reader/0.1/json")
+
+    python_content_factory(TWINE_WHEEL_FILENAME, url=TWINE_WHEEL_URL, repository=repo)
+    update_titles = _titles(_parse_items(_get_feed(distro, "rss/updates.xml", bindings_cfg)))
+    assert update_titles == ["shelf-reader 0.1"]

pulp_python/tests/functional/api/test_simple_cache.py

@@ -1,3 +1,4 @@
+from email.utils import parsedate_to_datetime
 from urllib.parse import urljoin
 
 import pytest
@@ -35,6 +36,20 @@ def synced_distro(
     return python_distribution_factory(repository=repo)
 
 
+@pytest.fixture
+def synced_distro_no_cache(
+    python_remote_factory,
+    python_repo_with_sync,
+    python_distribution_factory,
+):
+    """
+    Sync a repo and create a distribution (no cache requirement).
+    """
+    remote = python_remote_factory(includes=PYTHON_SM_PROJECT_SPECIFIER)
+    repo = python_repo_with_sync(remote)
+    return python_distribution_factory(repository=repo)
+
+
 @pytest.mark.parallel
 def test_simple_cache_hit_miss_and_headers(synced_distro):
     """
@@ -139,3 +154,161 @@ def test_simple_cache_etag_conditional_request(synced_distro):
     assert r3.headers["Cache-Control"] == cache_control
     assert r3.headers["X-PULP-CACHE"] == "HIT"
     assert len(r3.content) > 0
+
+
+@pytest.mark.parallel
+def test_simple_last_modified_header(synced_distro_no_cache):
+    """Simple API responses include Last-Modified header."""
+    index_url = urljoin(synced_distro_no_cache.base_url, "simple/")
+    detail_url = f"{index_url}aiohttp"
+
+    for url in [index_url, detail_url]:
+        r = requests.get(url)
+        assert r.status_code == 200
+        assert "Last-Modified" in r.headers
+        parsedate_to_datetime(r.headers["Last-Modified"])
+
+
+@pytest.mark.parallel
+def test_simple_if_modified_since_304(synced_distro_no_cache):
+    """If-Modified-Since with matching timestamp returns 304."""
+    url = urljoin(synced_distro_no_cache.base_url, "simple/")
+
+    r1 = requests.get(url)
+    assert r1.status_code == 200
+    last_modified = r1.headers["Last-Modified"]
+
+    r2 = requests.get(url, headers={"If-Modified-Since": last_modified})
+    assert r2.status_code == 304
+    assert len(r2.content) == 0
+
+
+@pytest.mark.parallel
+def test_simple_if_modified_since_old_timestamp_200(synced_distro_no_cache):
+    """If-Modified-Since with old timestamp returns 200 with content."""
+    url = urljoin(synced_distro_no_cache.base_url, "simple/")
+
+    r1 = requests.get(url)
+    assert r1.status_code == 200
+
+    r2 = requests.get(url, headers={"If-Modified-Since": "Thu, 01 Jan 2009 00:00:00 GMT"})
+    assert r2.status_code == 200
+    assert len(r2.content) > 0
+
+
+@pytest.mark.parallel
+def test_metadata_conditional_request_headers(synced_distro_no_cache):
+    """JSON metadata responses include ETag, Last-Modified, and Cache-Control headers."""
+    url = urljoin(synced_distro_no_cache.base_url, "pypi/aiohttp/json/")
+
+    r = requests.get(url)
+    assert r.status_code == 200
+    assert r.headers["Cache-Control"] == "max-age=900, public"
+    assert "ETag" in r.headers
+    assert r.headers["ETag"].startswith('"') and r.headers["ETag"].endswith('"')
+    assert "Last-Modified" in r.headers
+    parsedate_to_datetime(r.headers["Last-Modified"])
+
+
+@pytest.mark.parallel
+def test_metadata_etag_conditional_request(synced_distro_no_cache):
+    """JSON metadata: matching If-None-Match returns 304, non-matching returns 200."""
+    url = urljoin(synced_distro_no_cache.base_url, "pypi/aiohttp/json/")
+
+    r1 = requests.get(url)
+    assert r1.status_code == 200
+    etag = r1.headers["ETag"]
+
+    r2 = requests.get(url, headers={"If-None-Match": etag})
+    assert r2.status_code == 304
+    assert len(r2.content) == 0
+
+    r3 = requests.get(url, headers={"If-None-Match": '"old"'})
+    assert r3.status_code == 200
+    assert r3.headers["ETag"] == etag
+
+
+@pytest.mark.parallel
+def test_metadata_if_modified_since_304(synced_distro_no_cache):
+    """JSON metadata: If-Modified-Since with matching timestamp returns 304."""
+    url = urljoin(synced_distro_no_cache.base_url, "pypi/aiohttp/json/")
+
+    r1 = requests.get(url)
+    assert r1.status_code == 200
+    last_modified = r1.headers["Last-Modified"]
+
+    r2 = requests.get(url, headers={"If-Modified-Since": last_modified})
+    assert r2.status_code == 304
+    assert len(r2.content) == 0
+
+
+@pytest.mark.parallel
+def test_metadata_if_modified_since_old_timestamp_200(synced_distro_no_cache):
+    """JSON metadata: If-Modified-Since with old timestamp returns 200."""
+    url = urljoin(synced_distro_no_cache.base_url, "pypi/aiohttp/json/")
+
+    r1 = requests.get(url)
+    assert r1.status_code == 200
+
+    r2 = requests.get(url, headers={"If-Modified-Since": "Thu, 01 Jan 2009 00:00:00 GMT"})
+    assert r2.status_code == 200
+    assert len(r2.content) > 0
+
+
+def test_unauthenticated_gets_401_not_304(synced_distro_no_cache, pulpcore_bindings, bindings_cfg):
+    """Unauthenticated client gets 401, not 304, even with conditional request headers."""
+    admin_auth = (bindings_cfg.username, bindings_cfg.password)
+    simple_url = urljoin(synced_distro_no_cache.base_url, "simple/")
+
+    r1 = requests.get(simple_url, auth=admin_auth)
+    assert r1.status_code == 200
+    last_modified = r1.headers["Last-Modified"]
+    etag = r1.headers["ETag"]
+
+    ap_response = pulpcore_bindings.AccessPoliciesApi.list(viewset_name="pypi/simple")
+    assert ap_response.count == 1
+    ap_href = ap_response.results[0].pulp_href
+    original_statements = pulpcore_bindings.AccessPoliciesApi.read(ap_href).statements
+
+    anon = requests.Session()
+    anon.trust_env = False
+    anon.verify = False
+
+    try:
+        pulpcore_bindings.AccessPoliciesApi.partial_update(
+            ap_href,
+            {
+                "statements": [
+                    {
+                        "action": ["list", "retrieve"],
+                        "principal": "authenticated",
+                        "effect": "allow",
+                    },
+                    {
+                        "action": ["create"],
+                        "principal": "authenticated",
+                        "effect": "allow",
+                        "condition": "index_has_repo_perm:python.modify_pythonrepository",
+                    },
+                ],
+            },
+        )
+
+        r_ims = anon.get(simple_url, headers={"If-Modified-Since": last_modified})
+        assert r_ims.status_code == 401, (
+            f"Expected 401 for unauthenticated If-Modified-Since, got {r_ims.status_code}"
+        )
+
+        r_inm = anon.get(simple_url, headers={"If-None-Match": etag})
+        assert r_inm.status_code == 401, (
+            f"Expected 401 for unauthenticated If-None-Match, got {r_inm.status_code}"
+        )
+
+        r_authed = requests.get(
+            simple_url, auth=admin_auth, headers={"If-Modified-Since": last_modified}
+        )
+        assert r_authed.status_code == 304
+    finally:
+        pulpcore_bindings.AccessPoliciesApi.partial_update(
+            ap_href, {"statements": original_statements}
+        )

{pulp_python-3.34.0.dist-info → pulp_python-3.36.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-python
-Version: 3.34.0
+Version: 3.36.0
 Summary: pulp-python plugin for the Pulp Project
 Author-email: Pulp Team <pulp-list@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_python-3.34.0.dist-info → pulp_python-3.36.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_python/__init__.py,sha256=GIuTLoBTc-07dSLJUh8xrZPRz8x-jJ61pfR0J1IjnzI,65
 pulp_python/pytest_plugin.py,sha256=8Ko-O87JGPC79h8-Ecw2gJLxa6q1Ng8wD6WxbinOnVs,8573
-pulp_python/app/__init__.py,sha256=Xb-_6MfmJcerUvsQoyz0exptoi64okJEqZ0OcO_GtHo,2490
+pulp_python/app/__init__.py,sha256=2kWKrbhWKqmAVK_xuWgc2S5ZzcpRVS0yPOFCjEVwY1M,2552
 pulp_python/app/cache.py,sha256=Zl2nb4uKyPYp5a3FBrdRZ_-cXfofNMQmIRaQ6dUZZ1g,1037
 pulp_python/app/exceptions.py,sha256=mPNcWyuzF0XeOPybm-G6oDKtRqvfj4jyp41iaYqcqkA,1314
 pulp_python/app/global_access_conditions.py,sha256=MZJtyoVsr-4hRaty6mKDqh3caOHd5UKJjEWLV2crOLs,1080
@@ -10,7 +10,7 @@ pulp_python/app/provenance.py,sha256=iyhkuNahHiTDK0Djrd4-PlgErA5SJVI0uQOIPj46tEI
 pulp_python/app/replica.py,sha256=qiWRP7tM_v4yP_XLIQfumfGolru-Jt6ZA0KVb-9g2cA,1882
 pulp_python/app/serializers.py,sha256=19viBO88VTKWfw9xaNpkPPQrxUmNnWiXAVJxigr0qNA,35110
 pulp_python/app/settings.py,sha256=Cyc_p6U0HQjKpyrRL6JFrK3R7RMQJ9MAgNMJCfzPEiA,255
-pulp_python/app/urls.py,sha256=p784I54JxOFXOg9dcXXimbnXQWvYfSLwjw3Qopib9Pw,1573
+pulp_python/app/urls.py,sha256=szPHGWrxaWwMZ0QEsftAyFwisEMFfusfDS4lcYEt4nU,2064
 pulp_python/app/utils.py,sha256=13jUDe8BwfuN1m3-pAJ8Kip0vixQTHAiZZIn7xl0YUo,27786
 pulp_python/app/viewsets.py,sha256=9ySqQFtpheVVYTLQ9LRRmr99zVHIOfHwYhFBnsqry28,36385
 pulp_python/app/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -43,11 +43,12 @@ pulp_python/app/migrations/0023_packageyank.py,sha256=357fqSNK-D1OvI9RynnyMMrXJt
 pulp_python/app/migrations/0024_pythonrepository_error_on_reject.py,sha256=p10wp0OEVA7m-ZpuzlqsJg9dEbf4cF6kow9AfK37JU8,348
 pulp_python/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/app/pypi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pulp_python/app/pypi/feeds.py,sha256=KReO4_HPzw1Pf_A2lv19Yfia-k2mfDzFMuo3-kvdH7g,8985
 pulp_python/app/pypi/serializers.py,sha256=VDV4REMltZr98bxulgOGoGLnBxUtDod0t1fg_lDFpcs,5601
-pulp_python/app/pypi/views.py,sha256=m5_b_MLoSNhwZ64UpQKOzmlaAA7nCfKU_4r1RFY3jnA,26252
+pulp_python/app/pypi/views.py,sha256=9smlBKDtSNTDH5heuKTkAoW4qVGejIkZbdzhijYcVJs,26917
 pulp_python/app/tasks/__init__.py,sha256=JplOj2JtE_i4sQYqV7JnDY7zkraU_KlsCaNnYYaZ1x4,346
 pulp_python/app/tasks/publish.py,sha256=bjsJzqJbLu7TF5rLb-UsZMmlNnc_LKw-sdHX9Gcatbw,4334
-pulp_python/app/tasks/repair.py,sha256=5InzdbjW8y3AC4Vj2PsNLm3wGGTr8D3LcfPw_WA2Fks,12257
+pulp_python/app/tasks/repair.py,sha256=suvpn7VLGx_B-mixjQWdiHPDy8FclLQ6IwjcL9PeIpU,12603
 pulp_python/app/tasks/sync.py,sha256=pgiw6R142ynN-lVocyOYDmokklMJFWeH9xAgwXan9a8,13363
 pulp_python/app/tasks/upload.py,sha256=HBOknlsAb0mlE-2dJsalH_8JUZwrKk4AsVibmVJf2aQ,6102
 pulp_python/app/tasks/vulnerability_report.py,sha256=0cyxNb4048HFUdUlGBA6wYsg-hEMjSfE8mtw05Ct9BQ,1126
@@ -72,10 +73,11 @@ pulp_python/tests/functional/api/test_download_content.py,sha256=5IuaHXyLakPkjm5
 pulp_python/tests/functional/api/test_export_import.py,sha256=rHns9wdaeP-vtfW_qoGHU9EVuJ4YuWE0-rjl_8otAgU,4530
 pulp_python/tests/functional/api/test_full_mirror.py,sha256=v0nSlGKGSycFqZM4opCTHVtbmCfo_Y5y3k_6Rm7eBF8,12058
 pulp_python/tests/functional/api/test_pypi_apis.py,sha256=iZnoSN2wCczXh14KJDH8pSDTygjs0kgZsYIcIYS5TP8,13647
+pulp_python/tests/functional/api/test_pypi_feeds.py,sha256=RmeWEwH3-XOTkeYziClLZhF3CM8p2BXdY8MmQs7MIg4,5424
 pulp_python/tests/functional/api/test_pypi_simple_api.py,sha256=tOUl8WXgJkMoxGyLbA-WorCxIRKfGWM-27_dK_Jc0Q4,7171
 pulp_python/tests/functional/api/test_rbac.py,sha256=-xNWqvKKU-v1uC6tCRGBK0aWaff25K9C-AfzQkdHhhI,10513
 pulp_python/tests/functional/api/test_repair.py,sha256=4FR7jx_LA2K-pnRJXKkhq-1uUoWXST1leZ9XdyhGM2U,12909
-pulp_python/tests/functional/api/test_simple_cache.py,sha256=kJ9mwJKf9A-RthLzPZi0rjRQlygEkWsV6jAaAR8aYgc,4944
+pulp_python/tests/functional/api/test_simple_cache.py,sha256=jTEvn1qUjtzbG0qi_57J0yk_CQGe_0L31_0giwz7hbY,11141
 pulp_python/tests/functional/api/test_sync.py,sha256=TTHR1CpZeRoD97RKxj2pZPsP0OS9ibYKGPOh1WfKISg,13801
 pulp_python/tests/functional/api/test_upload.py,sha256=f21Li9agJ5fdBqErVg1j6v5FDVdazB5mNClmGOjLUq8,5981
 pulp_python/tests/functional/api/test_version_specifier_filter.py,sha256=nmnBbhwxCEmcHOyFbS1uvemar67sONBGM9SsNn79LCc,1063
@@ -83,9 +85,9 @@ pulp_python/tests/functional/api/test_vulnerability_report.py,sha256=Rv492Wrvu1F
 pulp_python/tests/functional/api/test_yank.py,sha256=qyZbAJ6bJO-4LPkVfVxKuWFjypJ8BmBrCnLo0luAhVk,11913
 pulp_python/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_python/tests/unit/test_models.py,sha256=TBI0yKsrdbnJSPeBFfxSqhXK7zaNvR6qg5JehGH3Pds,229
-pulp_python-3.34.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_python-3.34.0.dist-info/METADATA,sha256=CmHI0GXc46uJorUum6Hfd4Em4doAL8o5iUZ4hbFBjWU,1744
-pulp_python-3.34.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-pulp_python-3.34.0.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
-pulp_python-3.34.0.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
-pulp_python-3.34.0.dist-info/RECORD,,
+pulp_python-3.36.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_python-3.36.0.dist-info/METADATA,sha256=0ZFTpj5vGEaHBSEpJnhAb0o8_bFwUZtjUVc2rknfhf4,1744
+pulp_python-3.36.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+pulp_python-3.36.0.dist-info/entry_points.txt,sha256=HvqLEXjw_dS5jqAwnE5JiRZFE6f-y5SRtitKLPml2To,115
+pulp_python-3.36.0.dist-info/top_level.txt,sha256=X0hXgXc_bpbiKqVrkt8jD5_QEiQviKbHDwveQcOcJjo,12
+pulp_python-3.36.0.dist-info/RECORD,,