X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNewsWWW.pm;h=8626cf96eaba44acee92a10a2aa3d84fcb7ab788;hb=6e6f7999361925e4c944f308df4bc32a1842cd69;hp=5357059dee21733a4d9f537f591fd0376ea5fda8;hpb=0b1c6867ee10d9edcbd75c359cb23c75b732682e;p=public-inbox.git

diff --git a/lib/PublicInbox/NewsWWW.pm b/lib/PublicInbox/NewsWWW.pm
index 5357059d..8626cf96 100644
--- a/lib/PublicInbox/NewsWWW.pm
+++ b/lib/PublicInbox/NewsWWW.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Plack app redirector for mapping /$NEWSGROUP requests to
@@ -9,7 +9,7 @@ package PublicInbox::NewsWWW;
 use strict;
 use warnings;
 use PublicInbox::Config;
-use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::MID qw(mid_escape);
 
 sub new {
 	my ($class, $pi_config) = @_;
@@ -17,65 +17,65 @@ sub new {
 	bless { pi_config => $pi_config }, $class;
 }
 
+sub redirect ($$) {
+	my ($code, $url) = @_;
+	[ $code,
+	  [ Location => $url, 'Content-Type' => 'text/plain' ],
+	  [ "Redirecting to $url\n" ] ]
+}
+
+sub try_inbox ($$) {
+	my ($ibx, $mid) = @_;
+	# do not pass $env since HTTP_HOST may differ
+	my $url = $ibx->base_url or return;
+
+	eval { $ibx->mm->num_for($mid) } or return;
+
+	# 302 since the same message may show up on
+	# multiple inboxes and inboxes can be added/reordered
+	redirect(302, $url .= mid_escape($mid) . '/');
+}
+
 sub call {
 	my ($self, $env) = @_;
-	my $ng_map = $self->newsgroup_map;
-	my $path = $env->{PATH_INFO};
-	$path =~ s!\A/+!!;
-	$path =~ s!/+\z!!;
 
 	# some links may have the article number in them:
 	# /inbox.foo.bar/123456
-	my ($ng, $article) = split(m!/+!, $path, 2);
-	if (my $info = $ng_map->{$ng}) {
-		my $url = PublicInbox::Hval::prurl($env, $info->{url});
+	my (undef, @parts) = split(m!/!, $env->{PATH_INFO});
+	my ($ng, $article) = @parts;
+	my $pi_config = $self->{pi_config};
+	if (my $ibx = $pi_config->lookup_newsgroup($ng)) {
+		my $url = PublicInbox::Hval::prurl($env, $ibx->{url});
 		my $code = 301;
 		if (defined $article && $article =~ /\A\d+\z/) {
-			my $mid = eval { ng_mid_for($ng, $info, $article) };
+			my $mid = eval { $ibx->mm->mid_for($article) };
 			if (defined $mid) {
 				# article IDs are not stable across clones,
 				# do not encourage caching/bookmarking them
 				$code = 302;
-				$url .= uri_escape_utf8($mid) . '/';
+				$url .= mid_escape($mid) . '/';
 			}
 		}
-
-		my $h = [ Location => $url, 'Content-Type' => 'text/plain' ];
-
-		return [ $code, $h, [ "Redirecting to $url\n" ] ]
+		return redirect($code, $url);
 	}
-	[ 404, [ 'Content-Type' => 'text/plain' ], [] ];
-}
 
-sub ng_mid_for {
-	my ($ng, $info, $article) = @_;
-	# may fail due to lack of Danga::Socket
-	# for defer_weaken:
-	require PublicInbox::NewsGroup;
-	$ng = $info->{ng} ||=
-		PublicInbox::NewsGroup->new($ng, $info->{git_dir}, '');
-	$ng->mm->mid_for($article);
-}
+	my $res;
+	my @try = (join('/', @parts));
 
-sub newsgroup_map {
-	my ($self) = @_;
-	my $rv;
-	$rv = $self->{ng_map} and return $rv;
-	my $pi_config = $self->{pi_config};
-	my %ng_map;
-	foreach my $k (keys %$pi_config) {
-		$k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
-		my $inbox = $1;
-		my $git_dir = $pi_config->{"publicinbox.$inbox.mainrepo"};
-		my $url = $pi_config->{"publicinbox.$inbox.url"};
-		defined $url or next;
-		my $ng = $pi_config->{"publicinbox.$inbox.newsgroup"};
-		next if (!defined $ng) || ($ng eq ''); # disabled
+	# trailing slash is in the rest of our WWW, so maybe some users
+	# will assume it:
+	if ($parts[-1] eq '') {
+		pop @parts;
+		push @try, join('/', @parts);
+	}
 
-		$url =~ m!/\z! or $url .= '/';
-		$ng_map{$ng} = { url => $url, git_dir => $git_dir };
+	foreach my $mid (@try) {
+		$pi_config->each_inbox(sub {
+			$res ||= try_inbox($_[0], $mid);
+		});
+		last if defined $res;
 	}
-	$self->{ng_map} = \%ng_map;
+	$res || [ 404, [qw(Content-Type text/plain)], ["404 Not Found\n"] ];
 }
 
 1;