use 5.008;
use strict;
use warnings;
-use CGI qw(:cgi :escapeHTML -nosticky); # PSGI/FastCGI/mod_perl compat
-use Encode qw(decode_utf8);
+use CGI qw(:cgi -nosticky); # PSGI/FastCGI/mod_perl compat
+use Encode qw(find_encoding);
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 $enc_utf8 = find_encoding('UTF-8');
our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
our $pi_config;
BEGIN {
}
}
-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";
+if ($ENV{PI_PLACKUP}) {
+ psgi_app();
+} else {
+ my $ret = main();
+ binmode STDOUT;
+ if (@ARGV && $ARGV[0] eq 'static') {
+ print $ret->[2]->[0];
+ } else { # CGI
+ cgi_print($ret);
}
- 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");
+ return r(405, 'Method Not Allowed');
}
- my $path_info = decode_utf8($cgi->path_info);
+ my $path_info = $enc_utf8->decode($cgi->path_info);
# top-level indices and feeds
if ($path_info eq "/") {
} 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
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' }, '' ] }
+sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
# returns undef if valid, array ref response if invalid
sub invalid_list {
if (defined $git_dir) {
$ctx->{git_dir} = $git_dir;
$ctx->{listname} = $listname;
- return undef;
+ return;
}
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} = 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,
- })
+ }) ]
];
}
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`;
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)
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)
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 redirect_list_index {
do_redirect($cgi->self_url . "/");
}
+sub redirect_mid {
+ my ($ctx, $cgi) = @_;
+ my $url = $cgi->self_url;
+ $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 {
+ require CGI::Emulate::PSGI;
+
+ # preload so we are CoW friendly
+ require PublicInbox::Feed;
+ require PublicInbox::View;
+ require Mail::Thread;
+ require Digest::SHA;
+ require POSIX;
+ require XML::Atom::SimpleFeed;
+ eval { require Git };
+ sub {
+ my ($e) = @_;
+ local %ENV = (%ENV, CGI::Emulate::PSGI->emulate_environment($e));
+ main();
+ }
+}
+
+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];
}