X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox.cgi;h=3c51c314ebe6c4452e84d8fbd3849357c559456f;hb=e022d3377fd2c50fd9931bf96394728958a90bf3;hp=1fb96e75d82aaf9493a6d112001b0e8c765a84d8;hpb=d95eccbe97f1a48b76c8a80fc81d88a291676cdc;p=public-inbox.git

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 1fb96e75..3c51c314 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -12,12 +12,12 @@
 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);
-our $LISTNAME_RE = qr!\A(?:/.*?)?/([\w\.\-]+)!;
+my $enc_utf8 = find_encoding('UTF-8');
+our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $pi_config;
 BEGIN {
 	$pi_config = PublicInbox::Config->new;
@@ -57,18 +57,16 @@ sub main {
 	if ($cgi->request_method !~ /\AGET|HEAD\z/) {
 		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 "/") {
 		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/(?:all\.html)?\z!o) {
+	} 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, 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
@@ -76,17 +74,15 @@ 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);
 
-	} elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
-		invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
+	# 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();
 	}
@@ -95,7 +91,7 @@ sub main {
 sub r404 { r("404 Not Found") }
 
 # simple response for errors
-sub r { [ $_[0], { 'Content-Type' => 'text/plain' }, '' ] }
+sub r { [ $_[0], { 'Content-Type' => 'text/plain' }, $_[0]."\n" ] }
 
 # returns undef if valid, array ref response if invalid
 sub invalid_list {
@@ -117,8 +113,7 @@ sub invalid_list_mid {
 	undef;
 }
 
-# /$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;
@@ -133,7 +128,7 @@ sub get_atom {
 	];
 }
 
-# /$LISTNAME/?before=$GIT_COMMIT                 -> HTML only
+# /$LISTNAME/?r=$GIT_COMMIT                 -> HTML only
 sub get_index {
 	my ($ctx, $cgi, $top) = @_;
 	require PublicInbox::Feed;
@@ -152,7 +147,8 @@ sub get_index {
 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`;
@@ -172,8 +168,9 @@ 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($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)];
@@ -195,6 +192,13 @@ 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',
@@ -210,6 +214,6 @@ sub set_binmode {
 		# no way to validate raw messages, mixed encoding is possible.
 		binmode STDOUT;
 	} else { # strict encoding for HTML and XML
-		binmode STDOUT, ':encoding(UTF-8)';
+		binmode STDOUT, ':encoding(us-ascii)';
 	}
 }