Fix content index title when domains are enabled

fixes: #4253
pulp · Jun 24, 2024 · 530a9fb · 530a9fb
1 parent a0e4341
commit 530a9fb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CHANGES/4253.bugfix b/CHANGES/4253.bugfix
@@ -0,0 +1 @@
+Fixed path title at content directory index to include domain's name when enabled.
diff --git a/pulpcore/content/handler.py b/pulpcore/content/handler.py
@@ -407,6 +407,9 @@ def render_html(directory_list, path="", dates=None, sizes=None):
         """
         dates = dates or {}
         sizes = sizes or {}
+        root = path == settings.CONTENT_PATH_PREFIX
+        if root and settings.DOMAIN_ENABLED:
+            path += f"{get_domain().name}/"
         template = Template(
             """
 <html>
@@ -439,7 +442,7 @@ def render_html(directory_list, path="", dates=None, sizes=None):
             dir_list=sorted(directory_list),
             dates=dates,
             path=path,
-            root=path == settings.CONTENT_PATH_PREFIX,
+            root=root,
             sizes=sizes,
         )
 

diff --git a/pulpcore/tests/functional/api/using_plugin/test_content_directory.py b/pulpcore/tests/functional/api/using_plugin/test_content_directory.py
@@ -42,3 +42,14 @@ def test_zero_byte_file_listing(
     z_line = [i for i in response.decode("utf-8").split("\n") if i.startswith('<a href="zero">')]
     assert len(z_line) == 1
     assert z_line[0].endswith("0 Bytes")
+
+
+@pytest.mark.parallel
+def test_content_index_title(pulp_content_url, pulp_settings, http_get):
+    title = pulp_settings.CONTENT_PATH_PREFIX
+    if pulp_settings.DOMAIN_ENABLED:
+        title += "default/"
+
+    response = http_get(pulp_content_url).decode("utf-8")
+    assert f"<head><title>Index of {title}</title></head>" in response
+    assert f"<h1>Index of {title}</h1>" in response