repobrowse: fix redirects with query string

We need to preserve the query string to avoid breakage.

diff --git a/lib/PublicInbox/Repobrowse.pm b/lib/PublicInbox/Repobrowse.pm
index cc18255dc24306181c3f09842aa7046bbb7ac322..219b44d6b0919f3d97cc846184992b66244e0679 100644 (file)
--- a/lib/PublicInbox/Repobrowse.pm
+++ b/lib/PublicInbox/Repobrowse.pm
@@ -52,10 +52,14 @@ sub no_tslash {
                $base =~ s!/+\z!!;
                $uri = $cgi->request_uri;
        }
+       my $qs = '';
+       if ($uri =~ s/(\?.+)\z//) {
+               $qs = $1;
+       }
        if ($uri !~ s!/+\z!!) {
                warn "W: buggy redirect? base=$base request_uri=$uri\n";
        }
-       my $url = $base . $uri;
+       my $url = $base . $uri . $qs;
        [ 301,
          [ Location => $url, 'Content-Type' => 'text/plain' ],
          [ "Redirecting to $url\n" ] ]

diff --git a/t/repobrowse.t b/t/repobrowse.t
new file mode 100644 (file)
index 0000000..de8a795
--- /dev/null
+++ b/t/repobrowse.t
@@ -0,0 +1,21 @@
+# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+
+my $test = require './t/repobrowse_common_git.perl';
+test_psgi($test->{app}, sub {
+       my ($cb) = @_;
+       my $req = 'http://example.com/test.git/tree/dir';
+       my $res = $cb->(GET($req . '/'));
+       is($res->code, 301, 'got 301 with trailing slash');
+       is($res->header('Location'), $req, 'redirected without tslash');
+
+       my $q = '?id=deadbeef';
+
+       $res = $cb->(GET($req . "/$q"));
+       is($res->code, 301, 'got 301 with trailing slash + query string');
+       is($res->header('Location'), $req.$q, 'redirected without tslash');
+});
+
+done_testing();