X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTP.pm;h=d314a3d1ebcf0bc74001593319b93448c203cb3d;hb=2d3fc25afe7435992236ac143039b24248c5e74d;hp=cc6534b99810489f96c1f94176e0ec4ddb7189c2;hpb=24e103d37b423c1c718e7f0f6285419005a98be5;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index cc6534b9..d314a3d1 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -483,42 +483,30 @@ sub set_nntp_headers ($$) {
 
 sub art_lookup ($$$) {
 	my ($self, $art, $code) = @_;
-	my $ng = $self->{ng};
-	my ($n, $mid);
+	my ($ibx, $n);
 	my $err;
 	if (defined $art) {
 		if ($art =~ /\A[0-9]+\z/) {
 			$err = '423 no such article number in this group';
 			$n = int($art);
-			goto find_mid;
+			goto find_ibx;
 		} elsif ($art =~ $ONE_MSGID) {
-			$mid = $1;
-			$err = r430;
-			$n = $ng->mm->num_for($mid) if $ng;
-			goto found if defined $n;
-			foreach my $g (values %{$self->{nntpd}->{groups}}) {
-				$n = $g->mm->num_for($mid);
-				if (defined $n) {
-					$ng = $g;
-					goto found;
-				}
-			}
-			return $err;
+			($ibx, $n) = mid_lookup($self, $1);
+			goto found if $ibx;
+			return r430;
 		} else {
 			return r501;
 		}
 	} else {
 		$err = '420 no current article has been selected';
-		$n = $self->{article};
-		defined $n or return $err;
-find_mid:
-		$ng or return '412 no newsgroup has been selected';
-		$mid = $ng->mm->mid_for($n);
-		defined $mid or return $err;
+		$n = $self->{article} // return $err;
+find_ibx:
+		$ibx = $self->{ng} or
+				return '412 no newsgroup has been selected';
 	}
 found:
-	my $smsg = $ng->over->get_art($n) or return $err;
-	$smsg->{-ibx} = $ng;
+	my $smsg = $ibx->over->get_art($n) or return $err;
+	$smsg->{-ibx} = $ibx;
 	if ($code == 223) { # STAT
 		set_art($self, $n);
 		"223 $n <$smsg->{mid}> article retrieved - " .
@@ -528,7 +516,7 @@ found:
 		$smsg->{nntp_code} = $code;
 		set_art($self, $art);
 		# this dereferences to `undef'
-		${git_async_cat($ng->git, $smsg->{blob}, \&blob_cb, $smsg)};
+		${git_async_cat($ibx->git, $smsg->{blob}, \&blob_cb, $smsg)};
 	}
 }
 
@@ -730,10 +718,36 @@ sub mid_lookup ($$) {
 		my $n = $self_ng->mm->num_for($mid);
 		return ($self_ng, $n) if defined $n;
 	}
-	foreach my $ng (values %{$self->{nntpd}->{groups}}) {
-		next if defined $self_ng && $ng eq $self_ng;
-		my $n = $ng->mm->num_for($mid);
-		return ($ng, $n) if defined $n;
+	my $pi_cfg = $self->{nntpd}->{pi_config};
+	if (my $ALL = $pi_cfg->ALL) {
+		my ($id, $prev);
+		while (my $smsg = $ALL->over->next_by_mid($mid, \$id, \$prev)) {
+			my $xr3 = $ALL->over->get_xref3($smsg->{num});
+			if (my @x = grep(/:$smsg->{blob}\z/, @$xr3)) {
+				my ($ngname, $xnum) = split(/:/, $x[0]);
+				my $ibx = $pi_cfg->{-by_newsgroup}->{$ngname};
+				return ($ibx, $xnum) if $ibx;
+				# fall through to trying all xref3s
+			} else {
+				warn <<EOF;
+W: xref3 missing for <$mid> ($smsg->{blob}) in $ALL->{topdir}, -extindex bug?
+EOF
+			}
+			# try all xref3s
+			for my $x (@$xr3) {
+				my ($ngname, $xnum) = split(/:/, $x);
+				my $ibx = $pi_cfg->{-by_newsgroup}->{$ngname};
+				return ($ibx, $xnum) if $ibx;
+				warn "W: `$ngname' does not exist for #$xnum\n";
+			}
+		}
+		# no warning here, $mid is just invalid
+	} else { # slow path for non-ALL users
+		foreach my $ibx (values %{$self->{nntpd}->{groups}}) {
+			next if defined $self_ng && $ibx eq $self_ng;
+			my $n = $ibx->mm->num_for($mid);
+			return ($ibx, $n) if defined $n;
+		}
 	}
 	(undef, undef);
 }
@@ -980,12 +994,28 @@ sub cmd_xpath ($$) {
 	return r501 unless $mid =~ $ONE_MSGID;
 	$mid = $1;
 	my @paths;
-	foreach my $ng (values %{$self->{nntpd}->{groups}}) {
-		my $n = $ng->mm->num_for($mid);
-		push @paths, "$ng->{newsgroup}/$n" if defined $n;
+	my $pi_cfg = $self->{nntpd}->{pi_config};
+	my $groups = $pi_cfg->{-by_newsgroup};
+	if (my $ALL = $pi_cfg->ALL) {
+		my ($id, $prev, %seen);
+		while (my $smsg = $ALL->over->next_by_mid($mid, \$id, \$prev)) {
+			my $xr3 = $ALL->over->get_xref3($smsg->{num});
+			for my $x (@$xr3) {
+				my ($ngname, $n) = split(/:/, $x);
+				$x = "$ngname/$n";
+				if ($groups->{$ngname} && !$seen{$x}++) {
+					push(@paths, $x);
+				}
+			}
+		}
+	} else { # slow path, no point in using long_response
+		for my $ibx (values %$groups) {
+			my $n = $ibx->mm->num_for($mid) // next;
+			push @paths, "$ibx->{newsgroup}/$n";
+		}
 	}
 	return '430 no such article on server' unless @paths;
-	'223 '.join(' ', @paths);
+	'223 '.join(' ', sort(@paths));
 }
 
 sub res ($$) { do_write($_[0], $_[1] . "\r\n") }