X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWWW.pm;h=c4509bd95649ae2f8caa31c26600ef5b1bb0d2bf;hb=e158d56a54d3c6d4890aa6ac4caa28a834279af0;hp=527d2131a27f894c9e68678e53a34318508a674d;hpb=ded3c261112acf925567507959319a8442a3b647;p=public-inbox.git

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 527d2131..c4509bd9 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -1,6 +1,8 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 #
+# Main web interface for mailing list archives
+#
 # We focus on the lowest common denominators here:
 # - targeted at text-only console browsers (w3m, links, etc..)
 # - Only basic HTML, CSS only for line-wrapping <pre> text content for GUIs
@@ -11,63 +13,103 @@ package PublicInbox::WWW;
 use 5.008;
 use strict;
 use warnings;
+use Plack::Request;
 use PublicInbox::Config;
+use PublicInbox::Hval;
 use URI::Escape qw(uri_escape_utf8 uri_unescape);
-use constant SSOMA_URL => 'http://ssoma.public-inbox.org/';
-use constant PI_URL => 'http://public-inbox.org/';
-our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
-our $pi_config;
-BEGIN {
-	$pi_config = PublicInbox::Config->new;
+use constant SSOMA_URL => '//ssoma.public-inbox.org/';
+use constant PI_URL => '//public-inbox.org/';
+require PublicInbox::Git;
+use PublicInbox::GitHTTPBackend;
+our $INBOX_RE = qr!\A/([\w\.\-]+)!;
+our $MID_RE = qr!([^/]+)!;
+our $END_RE = qr!(T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
+our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
+
+sub new {
+	my ($class, $pi_config) = @_;
+	$pi_config ||= PublicInbox::Config->new;
+	bless { pi_config => $pi_config }, $class;
 }
 
+# backwards compatibility, do not use
 sub run {
-	my ($cgi, $method) = @_;
-	my %ctx = (cgi => $cgi, pi_config => $pi_config);
-	if ($method !~ /\AGET|HEAD\z/) {
+	my ($req, $method) = @_;
+	PublicInbox::WWW->new->call($req->env);
+}
+
+sub call {
+	my ($self, $env) = @_;
+	my $cgi = Plack::Request->new($env);
+	my $ctx = { cgi => $cgi, env => $env, www => $self,
+		pi_config => $self->{pi_config} };
+
+	# we don't care about multi-value
+	my %qp = map {
+		my ($k, $v) = split('=', $_, 2);
+		$v = '' unless defined $v;
+		$v =~ tr/+/ /;
+		($k, $v)
+	} split(/[&;]/, uri_unescape($env->{QUERY_STRING}));
+	$ctx->{qp} = \%qp;
+
+	my $path_info = $env->{PATH_INFO};
+	my $method = $env->{REQUEST_METHOD};
+
+	if ($method eq 'POST' &&
+		 $path_info =~ m!$INBOX_RE/(git-upload-pack)\z!) {
+		my $path = $2;
+		return (invalid_inbox($self, $ctx, $1) ||
+			serve_git($env, $ctx->{git}, $path));
+	}
+	elsif ($method !~ /\AGET|HEAD\z/) {
 		return r(405, 'Method Not Allowed');
 	}
-	my $path_info = $cgi->path_info;
 
 	# top-level indices and feeds
 	if ($path_info eq '/') {
 		r404();
-	} elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
-		invalid_list(\%ctx, $1) || redirect_list_index($cgi);
-	} elsif ($path_info =~ m!$LISTNAME_RE(?:/|/index\.html)?\z!o) {
-		invalid_list(\%ctx, $1) || get_index(\%ctx);
-	} elsif ($path_info =~ m!$LISTNAME_RE/atom\.xml\z!o) {
-		invalid_list(\%ctx, $1) || get_atom(\%ctx);
-
-	# single-message pages
-	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\.txt\z!o) {
-		invalid_list_mid(\%ctx, $1, $2) || get_mid_txt(\%ctx);
-	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\.html\z!o) {
-		invalid_list_mid(\%ctx, $1, $2) || get_mid_html(\%ctx);
-
-	# full-message page
-	} elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\.html\z!o) {
-		invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx);
-
-	# thread display
-	} elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)\.html\z!o) {
-		invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx);
-
-	} elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)\.mbox(\.gz)?\z!o) {
-		my $sfx = $3;
-		invalid_list_mid(\%ctx, $1, $2) ||
-			get_thread_mbox(\%ctx, $sfx);
-
-	} elsif ($path_info =~ m!$LISTNAME_RE/f/\S+\.txt\z!o) {
-		invalid_list_mid(\%ctx, $1, $2) || redirect_mid_txt(\%ctx);
-
-	# convenience redirects, order matters
-	} elsif ($path_info =~ m!$LISTNAME_RE/(m|f|t|s)/(\S+)\z!o) {
-		my $pfx = $2;
-		invalid_list_mid(\%ctx, $1, $3) || redirect_mid(\%ctx, $2);
+	} elsif ($path_info =~ m!$INBOX_RE\z!o) {
+		invalid_inbox($self, $ctx, $1) || r301($ctx, $1);
+	} elsif ($path_info =~ m!$INBOX_RE(?:/|/index\.html)?\z!o) {
+		invalid_inbox($self, $ctx, $1) || get_index($ctx);
+	} elsif ($path_info =~ m!$INBOX_RE/(?:atom\.xml|new\.atom)\z!o) {
+		invalid_inbox($self, $ctx, $1) || get_atom($ctx);
+	} elsif ($path_info =~ m!$INBOX_RE/new\.html\z!o) {
+		invalid_inbox($self, $ctx, $1) || get_new($ctx);
+	} elsif ($path_info =~ m!$INBOX_RE/
+				($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
+		my $path = $2;
+		invalid_inbox($self, $ctx, $1) ||
+			serve_git($env, $ctx->{git}, $path);
+	} elsif ($path_info =~ m!$INBOX_RE/([\w-]+).mbox\.gz\z!o) {
+		serve_mbox_range($self, $ctx, $1, $2);
+	} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/$END_RE\z!o) {
+		msg_page($self, $ctx, $1, $2, $3);
+
+	} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/$ATTACH_RE\z!o) {
+		my ($idx, $fn) = ($3, $4);
+		invalid_inbox_mid($self, $ctx, $1, $2) ||
+			get_attach($ctx, $idx, $fn);
+	# in case people leave off the trailing slash:
+	} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(T|t)\z!o) {
+		my ($inbox, $mid, $suffix) = ($1, $2, $3);
+		$suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
+		r301($ctx, $inbox, $mid, $suffix);
+
+	} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/R/?\z!o) {
+		my ($inbox, $mid) = ($1, $2);
+		r301($ctx, $inbox, $mid, '#R');
+
+	} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/f/?\z!o) {
+		r301($ctx, $1, $2);
+
+	# convenience redirects order matters
+	} elsif ($path_info =~ m!$INBOX_RE/([^/]{2,})\z!o) {
+		r301($ctx, $1, $2);
 
 	} else {
-		r404();
+		legacy_redirects($self, $ctx, $path_info);
 	}
 }
 
@@ -76,223 +118,174 @@ sub preload {
 	require PublicInbox::Feed;
 	require PublicInbox::View;
 	require PublicInbox::Thread;
-	require PublicInbox::GitCatFile;
 	require Email::MIME;
 	require Digest::SHA;
 	require POSIX;
 
-	eval {
-		require PublicInbox::Search;
-		require PublicInbox::Mbox;
-		require IO::Compress::Gzip;
-	};
+	foreach (qw(PublicInbox::Search PublicInbox::SearchView
+			PublicInbox::Mbox IO::Compress::Gzip
+			PublicInbox::NewsWWW)) {
+		eval "require $_;";
+	}
 }
 
 # private functions below
 
-sub r404 { r(404, 'Not Found') }
+sub r404 {
+	my ($ctx) = @_;
+	if ($ctx && $ctx->{mid}) {
+		require PublicInbox::ExtMsg;
+		searcher($ctx);
+		return PublicInbox::ExtMsg::ext_msg($ctx);
+	}
+	r(404, 'Not Found');
+}
 
 # simple response for errors
 sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
 
 # returns undef if valid, array ref response if invalid
-sub invalid_list {
-	my ($ctx, $listname) = @_;
-	my $git_dir = $pi_config->get($listname, "mainrepo");
-	if (defined $git_dir) {
-		$ctx->{git_dir} = $git_dir;
-		$ctx->{listname} = $listname;
+sub invalid_inbox {
+	my ($self, $ctx, $inbox) = @_;
+	my $obj = $ctx->{pi_config}->lookup_name($inbox);
+	if (defined $obj) {
+		$ctx->{git_dir} = $obj->{mainrepo};
+		$ctx->{git} = $obj->git;
+		# for PublicInbox::HTTP::weaken_task:
+		$ctx->{cgi}->{env}->{'pi-httpd.inbox'} = $obj;
+		$ctx->{-inbox} = $obj;
+		$ctx->{inbox} = $inbox;
 		return;
 	}
-	r404();
+
+	# sometimes linkifiers (not ours!) screw up automatic link
+	# generation and link things intended for nntp:// to https?://,
+	# so try to infer links and redirect them to the appropriate
+	# list URL.
+	$self->news_www->call($ctx->{cgi}->{env});
 }
 
 # returns undef if valid, array ref response if invalid
-sub invalid_list_mid {
-	my ($ctx, $listname, $mid) = @_;
-	my $ret = invalid_list($ctx, $listname, $mid);
-	$ctx->{mid} = uri_unescape($mid) unless $ret;
-	$ret;
+sub invalid_inbox_mid {
+	my ($self, $ctx, $inbox, $mid) = @_;
+	my $ret = invalid_inbox($self, $ctx, $inbox);
+	return $ret if $ret;
+
+	$ctx->{mid} = $mid = uri_unescape($mid);
+	if ($mid =~ /\A[a-f0-9]{40}\z/) {
+		# this is horiffically wasteful for legacy URLs:
+		if ($mid = mid2blob($ctx)) {
+			require Email::Simple;
+			use PublicInbox::MID qw/mid_clean/;
+			my $s = Email::Simple->new($mid);
+			$ctx->{mid} = mid_clean($s->header('Message-ID'));
+		}
+	}
+	undef;
 }
 
-# /$LISTNAME/atom.xml                       -> Atom feed, includes replies
+# /$INBOX/new.atom                     -> Atom feed, includes replies
 sub get_atom {
 	my ($ctx) = @_;
 	require PublicInbox::Feed;
 	PublicInbox::Feed::generate($ctx);
 }
 
-# /$LISTNAME/?r=$GIT_COMMIT                 -> HTML only
+# /$INBOX/new.html			-> HTML only
+sub get_new {
+	my ($ctx) = @_;
+	require PublicInbox::Feed;
+	PublicInbox::Feed::new_html($ctx);
+}
+
+# /$INBOX/?r=$GIT_COMMIT                 -> HTML only
 sub get_index {
 	my ($ctx) = @_;
 	require PublicInbox::Feed;
 	my $srch = searcher($ctx);
 	footer($ctx);
-	PublicInbox::Feed::generate_html_index($ctx);
+	if ($ctx->{env}->{QUERY_STRING} =~ /(?:\A|[&;])q=/) {
+		require PublicInbox::SearchView;
+		PublicInbox::SearchView::sres_top_html($ctx);
+	} else {
+		PublicInbox::Feed::generate_html_index($ctx);
+	}
 }
 
 # just returns a string ref for the blob in the current ctx
 sub mid2blob {
 	my ($ctx) = @_;
-	require PublicInbox::MID;
-	my $path = PublicInbox::MID::mid2path($ctx->{mid});
-	my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
-			qw(cat-file blob), "HEAD:$path");
-	my $pid = open my $fh, '-|';
-	defined $pid or die "fork failed: $!\n";
-	if ($pid == 0) {
-		open STDERR, '>', '/dev/null'; # ignore errors
-		exec @cmd or die "exec failed: $!\n";
-	} else {
-		my $blob = eval { local $/; <$fh> };
-		close $fh;
-		$? == 0 ? \$blob : undef;
-	}
+	$ctx->{-inbox}->msg_by_mid($ctx->{mid});
 }
 
-# /$LISTNAME/m/$MESSAGE_ID.txt                    -> raw mbox
+# /$INBOX/$MESSAGE_ID/raw                    -> raw mbox
 sub get_mid_txt {
 	my ($ctx) = @_;
-	my $x = mid2blob($ctx) or return r404();
+	my $x = mid2blob($ctx) or return r404($ctx);
 	require PublicInbox::Mbox;
-	PublicInbox::Mbox::emit1($x);
+	PublicInbox::Mbox::emit1($ctx, $x);
 }
 
-# /$LISTNAME/m/$MESSAGE_ID.html                   -> HTML content (short quotes)
+# /$INBOX/$MESSAGE_ID/                   -> HTML content (short quotes)
 sub get_mid_html {
 	my ($ctx) = @_;
-	my $x = mid2blob($ctx) or return r404();
-
-	require PublicInbox::View;
-	my $pfx = msg_pfx($ctx);
-	my $foot = footer($ctx);
-	require Email::MIME;
-	my $mime = Email::MIME->new($x);
-	searcher($ctx);
-	[ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
-	  [ PublicInbox::View::msg_html($ctx, $mime, $pfx, $foot) ] ];
-}
-
-# /$LISTNAME/f/$MESSAGE_ID.html                   -> HTML content (fullquotes)
-sub get_full_html {
-	my ($ctx) = @_;
-	my $x = mid2blob($ctx) or return r404();
+	my $x = mid2blob($ctx) or return r404($ctx);
 
 	require PublicInbox::View;
 	my $foot = footer($ctx);
 	require Email::MIME;
 	my $mime = Email::MIME->new($x);
 	searcher($ctx);
-	[ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
-	  [ PublicInbox::View::msg_html($ctx, $mime, undef, $foot)] ];
+	PublicInbox::View::msg_html($ctx, $mime, $foot);
 }
 
-# /$LISTNAME/t/$MESSAGE_ID.html
+# /$INBOX/$MESSAGE_ID/t/
 sub get_thread {
-	my ($ctx) = @_;
-	my $srch = searcher($ctx) or return need_search($ctx);
+	my ($ctx, $flat) = @_;
+	searcher($ctx) or return need_search($ctx);
+	$ctx->{flat} = $flat;
 	require PublicInbox::View;
-	my $foot = footer($ctx);
-	PublicInbox::View::thread_html($ctx, $foot, $srch);
-}
-
-sub self_url {
-	my ($cgi) = @_;
-	ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
-}
-
-sub redirect_list_index {
-	my ($cgi) = @_;
-	do_redirect(self_url($cgi) . "/");
-}
-
-sub redirect_mid {
-	my ($ctx, $pfx) = @_;
-	my $url = self_url($ctx->{cgi});
-	my $anchor = '';
-	if (lc($pfx) eq 't') {
-		$anchor = '#u'; # <u id='#u'> is used to highlight in View.pm
-	}
-	do_redirect($url . ".html$anchor");
-}
-
-# only hit when somebody tries to guess URLs manually:
-sub redirect_mid_txt {
-	my ($ctx, $pfx) = @_;
-	my $listname = $ctx->{listname};
-	my $url = self_url($ctx->{cgi});
-	$url =~ s!/$listname/f/(\S+\.txt)\z!/$listname/m/$1!;
-	do_redirect($url);
-}
-
-sub do_redirect {
-	my ($url) = @_;
-	[ 301,
-	  [ Location => $url, 'Content-Type' => 'text/plain' ],
-	  [ "Redirecting to $url\n" ]
-	]
+	PublicInbox::View::thread_html($ctx);
 }
 
 sub ctx_get {
 	my ($ctx, $key) = @_;
 	my $val = $ctx->{$key};
-	(defined $val && length $val) or die "BUG: bad ctx, $key unusable\n";
+	(defined $val && $val ne '') or die "BUG: bad ctx, $key unusable";
 	$val;
 }
 
-sub try_cat {
-	my ($path) = @_;
-	my $rv;
-	if (open(my $fh, '<', $path)) {
-		local $/;
-		$rv = <$fh>;
-		close $fh;
-	}
-	$rv;
-}
-
 sub footer {
 	my ($ctx) = @_;
 	return '' unless $ctx;
-	my $git_dir = ctx_get($ctx, 'git_dir');
-
-	# favor user-supplied footer
-	my $footer = try_cat("$git_dir/public-inbox/footer.html");
-	if (defined $footer) {
-		chomp $footer;
-		$ctx->{footer} = $footer;
-		return $footer;
-	}
+	my $obj = $ctx->{-inbox} or return '';
 
 	# auto-generate a footer
-	my $listname = ctx_get($ctx, 'listname');
-	my $desc = try_cat("$git_dir/description");
-	$desc = '$GIT_DIR/description missing' unless defined $desc;
-	chomp $desc;
-
-	my $urls = try_cat("$git_dir/cloneurl");
-	my @urls = split(/\r?\n/, $urls || '');
-	my $nurls = scalar @urls;
-	if ($nurls == 0) {
-		$urls = '($GIT_DIR/cloneurl missing)';
-	} elsif ($nurls == 1) {
-		$urls = "git URL for <a\nhref=\"" . SSOMA_URL .
-			'">ssoma</a>: ' . $urls[0];
+	chomp(my $desc = $obj->description);
+	$desc = PublicInbox::Hval::ascii_html($desc);
+
+	my $urls;
+	my @urls = @{$obj->cloneurl};
+	my %seen = map { $_ => 1 } @urls;
+	my $cgi = $ctx->{cgi};
+	my $http = $cgi->base->as_string . $obj->{name};
+	$seen{$http} or unshift @urls, $http;
+	my $ssoma_url = PublicInbox::Hval::prurl($ctx->{env}, SSOMA_URL);
+	if (scalar(@urls) == 1) {
+		$urls = "URL for <a\nhref=\"" . $ssoma_url .
+			qq(">ssoma</a> or <b>git clone --mirror $urls[0]</b>);
 	} else {
-		$urls = "git URLs for <a\nhref=\"" . SSOMA_URL .
-			"\">ssoma</a>:\n" . join("\n", map { "\t$_" } @urls);
-	}
-
-	my $addr = $pi_config->get($listname, 'address');
-	if (ref($addr) eq 'ARRAY') {
-		$addr = $addr->[0]; # first address is primary
+		$urls = "URLs for <a\nhref=\"" . $ssoma_url .
+			qq(">ssoma</a> or <b>git clone --mirror</b>\n) .
+			join("\n", map { "\tgit clone --mirror $_" } @urls);
 	}
 
-	$addr = "<a\nhref=\"mailto:$addr\">$addr</a>";
-
+	my $addr = $obj->{-primary_address};
 	$ctx->{footer} = join("\n",
 		'- ' . $desc,
-		"A <a\nhref=\"" . PI_URL .  '">public-inbox</a>, ' .
+		"A <a\nhref=\"" .
+			PublicInbox::Hval::prurl($ctx->{cgi}->{env}, PI_URL) .
+			'">public-inbox</a>, ' .
 			'anybody may post in plain-text (not HTML):',
 		$addr,
 		$urls
@@ -305,7 +298,7 @@ sub searcher {
 	my ($ctx) = @_;
 	eval {
 		require PublicInbox::Search;
-		$ctx->{srch} = PublicInbox::Search->new($ctx->{git_dir});
+		$ctx->{srch} = $ctx->{-inbox}->search;
 	};
 }
 
@@ -319,14 +312,8 @@ EOF
 	[ 501, [ 'Content-Type' => 'text/html; charset=UTF-8' ], [ $msg ] ];
 }
 
-sub msg_pfx {
-	my ($ctx) = @_;
-	my $href = PublicInbox::Hval::ascii_html(uri_escape_utf8($ctx->{mid}));
-	"../f/$href.html";
-}
-
-# /$LISTNAME/t/$MESSAGE_ID.mbox           -> thread as mbox
-# /$LISTNAME/t/$MESSAGE_ID.mbox.gz        -> thread as gzipped mbox
+# /$INBOX/$MESSAGE_ID/t.mbox           -> thread as mbox
+# /$INBOX/$MESSAGE_ID/t.mbox.gz        -> thread as gzipped mbox
 # note: I'm not a big fan of other compression formats since they're
 # significantly more expensive on CPU than gzip and less-widely available,
 # especially on older systems.  Stick to zlib since that's what git uses.
@@ -337,4 +324,137 @@ sub get_thread_mbox {
 	PublicInbox::Mbox::thread_mbox($ctx, $srch, $sfx);
 }
 
+
+# /$INBOX/$MESSAGE_ID/t.atom		  -> thread as Atom feed
+sub get_thread_atom {
+	my ($ctx) = @_;
+	searcher($ctx) or return need_search($ctx);
+	$ctx->{self_url} = $ctx->{cgi}->uri->as_string;
+	require PublicInbox::Feed;
+	PublicInbox::Feed::generate_thread_atom($ctx);
+}
+
+sub legacy_redirects {
+	my ($self, $ctx, $path_info) = @_;
+
+	# single-message pages
+	if ($path_info =~ m!$INBOX_RE/m/(\S+)/\z!o) {
+		r301($ctx, $1, $2);
+	} elsif ($path_info =~ m!$INBOX_RE/m/(\S+)/raw\z!o) {
+		r301($ctx, $1, $2, 'raw');
+
+	} elsif ($path_info =~ m!$INBOX_RE/f/(\S+)/\z!o) {
+		r301($ctx, $1, $2);
+
+	# thread display
+	} elsif ($path_info =~ m!$INBOX_RE/t/(\S+)/\z!o) {
+		r301($ctx, $1, $2, 't/#u');
+
+	} elsif ($path_info =~ m!$INBOX_RE/t/(\S+)/mbox(\.gz)?\z!o) {
+		r301($ctx, $1, $2, "t.mbox$3");
+
+	# even older legacy redirects
+	} elsif ($path_info =~ m!$INBOX_RE/m/(\S+)\.html\z!o) {
+		r301($ctx, $1, $2);
+
+	} elsif ($path_info =~ m!$INBOX_RE/t/(\S+)\.html\z!o) {
+		r301($ctx, $1, $2, 't/#u');
+
+	} elsif ($path_info =~ m!$INBOX_RE/f/(\S+)\.html\z!o) {
+		r301($ctx, $1, $2);
+
+	} elsif ($path_info =~ m!$INBOX_RE/(?:m|f)/(\S+)\.txt\z!o) {
+		r301($ctx, $1, $2, 'raw');
+
+	} elsif ($path_info =~ m!$INBOX_RE/t/(\S+)(\.mbox(?:\.gz)?)\z!o) {
+		r301($ctx, $1, $2, "t$3");
+
+	# legacy convenience redirects, order still matters
+	} elsif ($path_info =~ m!$INBOX_RE/m/(\S+)\z!o) {
+		r301($ctx, $1, $2);
+	} elsif ($path_info =~ m!$INBOX_RE/t/(\S+)\z!o) {
+		r301($ctx, $1, $2, 't/#u');
+	} elsif ($path_info =~ m!$INBOX_RE/f/(\S+)\z!o) {
+		r301($ctx, $1, $2);
+
+	# some Message-IDs have slashes in them and the HTTP server
+	# may try to be clever and unescape them :<
+	} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/$END_RE\z!o) {
+		msg_page($self, $ctx, $1, $2, $3);
+
+	# in case people leave off the trailing slash:
+	} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/(T|t)\z!o) {
+		r301($ctx, $1, $2, $3 eq 't' ? 't/#u' : $3);
+	} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/f\z!o) {
+		r301($ctx, $1, $2);
+	} else {
+		$self->news_www->call($ctx->{cgi}->{env});
+	}
+}
+
+sub r301 {
+	my ($ctx, $inbox, $mid, $suffix) = @_;
+	my $cgi = $ctx->{cgi};
+	my $obj = $ctx->{-inbox};
+	unless ($obj) {
+		my $r404 = invalid_inbox($ctx->{www}, $ctx, $inbox);
+		return $r404 if $r404;
+		$obj = $ctx->{-inbox};
+	}
+	my $url = $obj->base_url($cgi);
+	my $qs = $ctx->{env}->{QUERY_STRING};
+	$url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
+	$url .= $suffix if (defined $suffix);
+	$url .= "?$qs" if $qs ne '';
+
+	[ 301,
+	  [ Location => $url, 'Content-Type' => 'text/plain' ],
+	  [ "Redirecting to $url\n" ] ]
+}
+
+sub msg_page {
+	my ($self, $ctx, $inbox, $mid, $e) = @_;
+	my $ret;
+	$ret = invalid_inbox_mid($self, $ctx, $inbox, $mid) and return $ret;
+	'' eq $e and return get_mid_html($ctx);
+	'T/' eq $e and return get_thread($ctx, 1);
+	't/' eq $e and return get_thread($ctx);
+	't.atom' eq $e and return get_thread_atom($ctx);
+	't.mbox' eq $e and return get_thread_mbox($ctx);
+	't.mbox.gz' eq $e and return get_thread_mbox($ctx, '.gz');
+	'raw' eq $e and return get_mid_txt($ctx);
+
+	# legacy, but no redirect for compatibility:
+	'f/' eq $e and return get_mid_html($ctx);
+	r404($ctx);
+}
+
+sub serve_git {
+	my ($env, $git, $path) = @_;
+	PublicInbox::GitHTTPBackend::serve($env, $git, $path);
+}
+
+sub serve_mbox_range {
+	my ($self, $ctx, $inbox, $range) = @_;
+	invalid_inbox($self, $ctx, $inbox) || eval {
+		require PublicInbox::Mbox;
+		searcher($ctx);
+		PublicInbox::Mbox::emit_range($ctx, $range);
+	}
+}
+
+sub news_www {
+	my ($self) = @_;
+	my $nw = $self->{news_www};
+	return $nw if $nw;
+	require PublicInbox::NewsWWW;
+	$self->{news_www} = PublicInbox::NewsWWW->new($self->{pi_config});
+}
+
+sub get_attach {
+	my ($ctx, $idx, $fn) = @_;
+	require PublicInbox::WwwAttach;
+	PublicInbox::WwwAttach::get_attach($ctx, $idx, $fn);
+}
+
 1;