X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox.cgi;h=3bc6eca3c574fbe31e67a07141c10a0269c7b2c8;hb=d444d9aebc6e401333968ec697c48fb23214a1ea;hp=bd592ce3e3107c6ed77ea51f0cf0c761284393e4;hpb=b2da3f40fb7650a658b6ed1a15c81704d91b2831;p=public-inbox.git

diff --git a/public-inbox.cgi b/public-inbox.cgi
index bd592ce3..3bc6eca3 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -12,65 +12,61 @@
 use 5.008;
 use strict;
 use warnings;
-use CGI qw(:cgi :escapeHTML -nosticky); # PSGI/FastCGI/mod_perl compat
-use Encode qw(decode_utf8);
 use PublicInbox::Config;
-use URI::Escape qw(uri_escape uri_unescape);
-use Digest::SHA qw(sha1_hex);
+use URI::Escape qw(uri_escape_utf8 uri_unescape);
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
+our $NO_SCRIPT_NAME; # for prettier redirects with mod_perl2
 our $pi_config;
 BEGIN {
 	$pi_config = PublicInbox::Config->new;
 	# TODO: detect and reload config as needed
+	$NO_SCRIPT_NAME = 1 if $ENV{NO_SCRIPT_NAME};
 	if ($ENV{MOD_PERL}) {
+		require CGI;
+		no warnings;
+		$CGI::NOSTICKY = 1;
 		CGI->compile;
 	}
 }
 
-my $ret = main();
-
-my ($status, $headers, $body) = @$ret;
-set_binmode($headers);
-if (@ARGV && $ARGV[0] eq 'static') {
-	print $body;
-} else { # CGI
-	print "Status: $status\r\n";
-	while (my ($k, $v) = each %$headers) {
-		print "$k: $v\r\n";
-	}
-	print "\r\n", $body;
-}
-
-# TODO: plack support
-
-# private functions below
-
-sub main {
+if ($ENV{PI_PLACKUP}) {
+	psgi_app();
+} else {
 	# some servers (Ruby webrick) include scheme://host[:port] here,
 	# which confuses CGI.pm when generating self_url.
 	# RFC 3875 does not mention REQUEST_URI at all,
 	# so nuke it since CGI.pm functions without it.
+	require CGI;
 	delete $ENV{REQUEST_URI};
+	$ENV{SCRIPT_NAME} = '' if $NO_SCRIPT_NAME;
+	my $req = CGI->new;
+	my $ret = main($req, $req->request_method);
+	binmode STDOUT;
+	if (@ARGV && $ARGV[0] eq 'static') {
+		print $ret->[2]->[0];
+	} else { # CGI
+		cgi_print($ret);
+	}
+}
 
-	my $cgi = CGI->new;
+# private functions below
+
+sub main {
+	my ($cgi, $method) = @_;
 	my %ctx;
-	if ($cgi->request_method !~ /\AGET|HEAD\z/) {
-		return r("405 Method Not Allowed");
+	if ($method !~ /\AGET|HEAD\z/) {
+		return r(405, 'Method Not Allowed');
 	}
-	my $path_info = decode_utf8($cgi->path_info);
+	my $path_info = $cgi->path_info;
 
 	# top-level indices and feeds
-	if ($path_info eq "/") {
+	if ($path_info eq '/') {
 		r404();
 	} elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
 		invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
 	} elsif ($path_info =~ m!$LISTNAME_RE(?:/|/index\.html)?\z!o) {
-		invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 1);
-	} elsif ($path_info =~ m!$LISTNAME_RE/(?:all\.html)?\z!o) {
 		invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0);
-	} elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) {
-		invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1);
-	} elsif ($path_info =~ m!$LISTNAME_RE/all\.atom\.xml\z!o) {
+	} elsif ($path_info =~ m!$LISTNAME_RE/atom\.xml\z!o) {
 		invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 0);
 
 	# single-message pages
@@ -78,24 +74,24 @@ sub main {
 		invalid_list_mid(\%ctx, $1, $2) || get_mid_txt(\%ctx, $cgi);
 	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\.html\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) || get_mid_html(\%ctx, $cgi);
-	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\z!o) {
-		redirect_mid_html($cgi, $1, $2);
 
 	# full-message page
 	} elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\.html\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx, $cgi);
-	} elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\z!o) {
-		redirect_mid_html($cgi, $1, $2);
+
+	# convenience redirects, order matters
+	} elsif ($path_info =~ m!$LISTNAME_RE/(?:m|f)/(\S+)\z!o) {
+		invalid_list_mid(\%ctx, $1, $2) || redirect_mid(\%ctx, $cgi);
 
 	} else {
 		r404();
 	}
 }
 
-sub r404 { r("404 Not Found") }
+sub r404 { r(404, 'Not Found') }
 
 # simple response for errors
-sub r { [ $_[0], { 'Content-Type' => 'text/plain' }, $_[0]."\n" ] }
+sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
 
 # returns undef if valid, array ref response if invalid
 sub invalid_list {
@@ -104,7 +100,7 @@ sub invalid_list {
 	if (defined $git_dir) {
 		$ctx->{git_dir} = $git_dir;
 		$ctx->{listname} = $listname;
-		return undef;
+		return;
 	}
 	r404();
 }
@@ -112,58 +108,69 @@ sub invalid_list {
 # returns undef if valid, array ref response if invalid
 sub invalid_list_mid {
 	my ($ctx, $listname, $mid) = @_;
-	my $ret = invalid_list($ctx, $listname, $mid) and return $ret;
-	$ctx->{mid} = uri_unescape($mid);
-	undef;
+	my $ret = invalid_list($ctx, $listname, $mid);
+	$ctx->{mid} = uri_unescape($mid) unless $ret;
+	$ret;
 }
 
-# /$LISTNAME/index.atom.xml                     -> Atom feed
-# /$LISTNAME/all.atom.xml                       -> Atom feed, includes replies
+# /$LISTNAME/atom.xml                       -> Atom feed, includes replies
 sub get_atom {
 	my ($ctx, $cgi, $top) = @_;
 	require PublicInbox::Feed;
-	[ '200 OK', { 'Content-Type' => 'application/xml' },
-	  PublicInbox::Feed->generate({
+	[ 200, [ 'Content-Type' => 'application/xml' ],
+	  [ PublicInbox::Feed->generate({
 			git_dir => $ctx->{git_dir},
 			listname => $ctx->{listname},
 			pi_config => $pi_config,
 			cgi => $cgi,
 			top => $top,
-		})
+		}) ]
 	];
 }
 
-# /$LISTNAME/?before=$GIT_COMMIT                 -> HTML only
+# /$LISTNAME/?r=$GIT_COMMIT                 -> HTML only
 sub get_index {
 	my ($ctx, $cgi, $top) = @_;
 	require PublicInbox::Feed;
-	[ '200 OK', { 'Content-Type' => 'text/html' },
-	  PublicInbox::Feed->generate_html_index({
+	[ 200, [ 'Content-Type' => 'text/html' ],
+	  [ PublicInbox::Feed->generate_html_index({
 			git_dir => $ctx->{git_dir},
 			listname => $ctx->{listname},
 			pi_config => $pi_config,
 			cgi => $cgi,
 			top => $top,
-		})
+		}) ]
 	];
 }
 
 # just returns a string ref for the blob in the current ctx
 sub mid2blob {
 	my ($ctx) = @_;
-	local $ENV{GIT_DIR} = $ctx->{git_dir};
-	my $hex = sha1_hex($ctx->{mid});
+	require Digest::SHA;
+	my $hex = Digest::SHA::sha1_hex($ctx->{mid});
 	$hex =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/i or
 			die "BUG: not a SHA-1 hex: $hex";
-	my $blob = `git cat-file blob HEAD:$1/$2 2>/dev/null`;
-	$? == 0 ? \$blob : undef;
+
+	my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
+			qw(cat-file blob), "HEAD:$1/$2");
+	my $cmd = join(' ', @cmd);
+	my $pid = open my $fh, '-|';
+	defined $pid or die "fork failed: $!\n";
+	if ($pid == 0) {
+		open STDERR, '>', '/dev/null'; # ignore errors
+		exec @cmd or die "exec failed: $!\n";
+	} else {
+		my $blob = eval { local $/; <$fh> };
+		close $fh;
+		$? == 0 ? \$blob : undef;
+	}
 }
 
 # /$LISTNAME/m/$MESSAGE_ID.txt                    -> raw original
 sub get_mid_txt {
 	my ($ctx, $cgi) = @_;
 	my $x = mid2blob($ctx);
-	$x ? [ "200 OK", {'Content-Type' => 'text/plain'}, $$x ] : r404();
+	$x ? [ 200, [ 'Content-Type' => 'text/plain' ], [ $$x ] ] : r404();
 }
 
 # /$LISTNAME/m/$MESSAGE_ID.html                   -> HTML content (short quotes)
@@ -172,11 +179,13 @@ sub get_mid_html {
 	my $x = mid2blob($ctx);
 	return r404() unless $x;
 
-	my $pfx = "../f/" . uri_escape($ctx->{mid}) . ".html";
 	require PublicInbox::View;
+	my $mid_href = PublicInbox::Hval::ascii_html(
+						uri_escape_utf8($ctx->{mid}));
+	my $pfx = "../f/$mid_href.html";
 	require Email::MIME;
-	[ "200 OK", {'Content-Type' => 'text/html'},
-		PublicInbox::View->as_html(Email::MIME->new($$x), $pfx)];
+	[ 200, [ 'Content-Type' => 'text/html' ],
+		[ PublicInbox::View->as_html(Email::MIME->new($$x), $pfx) ] ];
 }
 
 # /$LISTNAME/f/$MESSAGE_ID.html                   -> HTML content (fullquotes)
@@ -186,30 +195,64 @@ sub get_full_html {
 	return r404() unless $x;
 	require PublicInbox::View;
 	require Email::MIME;
-	[ "200 OK", {'Content-Type' => 'text/html'},
-		PublicInbox::View->as_html(Email::MIME->new($$x))];
+	[ 200, [ 'Content-Type' => 'text/html' ],
+		[ PublicInbox::View->as_html(Email::MIME->new($$x))] ];
+}
+
+sub self_url {
+	my ($cgi) = @_;
+	ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
 }
 
 sub redirect_list_index {
 	my ($ctx, $cgi) = @_;
-	do_redirect($cgi->self_url . "/");
+	do_redirect(self_url($cgi) . "/");
+}
+
+sub redirect_mid {
+	my ($ctx, $cgi) = @_;
+	my $url = self_url($cgi);
+	$url =~ s!/f/!/m/!;
+	do_redirect($url . '.html');
 }
 
 sub do_redirect {
 	my ($url) = @_;
-	[ '301 Moved Permanently',
-	  { Location => $url, 'Content-Type' => 'text/plain' },
-	  "Redirecting to $url\n"
+	[ 301,
+	  [ Location => $url, 'Content-Type' => 'text/plain' ],
+	  [ "Redirecting to $url\n" ]
 	]
 }
 
-# only used for CGI and static file generation modes
-sub set_binmode {
-	my ($headers) = @_;
-	if ($headers->{'Content-Type'} eq 'text/plain') {
-		# no way to validate raw messages, mixed encoding is possible.
-		binmode STDOUT;
-	} else { # strict encoding for HTML and XML
-		binmode STDOUT, ':encoding(UTF-8)';
+sub psgi_app {
+	# preload so we are CoW friendly
+	require PublicInbox::Feed;
+	require PublicInbox::View;
+	require Mail::Thread;
+	require Digest::SHA;
+	require POSIX;
+	require XML::Atom::SimpleFeed;
+	require Plack::Request;
+	sub {
+		my $req = Plack::Request->new(@_);
+		main($req, $req->method);
+	};
+}
+
+sub cgi_print {
+	my ($ret) = @_;
+	my ($status, $headers, $body) = @$ret;
+	my %codes = (
+		200 => 'OK',
+		301 => 'Moved Permanently',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+	);
+
+	print "Status: $status $codes{$status}\r\n";
+	my @tmp = @$headers;
+	while (my ($k, $v) = splice(@tmp, 0, 2)) {
+		print "$k: $v\r\n";
 	}
+	print "\r\n", $body->[0];
 }