Bug 1503483 - Convert redirects to absolute path

Author: kyoshino

Bugzilla.pm

@@ -303,11 +303,9 @@ sub login {
       my $self_url     = trim($cgi->self_url);
       my $sig_type     = 'prev_url:' . $authenticated_user->id;
       my $self_url_sig = issue_hash_sig($sig_type, $self_url);
-      my $redir_url
-        = URI->new(Bugzilla->localconfig->{urlbase} . "reset_password.cgi");
+      my $redir_url    = URI->new('reset_password.cgi');
       $redir_url->query_form(prev_url => $self_url, prev_url_sig => $self_url_sig);
-      print $cgi->redirect($redir_url);
-      exit;
+      $cgi->base_redirect($redir_url->as_string);
     }
   }
   elsif (!i_am_webservice()
@@ -329,8 +327,7 @@ sub login {
 
     if ($grace_period == 0 || $expired) {
       if (!($on_mfa_page || $on_token_page || $do_logout)) {
-        print Bugzilla->cgi->redirect("userprefs.cgi?tab=mfa");
-        exit;
+        $cgi->base_redirect('userprefs.cgi?tab=mfa');
       }
     }
     else {

Bugzilla/App/Plugin/Glue.pm

@@ -73,7 +73,7 @@ sub register {
       my ($c, $type) = @_;
 
       if ($type == LOGIN_REQUIRED) {
-        $c->redirect_to('/login');
+        $c->redirect_to(Bugzilla->localconfig->{basepath} . 'login');
         return undef;
       }
       else {

Bugzilla/CGI.pm

@@ -885,6 +885,15 @@ sub redirect_to_urlbase {
   exit;
 }
 
+sub base_redirect {
+  my ($self, $path, $is_perm) = @_;
+  print $self->redirect(
+    -location => Bugzilla->localconfig->{basepath} . ($path || ''),
+    -status   => $is_perm ? '301 Moved Permanently' : '302 Found'
+  );
+  exit;
+}
+
 sub url_is_attachment_base {
   my ($self, $id) = @_;
   return 0 if !use_attachbase() or !i_am_cgi();
@@ -1042,6 +1051,11 @@ instead of calling this directly.
 
 Redirects from the current URL to one prefixed by the urlbase parameter.
 
+=item C<base_redirect>
+
+Redirects to the given path relative to the `basepath` parameter which is
+typically the root (`/`).
+
 =item C<set_dated_content_disp>
 
 Sets an appropriate date-dependent value for the Content Disposition header

Bugzilla/MFA.pm

@@ -89,8 +89,7 @@ sub verify_token {
   my $event = get_token_extra_data($token);
   delete_token($token);
   if (!$event) {
-    print Bugzilla->cgi->redirect('index.cgi');
-    exit;
+    Bugzilla->cgi->base_redirect();
   }
   return $event;
 }

Bugzilla/Search/Quicksearch.pm

@@ -282,11 +282,8 @@ sub quicksearch {
   my $modified_query_string = $cgi->canonicalise_query(@params_to_strip);
 
   if ($cgi->param('load')) {
-    my $urlbase = Bugzilla->localconfig->{urlbase};
-
     # Param 'load' asks us to display the query in the advanced search form.
-    print $cgi->redirect(
-      -uri => "${urlbase}query.cgi?format=advanced&" . $modified_query_string);
+    $cgi->base_redirect("query.cgi?format=advanced&$modified_query_string");
   }
 
   # Otherwise, pass the modified query string to the caller.
@@ -333,9 +330,7 @@ sub _bug_numbers_only {
   if ($searchstring !~ /,/ && !i_am_webservice()) {
 
     # Single bug number; shortcut to show_bug.cgi.
-    print $cgi->redirect(
-      -uri => Bugzilla->localconfig->{urlbase} . "show_bug.cgi?id=$searchstring");
-    exit;
+    $cgi->base_redirect("show_bug.cgi?id=$searchstring");
   }
   else {
     # List of bug numbers.

attachment.cgi

@@ -266,8 +266,7 @@ sub get_attachment {
         unless ($userid && $valid_token) {
 
           # Not a valid token.
-          print $cgi->redirect('-location' => Bugzilla->localconfig->{urlbase} . $path);
-          exit;
+          $cgi->base_redirect($path);
         }
 
         # Change current user without creating cookies.
@@ -389,12 +388,10 @@ sub view {
     {do_redirect => \$do_redirect});
 
   if ($do_redirect) {
-    my $uri = URI->new(Bugzilla->localconfig->{urlbase} . 'attachment.cgi');
+    my $uri = URI->new('attachment.cgi');
     $uri->query_param(id => $attachment->id);
     $uri->query_param(content_type => $contenttype) if $contenttype_override;
-
-    print $cgi->redirect('-location' => $uri);
-    exit 0;
+    $cgi->base_redirect($uri->as_string);
   }
 
   # Don't send a charset header with attachments--they might not be UTF-8.

chart.cgi

@@ -62,10 +62,8 @@ if (!Bugzilla->feature('new_charts')) {
 # Go back to query.cgi if we are adding a boolean chart parameter.
 if (grep(/^cmd-/, $cgi->param())) {
   my $params = $cgi->canonicalise_query("format", "ctype", "action");
-  print $cgi->redirect("query.cgi?format="
-      . $cgi->param('query_format')
-      . ($params ? "&$params" : ""));
-  exit;
+  $cgi->base_redirect("query.cgi?format="
+      . $cgi->param('query_format') . ($params ? "&$params" : ''));
 }
 
 my $action    = $cgi->param('action');
@@ -87,8 +85,7 @@ $action ||= "assemble";
 # Go to buglist.cgi if we are doing a search.
 if ($action eq "search") {
   my $params = $cgi->canonicalise_query("format", "ctype", "action");
-  print $cgi->redirect("buglist.cgi" . ($params ? "?$params" : ""));
-  exit;
+  $cgi->base_redirect('buglist.cgi' . ($params ? "?$params" : ""));
 }
 
 $user->in_group(Bugzilla->params->{"chartgroup"}) || ThrowUserError(
@@ -224,11 +221,9 @@ elsif ($action eq "convert_search") {
     my $params = new Bugzilla::CGI($query->edit_link);
 
     # These two parameters conflict with the one below.
-    $url = $params->canonicalise_query('format', 'query_format');
-    $url = '&' . html_quote($url);
+    $url = '&' . $params->canonicalise_query('format', 'query_format');
   }
-  print $cgi->redirect(-location => Bugzilla->localconfig->{urlbase}
-      . "query.cgi?format=create-series$url");
+  $cgi->base_redirect("query.cgi?format=create-series$url");
 }
 else {
   ThrowUserError('unknown_action', {action => $action});

colchange.cgi

@@ -139,15 +139,7 @@ if (defined $cgi->param('rememberedquery')) {
 
   my $params = new Bugzilla::CGI($cgi->param('rememberedquery'));
   $params->param('columnlist', join(",", @collist));
-  $vars->{'redirect_url'} = "buglist.cgi?" . $params->query_string();
-
-  # If we're running on Microsoft IIS, $cgi->redirect discards
-  # the Set-Cookie lines. In mod_perl, $cgi->redirect with cookies
-  # causes the page to be rendered as text/plain.
-  # Workaround is to use the old-fashioned  redirection mechanism.
-  # See bug 214466 and bug 376044 for details.
-  print $cgi->redirect($vars->{'redirect_url'});
-  exit;
+  $cgi->base_redirect('buglist.cgi?' . $params->query_string());
 }
 
 if (defined $cgi->param('columnlist')) {

extensions/BMO/Extension.pm

@@ -230,7 +230,7 @@ sub page_before_template {
     Bugzilla::Extension::BMO::Reports::Internship::report($vars);
   }
   elsif ($page eq 'email_queue.html') {
-    print Bugzilla->cgi->redirect('view_job_queue.cgi');
+    Bugzilla->cgi->base_redirect('view_job_queue.cgi');
   }
   elsif ($page eq 'release_tracking_report.html') {
     require Bugzilla::Extension::BMO::Reports::ReleaseTracking;
@@ -305,8 +305,7 @@ sub bounty_attachment {
 
     Bugzilla::BugMail::Send($bug->id, {changer => $user});
 
-    print Bugzilla->cgi->redirect('show_bug.cgi?id=' . $bug->id);
-    exit;
+    Bugzilla->cgi->base_redirect('show_bug.cgi?id=' . $bug->id);
   }
 
   if ($attachment) {

extensions/BMO/lib/Reports/Groups.pm

@@ -84,8 +84,7 @@ sub membership_report {
   my $who = $cgi->param('who');
   if (!defined($who) || $who eq '') {
     if ($page eq 'group_membership.txt') {
-      print $cgi->redirect("page.cgi?id=group_membership.html&output=txt");
-      exit;
+      $cgi->base_redirect('page.cgi?id=group_membership.html&output=txt');
     }
     $vars->{'output'} = $cgi->param('output');
     return;