Add support for CONTENT_ORIGIN=None

fixes: #1910

Author: gerrod3

.github/workflows/scripts/install.sh

@@ -110,7 +110,7 @@ if [ "$TEST" = "azure" ]; then
       - ./azurite:/etc/pulp\
     command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml
   sed -i -e '$a azure_test: true\
-pulp_scenario_settings: {"flatpak_index": true}\
+pulp_scenario_settings: {"content_origin": null, "flatpak_index": true}\
 pulp_scenario_env: {}\
 ' vars/main.yaml
 fi

CHANGES/1910.misc

@@ -0,0 +1 @@
+Added support for pulpcore 3.70 `CONTENT_ORIGIN=None` feature.

pulp_container/app/redirects.py

@@ -2,6 +2,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import redirect
 from django.http import Http404
+from urllib.parse import urljoin
 
 from pulp_container.app.exceptions import ManifestNotFound
 from pulp_container.app.utils import get_accepted_media_types
@@ -26,7 +27,9 @@ def redirect_to_content_app(self, content_type, content_id):
         Redirect to the content app.
         """
         return self.distribution.redirect_to_content_app(
-            f"{settings.CONTENT_ORIGIN}/pulp/container/{self.path}/{content_type}/{content_id}"
+            urljoin(
+                settings.CONTENT_ORIGIN, f"/pulp/container/{self.path}/{content_type}/{content_id}"
+            )
         )
 
     def issue_manifest_redirect(self, manifest):

pulp_container/app/registry_api.py

@@ -691,7 +691,8 @@ def get(self, request):
             if images:
                 results.append({"Name": distribution.base_path, "Images": images})
 
-        return Response(data={"Registry": settings.CONTENT_ORIGIN, "Results": results})
+        host = settings.CONTENT_ORIGIN or request.get_host()
+        return Response(data={"Registry": host, "Results": results})
 
 
 class FlatpakIndexStaticView(FlatpakIndexDynamicView):

template_config.yml

@@ -54,6 +54,7 @@ pulp_settings:
   flatpak_index: true
 pulp_settings_azure:
   flatpak_index: true
+  content_origin: null
 pulp_settings_gcp: null
 pulp_settings_s3:
   flatpak_index: false