From: Eric Wong <e@80x24.org>
Date: Sat, 30 Nov 2024 22:59:05 +0000 (+0000)
Subject: daemon: improve warning on missing SO_ACCEPTFILTER
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371b3b1963f802b2efd9328f52b7f38d90320874;p=thirdparty%2Fpublic-inbox.git

daemon: improve warning on missing SO_ACCEPTFILTER

I noticed tests were failing on a freshly booted FreeBSD
instance due to the accf_http module not being loaded and
triggering autodie-generated error messages from setsockopt.
Instead, give a helpful warning message for users to use
kldload(8) to load the necessary filter.

We'll also relax tests to ignore the kldload warning and fix an
overzealous use of /.*/ while we're at by using /[^\n]/ instead
to avoid filtering out subsequent lines.
---

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 8e6ddbb9e..57f01d2cb 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -658,8 +658,11 @@ sub defer_accept ($$) {
 			# getsockopt can EINVAL if SO_ACCEPTFILTER is unset:
 			my $x = getsockopt($s, SOL_SOCKET, $SO_ACCEPTFILTER);
 			return if ($x // '') =~ /[^\0]/s; # don't change if set
-			my $accf_arg = pack('a16a240', $af_name, '');
-			setsockopt $s, SOL_SOCKET, $SO_ACCEPTFILTER, $accf_arg;
+			CORE::setsockopt $s, SOL_SOCKET, $SO_ACCEPTFILTER,
+					pack('a16a240', $af_name, '') or
+				warn 'W: ', sockname($s), <<EOM;
+ SO_ACCEPTFILTER $af_name: $! (try `kldload $af_name')
+EOM
 		}
 	};
 	my $err = $@; # sockname() clobbers $@
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index b863ad6b7..0f5b107dc 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -30,7 +30,7 @@ BEGIN {
 		create_coderepo require_bsd kernel_version check_broken_tmpfs
 		quit_waiter_pipe wait_for_eof require_git_http_backend
 		tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt
-		test_httpd xbail require_cmd is_xdeeply tail_f
+		test_httpd no_httpd_errors xbail require_cmd is_xdeeply tail_f
 		ignore_inline_c_missing no_pollerfd no_coredump cfg_new
 		strace strace_inject lsof_pid oct_is);
 	require Test::More;
@@ -948,6 +948,16 @@ sub create_inbox ($;@) {
 	$ibx;
 }
 
+sub no_httpd_errors ($;$) {
+	my ($err, $msg) = @_;
+	open my $fh, '<', $err;
+	my $e = read_all $fh;
+	$e =~ s/^Plack::Middleware::ReverseProxy missing,\n//gms and
+		$e =~ s/^URL generation for redirects[^\n]*\n//gms;
+	$e =~ s/^W: .*?try `kldload[^\n]+\n//gms;
+	is $e, '', $msg // 'no httpd errors';
+}
+
 sub test_httpd ($$;$$) {
 	my ($env, $client, $skip, $cb) = @_;
 	my ($tmpdir, $for_destroy);
@@ -976,12 +986,7 @@ sub test_httpd ($$;$$) {
 							ua => $ua);
 		$cb->() if $cb;
 		$td->join('TERM');
-		open my $fh, '<', $err;
-		my $e = read_all($fh);
-		if ($e =~ s/^Plack::Middleware::ReverseProxy missing,\n//gms) {
-			$e =~ s/^URL generation for redirects .*\n//gms;
-		}
-		is($e, '', 'no errors');
+		no_httpd_errors $err;
 	}
 };
 
diff --git a/t/solver_git.t b/t/solver_git.t
index cebcf47fd..c45011ad8 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -43,11 +43,8 @@ my $v1_0_0_tag_short = substr($v1_0_0_tag, 0, 16);
 my $expect = '69df7d565d49fbaaeb0a067910f03dc22cd52bd0';
 my $non_existent = 'ee5e32211bf62ab6531bdf39b84b6920d0b6775a';
 my $stderr_empty = sub {
-	my ($msg) = @_;
-	open my $efh, '<', "$tmpdir/stderr.log";
-	my @l = <$efh>;
-	@l = grep(!/reverse ?proxy/i, @l);
-	is_xdeeply(\@l, [], $msg // 'stderr.log is empty');
+	no_httpd_errors "$tmpdir/stderr.log",
+		$_[0] // 'stderr.log is empty';
 };
 
 test_lei({tmpdir => "$tmpdir/blob"}, sub {