Fix when namespace_in_path is enabled and host URL is duplicated in URL

In cases where namespace_in_path is enabled and the host URL is duplicated in the URL path, users were being redirected to a malformed URL. This fix ensures that only the namespace is selected without including the forward slash (/), preventing unwanted URL redirects.

Related: https://gitlab.com/gitlab-org/gitlab/-/issues/440465+
Changelog: fixed

Author: Naman Jagdish Gala

files/gitlab-cookbooks/gitlab-pages/libraries/gitlab_pages.rb

@@ -150,15 +150,15 @@ def parse_namespace_in_path
         if [80, 443].include?(pages_port)
           {
             "~^#{url_scheme}://(projects\\.#{Gitlab['pages_nginx']['fqdn_regex']})/(.*)$" => "#{url_scheme}://$1/$2",
-            "~^#{url_scheme}://(.*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']})/(.*)$" => "#{url_scheme}://$2/$1/$3",
-            "~^//(.*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']})/(.*)$" => "/$1/$3",
+            "~^#{url_scheme}://([^/]*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']})/(.*)$" => "#{url_scheme}://$2/$1/$3",
+            "~^//([^/]*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']})/(.*)$" => "/$1/$3",
             "~^/(.*)$" => "/$namespace/$1",
           }
         else
           {
             "~^#{url_scheme}://(projects\\.#{Gitlab['pages_nginx']['fqdn_regex']}:#{pages_port})/(.*)$" => "#{url_scheme}://$1/$2",
-            "~^#{url_scheme}://(.*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']}:#{pages_port})/(.*)$" => "#{url_scheme}://$2/$1/$3",
-            "~^//(.*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']}:#{pages_port})/(.*)$" => "/$1/$3",
+            "~^#{url_scheme}://([^/]*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']}:#{pages_port})/(.*)$" => "#{url_scheme}://$2/$1/$3",
+            "~^//([^/]*)\\.(#{Gitlab['pages_nginx']['fqdn_regex']}:#{pages_port})/(.*)$" => "/$1/$3",
             "~^/(.*)$" => "/$namespace/$1",
           }
         end

spec/chef/cookbooks/gitlab/recipes/nginx_spec.rb

@@ -919,8 +919,8 @@
           expect(content).to include('proxy_set_header Host $1.$http_host;')
           expect(content).to include('proxy_set_header X-Gitlab-Namespace-In-Path $namespace;')
           expect(content).to include('proxy_redirect ~^https://(projects\.pages\.localhost)/(.*)$ https://$1/$2;')
-          expect(content).to include('proxy_redirect ~^https://(.*)\.(pages\.localhost)/(.*)$ https://$2/$1/$3;')
-          expect(content).to include('proxy_redirect ~^//(.*)\.(pages\.localhost)/(.*)$ /$1/$3;')
+          expect(content).to include('proxy_redirect ~^https://([^/]*)\.(pages\.localhost)/(.*)$ https://$2/$1/$3;')
+          expect(content).to include('proxy_redirect ~^//([^/]*)\.(pages\.localhost)/(.*)$ /$1/$3;')
           expect(content).to include('proxy_redirect ~^/(.*)$ /$namespace/$1;')
           expect(content).to include('proxy_hide_header X-Gitlab-Namespace-In-Path;')
           # Below checks are to verify proper render entries are made
@@ -952,8 +952,8 @@
           expect(content).to include('proxy_set_header Host $1.$http_host;')
           expect(content).to include('proxy_set_header X-Gitlab-Namespace-In-Path $namespace;')
           expect(content).to include('proxy_redirect ~^https://(projects\.pages\.localhost:25800)/(.*)$ https://$1/$2;')
-          expect(content).to include('proxy_redirect ~^https://(.*)\.(pages\.localhost:25800)/(.*)$ https://$2/$1/$3;')
-          expect(content).to include('proxy_redirect ~^//(.*)\.(pages\.localhost:25800)/(.*)$ /$1/$3;')
+          expect(content).to include('proxy_redirect ~^https://([^/]*)\.(pages\.localhost:25800)/(.*)$ https://$2/$1/$3;')
+          expect(content).to include('proxy_redirect ~^//([^/]*)\.(pages\.localhost:25800)/(.*)$ /$1/$3;')
           expect(content).to include('proxy_redirect ~^/(.*)$ /$namespace/$1;')
           expect(content).to include('proxy_hide_header X-Gitlab-Namespace-In-Path;')
           # Below checks are to verify proper render entries are made
@@ -983,8 +983,8 @@
           expect(content).not_to include('proxy_set_header Host $1.$http_host;')
           expect(content).not_to include('proxy_set_header X-Gitlab-Namespace-In-Path $namespace;')
           expect(content).not_to include('proxy_redirect ~^https://(projects\.pages\.localhost)/(.*)$ https://$1/$2;')
-          expect(content).not_to include('proxy_redirect ~^https://(.*)\.(pages\.localhost)/(.*)$ https://$2/$1/$3;')
-          expect(content).not_to include('proxy_redirect ~^//(.*)\.(pages\.localhost)/(.*)$ /$1/$3;')
+          expect(content).not_to include('proxy_redirect ~^https://([^/]*)\.(pages\.localhost)/(.*)$ https://$2/$1/$3;')
+          expect(content).not_to include('proxy_redirect ~^//([^/]*)\.(pages\.localhost)/(.*)$ /$1/$3;')
           expect(content).not_to include('proxy_redirect ~^/(.*)$ /$namespace/$1;')
           expect(content).to include('proxy_hide_header X-Gitlab-Namespace-In-Path;')
           # Below checks are to verify proper render entries are made