Merge pull request #890 from crungehottman/flush-encoded-paths

Flush lowercase percent-encoded URLs [RHELDST-37769]

Author: crungehottman

exodus_gw/worker/cache.py

@@ -78,6 +78,11 @@ def _encode_path(self, path: str) -> str:
         # URL-encode a path, preserving only forward slashes.
         return quote(path, safe="/")
 
+    def _lowercase_percent_encoding(self, path: str) -> str:
+        # Convert percent-encoded hex digits to lowercase.
+        # E.g., "%2B" -> "%2b"
+        return re.sub(r"%[0-9A-F]{2}", lambda m: m.group(0).lower(), path)
+
     @property
     def urls_for_flush(self):
         out: list[str] = []
@@ -91,14 +96,22 @@ def urls_for_flush(self):
         ]
 
         for path in path_list:
-            # Generate URL-encoded path
+            # Generate URL-encoded path (uppercase by default)
             encoded_path = self._encode_path(path)
 
-            # Only include both paths if encoding changes the path
-            if path == encoded_path:
-                paths_to_flush = [path]
-            else:
-                paths_to_flush = [path, encoded_path]
+            # Start with the original path
+            paths_to_flush = [path]
+
+            # If encoding changes the path, add both uppercase and lowercase variants.
+            # Akamai's cache flush requests are case-sensitive, and some clients (e.g., dnf)
+            # request the lowercase percent-encoded path.
+            if path != encoded_path:
+                paths_to_flush.extend(
+                    [
+                        encoded_path,
+                        self._lowercase_percent_encoding(encoded_path),
+                    ]
+                )
 
             for path_variant in paths_to_flush:
                 # Figure out the templates applicable to this path

tests/worker/test_cdn_cache.py

@@ -319,22 +319,31 @@ def test_flush_cdn_cache_typical(
             "https://cdn2.example.com/root/some/kickstart/treeinfo",
             "https://cdn2.example.com/root/third/path",
             # Flush both encoded and non-encoded paths for modular RPMs
+            # Includes both uppercase (%2B) and lowercase (%2b) percent-encoding
             "https://cdn1.example.com/path/one-dest/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm",
             "https://cdn1.example.com/path/one-dest/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm",
+            "https://cdn1.example.com/path/one-dest/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm",
             "https://cdn1.example.com/path/one/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm",
             "https://cdn1.example.com/path/one/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm",
+            "https://cdn1.example.com/path/one/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm",
             "https://cdn2.example.com/root/path/one-dest/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm",
             "https://cdn2.example.com/root/path/one-dest/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm",
+            "https://cdn2.example.com/root/path/one-dest/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm",
             "https://cdn2.example.com/root/path/one/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm",
             "https://cdn2.example.com/root/path/one/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm",
+            "https://cdn2.example.com/root/path/one/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm",
             "S/=/123/4567/30d/cdn1.example.com/path/one-dest/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm cid=///",
             "S/=/123/4567/30d/cdn1.example.com/path/one-dest/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm cid=///",
+            "S/=/123/4567/30d/cdn1.example.com/path/one-dest/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm cid=///",
             "S/=/123/4567/30d/cdn1.example.com/path/one/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm cid=///",
             "S/=/123/4567/30d/cdn1.example.com/path/one/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm cid=///",
+            "S/=/123/4567/30d/cdn1.example.com/path/one/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm cid=///",
             "S/=/234/6677/30d/cdn2.example.com/other/path/one-dest/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm x/y/z",
             "S/=/234/6677/30d/cdn2.example.com/other/path/one-dest/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm x/y/z",
+            "S/=/234/6677/30d/cdn2.example.com/other/path/one-dest/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm x/y/z",
             "S/=/234/6677/30d/cdn2.example.com/other/path/one/galera-26.4.20-1.module+el9.5.0+22578+dc54e53f.x86_64.rpm x/y/z",
             "S/=/234/6677/30d/cdn2.example.com/other/path/one/galera-26.4.20-1.module%2Bel9.5.0%2B22578%2Bdc54e53f.x86_64.rpm x/y/z",
+            "S/=/234/6677/30d/cdn2.example.com/other/path/one/galera-26.4.20-1.module%2bel9.5.0%2b22578%2bdc54e53f.x86_64.rpm x/y/z",
         ]
     )