unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/6] httpd: make internals slightly more generic
Date: Mon,  1 Aug 2022 21:24:42 +0000	[thread overview]
Message-ID: <20220801212447.270000-2-e@80x24.org> (raw)
In-Reply-To: <20220801212447.270000-1-e@80x24.org>

This brings the HTTP server closer to the IMAP/NNTP/POP3
implementations and eliminates package-wide globals in
PublicInbox::HTTPD.  The end goal is to be able to host
completely different PSGI applications on different listen
ports.
---
 lib/PublicInbox/Daemon.pm | 10 +++----
 lib/PublicInbox/HTTP.pm   | 10 +++----
 lib/PublicInbox/HTTPD.pm  | 55 ++++++++++++++++++++++-----------------
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index bceae6e5..1af03cc4 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -81,11 +81,11 @@ sub load_mod ($) {
 	my $mod = $modc.'D';
 	eval "require $mod"; # IMAPD|HTTPD|NNTPD|POP3D
 	die $@ if $@;
-	my %xn = map { $_ => $mod->can($_) } qw(refresh post_accept);
-	$xn{tlsd} = $mod->new if $mod->can('refresh_groups'); #!HTTPD
-	my $tlsd = $xn{tlsd};
-	$xn{refresh} //= sub { $tlsd->refresh_groups(@_) };
-	$xn{post_accept} //= sub { $modc->new($_[0], $tlsd) };
+	my %xn;
+	my $tlsd = $xn{tlsd} = $mod->new;
+	$xn{refresh} = sub { $tlsd->refresh_groups(@_) };
+	$xn{post_accept} = $tlsd->can('post_accept_cb') ?
+			$tlsd->post_accept_cb : sub { $modc->new($_[0], $tlsd) };
 	$xn{af_default} = 'httpready' if $modc eq 'PublicInbox::HTTP';
 	\%xn;
 }
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 76e978a2..669211e3 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Generic PSGI server for convenience.  It aims to provide
@@ -52,8 +52,8 @@ sub http_date () {
 }
 
 sub new ($$$) {
-	my ($class, $sock, $addr, $httpd) = @_;
-	my $self = bless { httpd => $httpd }, $class;
+	my ($class, $sock, $addr, $srv_env) = @_;
+	my $self = bless { srv_env => $srv_env }, $class;
 	my $ev = EPOLLIN;
 	my $wbuf;
 	if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
@@ -78,7 +78,7 @@ sub event_step { # called by PublicInbox::DS
 	return read_input($self) if ref($self->{env});
 
 	my $rbuf = $self->{rbuf} // (\(my $x = ''));
-	my %env = %{$self->{httpd}->{env}}; # full hash copy
+	my %env = %{$self->{srv_env}}; # full hash copy
 	my $r;
 	while (($r = parse_http_request($$rbuf, \%env)) < 0) {
 		# We do not support Trailers in chunked requests, for
@@ -145,7 +145,7 @@ sub app_dispatch {
 	# note: NOT $self->{sock}, we want our close (+ PublicInbox::DS::close),
 	# to do proper cleanup:
 	$env->{'psgix.io'} = $self; # for ->close or async_pass
-	my $res = Plack::Util::run_app($self->{httpd}->{app}, $env);
+	my $res = Plack::Util::run_app($env->{'pi-httpd.app'}, $env);
 	eval {
 		if (ref($res) eq 'CODE') {
 			$res->(sub { response_write($self, $env, $_[0]) });
diff --git a/lib/PublicInbox/HTTPD.pm b/lib/PublicInbox/HTTPD.pm
index 715e4538..bcdbb9f9 100644
--- a/lib/PublicInbox/HTTPD.pm
+++ b/lib/PublicInbox/HTTPD.pm
@@ -13,12 +13,17 @@ use PublicInbox::HTTPD::Async;
 
 sub pi_httpd_async { PublicInbox::HTTPD::Async->new(@_) }
 
-sub new {
-	my ($class, $sock, $app, $client) = @_;
-	my $n = getsockname($sock) or die "not a socket: $sock $!\n";
-	my ($host, $port) = PublicInbox::Daemon::host_with_port($n);
+# we have a different env for ever listener socket for
+# SERVER_NAME, SERVER_PORT and psgi.url_scheme
+# envs: listener FD => PSGI env
+sub new { bless { envs => {} }, __PACKAGE__ }
 
-	my %env = (
+# this becomes {srv_env} in PublicInbox::HTTP
+sub env_for ($$$) {
+	my ($self, $srv, $client) = @_;
+	my $n = getsockname($srv) or die "not a socket: $srv $!\n";
+	my ($host, $port) = PublicInbox::Daemon::host_with_port($n);
+	{
 		SERVER_NAME => $host,
 		SERVER_PORT => $port,
 		SCRIPT_NAME => '',
@@ -40,26 +45,24 @@ sub new {
 		# this to limit git-http-backend(1) parallelism.
 		# We also check for the truthiness of this to
 		# detect when to use async paths for slow blobs
-		'pi-httpd.async' => \&pi_httpd_async
-	);
-	bless { app => $app, env => \%env }, $class;
+		'pi-httpd.async' => \&pi_httpd_async,
+		'pi-httpd.app' => $self->{app},
+	}
 }
 
-my %httpds; # per-listen-FD mapping for HTTPD->{env}->{SERVER_<NAME|PORT>}
-my $default_app; # ugh...
-
-sub refresh {
+sub refresh_groups {
+	my ($self) = @_;
+	my $app;
 	if (@main::ARGV) {
-		eval { $default_app = Plack::Util::load_psgi(@ARGV) };
-		if ($@) {
-			die $@,
-"$0 runs in /, command-line paths must be absolute\n";
-		}
+		eval { $app = Plack::Util::load_psgi(@ARGV) };
+		die $@, <<EOM if $@;
+$0 runs in /, command-line paths must be absolute
+EOM
 	} else {
 		require PublicInbox::WWW;
 		my $www = PublicInbox::WWW->new;
 		$www->preload;
-		$default_app = builder {
+		$app = builder {
 			eval { enable 'ReverseProxy' };
 			$@ and warn <<EOM;
 Plack::Middleware::ReverseProxy missing,
@@ -69,14 +72,18 @@ EOM
 			sub { $www->call(@_) };
 		};
 	}
-	%httpds = (); # invalidate cache
+	$_->{'pi-httpd.app'} = $app for values %{$self->{envs}};
+	$self->{app} = $app;
 }
 
-sub post_accept { # Listener->{post_accept}
-	my ($client, $addr, $srv) = @_; # $_[3] - tls_wrap (unused)
-	my $httpd = $httpds{fileno($srv)} //=
-				__PACKAGE__->new($srv, $default_app, $client);
-	PublicInbox::HTTP->new($client, $addr, $httpd),
+sub post_accept_cb { # for Listener->{post_accept}
+	my ($self) = @_;
+	sub {
+		my ($client, $addr, $srv) = @_; # $_[4] - tls_wrap (unused)
+		PublicInbox::HTTP->new($client, $addr,
+				$self->{envs}->{fileno($srv)} //=
+					env_for($self, $srv, $client));
+	}
 }
 
 1;

  reply	other threads:[~2022-08-01 21:24 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-01 21:24 [PATCH 0/6] flesh out more -netd funcionality Eric Wong
2022-08-01 21:24 ` Eric Wong [this message]
2022-08-01 21:24 ` [PATCH 2/6] daemon: support per-listener env, .psgi, out, err Eric Wong
2022-08-01 21:24 ` [PATCH 3/6] daemon: require absolute cert/key paths with --daemonize Eric Wong
2022-08-01 21:24 ` [PATCH 4/6] daemon: add diagnostics about inherited/bound listeners Eric Wong
2022-08-01 21:24 ` [PATCH 5/6] daemon: allow listening on well-known ports based on protocol Eric Wong
2022-08-01 21:24 ` [PATCH 6/6] daemon: share FDs for identical log paths Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220801212447.270000-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).