From eb4c66e1eb3bc92ffa0809df6d508f880809e496 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 3 Dec 2021 13:15:56 -0700
Subject: [PATCH] Disable image-serve MultiViews

The MultiViews configuration for manifests is causing the wrong
manifest data being returned for some tags.  This change removes the
MultiViews configuration and moves the configuration we used to put into
an .htaccess file into the image serve apache configuration.  The
manifest requests should no longer trigger the .htaccess configuration
but the .htaccess for the actual metadata file should still be returned
with this change.

Change-Id: Ifd86b50e308bca0b8fd4ddb870b289dde8dbe046
Closes-Bug: #1953198
(cherry picked from commit 419f3166a31f1f13d7ca64815bd093bd0df45351)
---
 .../templates/image-serve.conf.j2             | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2 b/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2
index 45af37c22..45c04401b 100644
--- a/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2
+++ b/tripleo_ansible/roles/tripleo_image_serve/templates/image-serve.conf.j2
@@ -22,6 +22,25 @@ Listen {{ tripleo_container_registry_port }}
         Header set Docker-Distribution-Api-Version registry/2.0
     </Directory>
 
+    # LP#1953198 / rhbz#2026654
+    <LocationMatch "^/v2/.*/.*/manifests/(?!sha256:).*$">
+        Options FollowSymLinks
+        AllowOverride None
+        AddHandler type-map .type-map
+        RewriteEngine On
+        ReWriteCond %{REQUEST_URI} !(\.json|\.type-map)$
+        RewriteRule ^(.*) $1.type-map [PT,L]
+    </LocationMatch>
+
+    <LocationMatch "^/v2/.*/manifests/(?!sha256:).*$">
+        Options FollowSymLinks
+        AllowOverride None
+        AddHandler type-map .type-map
+        RewriteEngine On
+        ReWriteCond %{REQUEST_URI} !(\.json|\.type-map)$
+        RewriteRule ^(.*) $1.type-map [PT,L]
+    </LocationMatch>
+
     <LocationMatch "^/v2/.*/.*/blobs/sha256:.*$">
         SetEnvIf Request_URI "sha256:(.*)$" digest=sha256:$1
         Header set Docker-Content-Digest "%{digest}e"