From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4EAC91F59D for ; Sat, 28 Jan 2023 11:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1674903803; bh=jpCBLmRKh/Ruk5T0XfINOmzV9Qjjqak59h65g1MsDfs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=PfYD1dVYkBENVLvfnvgakKtmmvCaO/afCUBrzg3VnnIGFLzVitX8l3U1VkymExy3E SfxTuCowet7tSt7RTZL3FxzVGULNO76wc5lfvFExsuXjgKQH+m6vuTzryN0MyJ0usn WS7xpRnA1eYo1aOd10L6oOpeFkYOVxPkF5I75Cic= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/7] www_coderepo: tree: quiet and 404 on non-existent refs Date: Sat, 28 Jan 2023 11:02:49 +0000 Message-Id: <20230128110255.2950084-2-e@80x24.org> In-Reply-To: <20230128110255.2950084-1-e@80x24.org> References: <20230128110255.2950084-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Clients should see 404s when attempting to hit files for deleted branches or tags. --- lib/PublicInbox/RepoTree.pm | 22 ++++++++++++++++++---- t/solver_git.t | 7 +++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/RepoTree.pm b/lib/PublicInbox/RepoTree.pm index 3a848c6f..25dc5b10 100644 --- a/lib/PublicInbox/RepoTree.pm +++ b/lib/PublicInbox/RepoTree.pm @@ -18,10 +18,12 @@ sub rd_404_log { PublicInbox::WwwStream::html_init($ctx); my $zfh = $ctx->{zfh}; print $zfh "
\$ git log -1 $tip -- $path\n";
+	my $code = 200;
 	if ($$bref eq '') {
-		say $zfh "found no record of `$path' in git history";
+		say $zfh "found no record of `$path' in git history in `$tip'";
 		$ctx->{-has_srch} and
 			say $zfh 'perhaps try searching mail (above)';
+		$code = 404;
 	} else {
 		my ($H, $h, $s_as) = split(/ /, $$bref, 3);
 		utf8::decode($s_as);
@@ -33,17 +35,29 @@ found last record of `$path' in the following commit:
 $h $s_as
 EOM
 	}
-	delete($ctx->{-wcb})->($ctx->html_done);
+	my $res = $ctx->html_done;
+	$res->[0] = $code;
+	delete($ctx->{-wcb})->($res);
 }
 
 sub find_missing {
 	my ($ctx) = @_;
+	if ($ctx->{-path} eq '') {
+		my $tip = 'HEAD';
+		$tip = ascii_html($ctx->{qp}->{h}) if defined($ctx->{qp}->{h});
+		PublicInbox::WwwStream::html_init($ctx);
+		print { $ctx->{zfh} } "
`$tip' ref not found
";
+		my $res = $ctx->html_done;
+		$res->[0] = 404;
+		return delete($ctx->{-wcb})->($res);
+	}
 	my $cmd = ['git', "--git-dir=$ctx->{git}->{git_dir}",
 		qw(log --no-color -1), '--pretty=%H %h %s (%as)' ];
 	push @$cmd, $ctx->{qp}->{h} if defined($ctx->{qp}->{h});
 	push @$cmd, '--';
-	push @$cmd, $ctx->{-path} if $ctx->{-path} ne '';
-	my $qsp = PublicInbox::Qspawn->new($cmd);
+	push @$cmd, $ctx->{-path};
+	my $qsp = PublicInbox::Qspawn->new($cmd, undef,
+					{ quiet => 1, 2 => $ctx->{lh} });
 	$qsp->psgi_qx($ctx->{env}, undef, \&rd_404_log, $ctx);
 }
 
diff --git a/t/solver_git.t b/t/solver_git.t
index 122cf888..7743913b 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -396,6 +396,13 @@ EOF
 		is($res->code, 200, 'got 200 for a directory');
 		$got = $res->content;
 		like($got, qr/\bgit ls-tree\b/, 'ls-tree help shown');
+
+		$res = $cb->(GET('/public-inbox/tree/?h=no-branch'));
+		is($res->code, 404, 'got 404 for non-existent ref root');
+		$res = $cb->(GET('/public-inbox/tree/README?h=no-file'));
+		is($res->code, 404, 'got 404 for non-existent ref README');
+		$res = $cb->(GET('/public-inbox/tree/Documentation?h=no-dir'));
+		is($res->code, 404, 'got 404 for non-existent ref directory');
 	};
 	test_psgi(sub { $www->call(@_) }, $client);
 	my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };