X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox.cgi;h=57935c50d62fc1ed8d282a04ee2e3dede66a62a9;hb=a6134a0ca3ac69f2dfe353019c35eb36db3d831e;hp=fb435777c666b987f8a6bc085dae3b923852d6fc;hpb=c394de9f2c91c2c5ed1f7832a5a7cc0206120b7f;p=public-inbox.git

diff --git a/public-inbox.cgi b/public-inbox.cgi
index fb435777..57935c50 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -1,193 +1,40 @@
 #!/usr/bin/perl -w
 # Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
-#
-# We focus on the lowest common denominators here:
-# - targeted at text-only console browsers (lynx, w3m, etc..)
-# - Only basic HTML, CSS only for line-wrapping <pre> text content for GUIs
-# - No JavaScript, graphics or icons allowed.
-# - Must not rely on static content
-# - UTF-8 is only for user-content, 7-bit US-ASCII for us
-
-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 Digest::SHA qw(sha1_hex);
-our $LISTNAME_RE = qr!\A(?:/.*?)?/([\w\.\-]+)!;
-our $pi_config;
+require PublicInbox::WWW;
+use CGI qw/-nosticky/;
+our $NO_SCRIPT_NAME;
 BEGIN {
-	$pi_config = PublicInbox::Config->new;
-	# TODO: detect and reload config as needed
-	if ($ENV{MOD_PERL}) {
-		CGI->compile;
-	}
-}
-
-my $ret = main();
-
-my ($status, $headers, $body) = @$ret;
-set_binmode($headers);
+	$NO_SCRIPT_NAME = 1 if $ENV{NO_SCRIPT_NAME};
+	CGI->compile if $ENV{MOD_PERL};
+}
+
+# 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.
+delete $ENV{REQUEST_URI};
+$ENV{SCRIPT_NAME} = '' if $NO_SCRIPT_NAME;
+my $req = CGI->new;
+my $ret = PublicInbox::WWW::run($req, $req->request_method);
+binmode STDOUT;
 if (@ARGV && $ARGV[0] eq 'static') {
-	print $body;
+	print $ret->[2]->[0]; # only show the body
 } else { # CGI
-	print "Status: $status\r\n";
-	while (my ($k, $v) = each %$headers) {
+	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;
-}
-
-# TODO: plack support
-
-# private functions below
-
-sub main {
-	my $cgi = CGI->new;
-	my %ctx;
-	if ($cgi->request_method !~ /\AGET|HEAD\z/) {
-		return r("405 Method Not Allowed");
-	}
-	my $path_info = decode_utf8($ENV{PATH_INFO});
-
-	# top-level indices and feeds
-	if ($path_info eq "/") {
-		r404();
-	} 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/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) {
-		invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 0);
-
-	# single-message pages
-	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\.txt\z!o) {
-		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);
-
-	} else {
-		r404();
-	}
-}
-
-sub r404 { r("404 Not Found") }
-
-# simple response for errors
-sub r { [ $_[0], { 'Content-Type' => 'text/plain' }, '' ] }
-
-# returns undef if valid, array ref response if invalid
-sub invalid_list {
-	my ($ctx, $listname) = @_;
-	my $git_dir = $pi_config->get($listname, "mainrepo");
-	if (defined $git_dir) {
-		$ctx->{git_dir} = $git_dir;
-		$ctx->{listname} = $listname;
-		return undef;
-	}
-	r404();
-}
-
-# 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} = $mid;
-	undef;
-}
-
-# /$LISTNAME/index.atom.xml                     -> Atom feed
-# /$LISTNAME/all.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({
-			git_dir => $ctx->{git_dir},
-			listname => $ctx->{listname},
-			pi_config => $pi_config,
-			cgi => $cgi,
-			top => $top,
-		})
-	];
-}
-
-# /$LISTNAME/?before=$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({
-			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});
-	$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;
-}
-
-# /$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();
-}
-
-# /$LISTNAME/m/$MESSAGE_ID.html                   -> HTML content (short quotes)
-sub get_mid_html {
-	my ($ctx, $cgi) = @_;
-	my $x = mid2blob($ctx);
-	return r404() unless $x;
-
-	my $pfx = $cgi->self_url;
-	$pfx =~ s!/m/.+\z!/!; # FIXME: this is not robust
-
-	require PublicInbox::View;
-	require Email::MIME;
-	[ "200 OK", {'Content-Type' => 'text/html'},
-		PublicInbox::View->as_html(Email::MIME->new($$x), $pfx)];
-}
-
-# /$LISTNAME/f/$MESSAGE_ID.html                   -> HTML content (fullquotes)
-sub get_full_html {
-	my ($ctx, $cgi) = @_;
-	my $x = mid2blob($ctx);
-	return r404() unless $x;
-	require PublicInbox::View;
-	require Email::MIME;
-	[ "200 OK", {'Content-Type' => 'text/html'},
-		PublicInbox::View->as_html(Email::MIME->new($$x))];
-}
-
-# 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)';
-	}
+	print "\r\n", $body->[0];
 }