From e70b30144eb62aba848437026bf4e3d5d5ed60c8 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Sat, 9 Jan 2016 10:53:10 +0000
Subject: www: fix redirection loops

Sometimes users forget trailing slashes; but we should not punish
them with infinite loops.
---
 lib/PublicInbox/WWW.pm |  4 +++-
 t/plack.t              | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 411db16f..d5635d84 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -47,7 +47,9 @@ sub run {
 
 	# in case people leave off the trailing slash:
 	} elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/(f|T|t)\z!o) {
-		r301($ctx, $1, $2, $3 eq 't' ? 't/#u' : $3);
+		my ($listname, $mid, $suffix) = ($1, $2, $3);
+		$suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
+		r301($ctx, $listname, $mid, $suffix);
 
 	# convenience redirects order matters
 	} elsif ($path_info =~ m!$LISTNAME_RE/([^/]{2,})\z!o) {
diff --git a/t/plack.t b/t/plack.t
index f61b3bec..b77cdba5 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -81,6 +81,30 @@ EOF
 		is($to, $res->header('Location'), 'redirect location matches');
 	});
 
+	my $pfx = 'http://example.com/test';
+	foreach my $t (qw(t T)) {
+		test_psgi($app, sub {
+			my ($cb) = @_;
+			my $u = $pfx . "/blah%40example.com/$t";
+			my $res = $cb->(GET($u));
+			is(301, $res->code, "redirect for missing /");
+			my $location = $res->header('Location');
+			like($location, qr!/\Q$t\E/#u\z!,
+				'redirected with missing /');
+		});
+	}
+	foreach my $t (qw(f)) {
+		test_psgi($app, sub {
+			my ($cb) = @_;
+			my $u = $pfx . "/blah%40example.com/$t";
+			my $res = $cb->(GET($u));
+			is(301, $res->code, "redirect for missing /");
+			my $location = $res->header('Location');
+			like($location, qr!/\Q$t\E/\z!,
+				'redirected with missing /');
+		});
+	}
+
 	test_psgi($app, sub {
 		my ($cb) = @_;
 		my $atomurl = 'http://example.com/test/new.atom';
@@ -92,7 +116,6 @@ EOF
 			'index generated');
 	});
 
-	my $pfx = 'http://example.com/test';
 	test_psgi($app, sub {
 		my ($cb) = @_;
 		my $res = $cb->(GET($pfx . '/atom.xml'));
-- 
cgit v1.2.3-24-ge0c7