www: do not unecessarily escape some chars in paths

Based on reading RFC 3986, it seems '@', ':', '!', '$', '&',
"'", '; '(', ')', '*', '+', ',', ';', '=' are all allowed
in path-absolute where we have the Message-ID.

In any case, it seems '@' is fairly common in path components
nowadays and too common in Message-IDs.

diff --git a/MANIFEST b/MANIFEST
index f5ea455e0eb0e1187b80adb92affbd862699831c..bed60501d5a61ea325b531fd44cbb9d35f9ad3dc 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -132,6 +132,7 @@ t/init.t
 t/linkify.t
 t/main-bin/spamc
 t/mda.t
+t/mid.t
 t/msg_iter.t
 t/msgmap.t
 t/nntp.t

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 39ee05f48e00957c4aed81283519a94ab5ee68a1..67ce04071a638c68b7e648cc418ea47b02e55359 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -105,7 +105,7 @@ again:
 
        my $code = 404;
        my $h = PublicInbox::Hval->new_msgid($mid);
-       my $href = $h->as_href;
+       my $href = $h->{href};
        my $html = $h->as_html;
        my $title = "<$html> not found";
        my $s = "<pre>Message-ID &lt;$html&gt;\nnot found\n";
@@ -120,7 +120,7 @@ again:
                        my $u = $ibx->base_url($env) or next;
                        foreach my $m (@$res) {
                                my $p = PublicInbox::Hval->new_msgid($m);
-                               my $r = $p->as_href;
+                               my $r = $p->{href};
                                my $t = $p->as_html;
                                $s .= qq{<a\nhref="$u$r/">$u$t/</a>\n};
                        }
@@ -158,7 +158,7 @@ sub ext_urls {
 sub exact {
        my ($ctx, $found, $mid) = @_;
        my $h = PublicInbox::Hval->new_msgid($mid);
-       my $href = $h->as_href;
+       my $href = $h->{href};
        my $html = $h->as_html;
        my $title = "&lt;$html&gt; found in ";
        my $end = @$found == 1 ? 'another inbox' : 'other inboxes';

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 240c336f72d96e7ef1714e5fd57cf4c7d8e673d4..232a91c097f16c78ebc7fdb66e7a5bf03493887e 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -137,7 +137,7 @@ sub emit_atom_thread {
        my $fh = $cb->([200, ['Content-Type' => 'application/atom+xml']]);
        my $ibx = $ctx->{-inbox};
        my $html_url = $ibx->base_url($ctx->{env});
-       $html_url .= PublicInbox::Hval->new_msgid($mid)->as_href;
+       $html_url .= PublicInbox::Hval->new_msgid($mid)->{href};
 
        $feed_opts->{url} = $html_url;
        $feed_opts->{emit_header} = 1;
@@ -269,7 +269,7 @@ sub feed_entry {
        my $mid = $header_obj->header_raw('Message-ID');
        defined $mid or return;
        $mid = PublicInbox::Hval->new_msgid($mid);
-       my $href = $midurl . $mid->as_href . '/';
+       my $href = $midurl . $mid->{href}. '/';
 
        my $date = $header_obj->header('Date');
        my $updated = feed_updated($date);

diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm
index f262073767807cfbd37919f442001d181c77e355..72496065d59fc49dba282428fee6885b1438dc2d 100644 (file)
--- a/lib/PublicInbox/Hval.pm
+++ b/lib/PublicInbox/Hval.pm
@@ -7,8 +7,7 @@ package PublicInbox::Hval;
 use strict;
 use warnings;
 use Encode qw(find_encoding);
-use URI::Escape qw(uri_escape_utf8);
-use PublicInbox::MID qw/mid_clean/;
+use PublicInbox::MID qw/mid_clean mid_escape/;
 use base qw/Exporter/;
 our @EXPORT_OK = qw/ascii_html/;
 
@@ -33,7 +32,7 @@ sub new {
 sub new_msgid {
        my ($class, $msgid) = @_;
        $msgid = mid_clean($msgid);
-       $class->new($msgid, $msgid);
+       $class->new($msgid, mid_escape($msgid));
 }
 
 sub new_oneline {
@@ -74,7 +73,6 @@ sub ascii_html {
 }
 
 sub as_html { ascii_html($_[0]->{raw}) }
-sub as_href { ascii_html(uri_escape_utf8($_[0]->{href})) }
 
 sub raw {
        if (defined $_[1]) {

diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index bb40cc76232152e38242d0d13fb595fc3b35e89d..1c2d75ccab09b49c48051db50347c9588814752f 100644 (file)
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -6,7 +6,8 @@ package PublicInbox::MID;
 use strict;
 use warnings;
 use base qw/Exporter/;
-our @EXPORT_OK = qw/mid_clean id_compress mid2path mid_mime/;
+our @EXPORT_OK = qw/mid_clean id_compress mid2path mid_mime mid_escape/;
+use URI::Escape qw(uri_escape_utf8);
 use Digest::SHA qw/sha1_hex/;
 use constant MID_MAX => 40; # SHA-1 hex length
 
@@ -47,4 +48,8 @@ sub mid2path {
 
 sub mid_mime ($) { $_[0]->header_obj->header_raw('Message-ID') }
 
+# RFC3986, section 3.3:
+sub MID_ESC () { '^A-Za-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@' }
+sub mid_escape ($) { uri_escape_utf8($_[0], MID_ESC) }
+
 1;

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index dc41548b87ce68726dc41aa79bd571589a150641..fd623f6d48bd4e63ae3fc8d762e5a75fed39f993 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -6,8 +6,7 @@
 package PublicInbox::Mbox;
 use strict;
 use warnings;
-use PublicInbox::MID qw/mid_clean/;
-use URI::Escape qw/uri_escape_utf8/;
+use PublicInbox::MID qw/mid_clean mid_escape/;
 require Email::Simple;
 
 sub emit1 {
@@ -29,7 +28,7 @@ sub msg_str {
        my $ibx = $ctx->{-inbox};
        my $base = $ibx->base_url($ctx->{env});
        my $mid = mid_clean($header_obj->header('Message-ID'));
-       $mid = uri_escape_utf8($mid);
+       $mid = mid_escape($mid);
        my @append = (
                'Archived-At', "<$base$mid/>",
                'List-Archive', "<$base>",

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 0c61dd8a0b4ad22ba8c3b05d67442c5ae6677e7d..7bfc6dd6f5f0294a8b7bbfa946eba951cd06981f 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -9,12 +9,12 @@ use base qw(Danga::Socket);
 use fields qw(nntpd article rbuf ng long_res);
 use PublicInbox::Search;
 use PublicInbox::Msgmap;
+use PublicInbox::MID qw(mid_escape);
 use PublicInbox::Git;
 require PublicInbox::EvCleanup;
 use Email::Simple;
 use POSIX qw(strftime);
 use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
-use URI::Escape qw(uri_escape_utf8);
 use constant {
        r501 => '501 command syntax error',
        r221 => '221 Header follows',
@@ -421,7 +421,7 @@ sub set_nntp_headers {
        $hdr->header_set('Xref', xref($ng, $n));
        header_append($hdr, 'List-Post', "<mailto:$ng->{-primary_address}>");
        if (my $url = $ng->base_url) {
-               $mid = uri_escape_utf8($mid);
+               $mid = mid_escape($mid);
                header_append($hdr, 'Archived-At', "<$url$mid/>");
                header_append($hdr, 'List-Archive', "<$url>");
        }

diff --git a/lib/PublicInbox/NewsWWW.pm b/lib/PublicInbox/NewsWWW.pm
index 9b01dcd3839023ae69481dd1e282d491b97443c3..b4d747633fc378146c9439c6c5b8af1a1bcb83c9 100644 (file)
--- a/lib/PublicInbox/NewsWWW.pm
+++ b/lib/PublicInbox/NewsWWW.pm
@@ -9,7 +9,7 @@ package PublicInbox::NewsWWW;
 use strict;
 use warnings;
 use PublicInbox::Config;
-use URI::Escape qw(uri_escape_utf8);
+use PublicInbox::MID qw(mid_escape);
 
 sub new {
        my ($class, $pi_config) = @_;
@@ -35,7 +35,7 @@ sub call {
                                # article IDs are not stable across clones,
                                # do not encourage caching/bookmarking them
                                $code = 302;
-                               $url .= uri_escape_utf8($mid) . '/';
+                               $url .= mid_escape($mid) . '/';
                        }
                }
 

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 80a2ff7c28e68ab9fe178919f481d24fcde8e708..3623a78b4406e1d90bad1d4b46c536c60c85b0f5 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -8,7 +8,7 @@ use warnings;
 use PublicInbox::SearchMsg;
 use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::View;
-use PublicInbox::MID qw(mid2path mid_mime mid_clean);
+use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape);
 use Email::MIME;
 require PublicInbox::Git;
 require PublicInbox::Thread;
@@ -74,7 +74,7 @@ sub mset_summary {
                my $s = ascii_html($smsg->subject);
                my $f = ascii_html($smsg->from_name);
                my $ts = PublicInbox::View::fmt_ts($smsg->ts);
-               my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->as_href;
+               my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
                $$res .= qq{$rank. <b><a\nhref="$mid/">}.
                        $s . "</a></b>\n";
                $$res .= "$pfx  - by $f @ $ts UTC [$pct%]\n\n";
@@ -239,6 +239,7 @@ package PublicInbox::SearchQuery;
 use strict;
 use warnings;
 use PublicInbox::Hval;
+use PublicInbox::MID qw(mid_escape);
 
 sub new {
        my ($class, $qp) = @_;
@@ -263,7 +264,7 @@ sub qs_html {
                $self = $tmp;
        }
 
-       my $q = PublicInbox::Hval->new($self->{'q'})->as_href;
+       my $q = mid_escape($self->{'q'});
        $q =~ s/%20/+/g; # improve URL readability
        my $qs = "q=$q";
 

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 3982a47fa2fe0598d3204ad8184ab4398a0f3de7..34f97c7696ebbd0110ed6be75aa2210c0e63f615 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -10,7 +10,7 @@ use URI::Escape qw/uri_escape_utf8/;
 use Date::Parse qw/str2time/;
 use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::Linkify;
-use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
+use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/;
 use PublicInbox::MsgIter;
 use PublicInbox::Address;
 use PublicInbox::WwwStream;
@@ -125,7 +125,6 @@ sub index_entry {
        my $mid_raw = mid_clean(mid_mime($mime));
        my $id = id_compress($mid_raw, 1);
        my $id_m = 'm'.$id;
-       my $mid = PublicInbox::Hval->new_msgid($mid_raw);
 
        my $root_anchor = $ctx->{root_anchor} || '';
        my $irt = in_reply_to($hdr);
@@ -142,7 +141,7 @@ sub index_entry {
        }
        $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
        my $upfx = $ctx->{-upfx};
-       my $mhref = $upfx . $mid->as_href . '/';
+       my $mhref = $upfx . mid_escape($mid_raw) . '/';
        $rv .= qq{ (<a\nhref="$mhref">permalink</a> / };
        $rv .= qq{<a\nhref="${mhref}raw">raw</a>)\n};
        $rv .= '  '.join('; +', @tocc) . "\n" if @tocc;
@@ -150,7 +149,7 @@ sub index_entry {
        my $mapping = $ctx->{mapping};
        if (!$mapping && $irt) {
                my $mirt = PublicInbox::Hval->new_msgid($irt);
-               my $href = $upfx . $mirt->as_href . '/';
+               my $href = $upfx . $mirt->{href}. '/';
                my $html = $mirt->as_html;
                $rv .= qq(In-Reply-To: &lt;<a\nhref="$href">$html</a>&gt;\n)
        }
@@ -568,7 +567,7 @@ sub _parent_headers {
        if (defined $irt) {
                my $v = PublicInbox::Hval->new_msgid($irt);
                my $html = $v->as_html;
-               my $href = $v->as_href;
+               my $href = $v->{href};
                $rv .= "In-Reply-To: &lt;";
                $rv .= "<a\nhref=\"../$href/\">$html</a>&gt;\n";
        }
@@ -627,7 +626,7 @@ sub mailto_arg_link {
        $subj = "Re: $subj" unless $subj =~ /\bRe:/i;
        my $mid = $hdr->header_raw('Message-ID');
        push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
-       my $irt = uri_escape_utf8($mid);
+       my $irt = mid_escape($mid);
        delete $cc{$to};
        push @arg, "--to=$to";
        $to = uri_escape_utf8($to);
@@ -657,17 +656,17 @@ sub html_footer {
                $next = $prev = '    ';
 
                if (my $n = $ctx->{next_msg}) {
-                       $n = PublicInbox::Hval->new_msgid($n)->as_href;
+                       $n = PublicInbox::Hval->new_msgid($n)->{href};
                        $next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
                }
                my $u;
                my $par = $ctx->{parent_msg};
                if ($par) {
-                       $u = PublicInbox::Hval->new_msgid($par)->as_href;
+                       $u = PublicInbox::Hval->new_msgid($par)->{href};
                        $u = "$upfx$u/";
                }
                if (my $p = $ctx->{prev_msg}) {
-                       $prev = PublicInbox::Hval->new_msgid($p)->as_href;
+                       $prev = PublicInbox::Hval->new_msgid($p)->{href};
                        if ($p && $par && $p eq $par) {
                                $prev = "<a\nhref=\"$upfx$prev/\"\n" .
                                        'rel=prev>prev parent</a>';
@@ -692,7 +691,7 @@ sub html_footer {
 sub linkify_ref_nosrch {
        my $v = PublicInbox::Hval->new_msgid($_[0]);
        my $html = $v->as_html;
-       my $href = $v->as_href;
+       my $href = $v->{href};
        "&lt;<a\nhref=\"../$href/\">$html</a>&gt;";
 }
 
@@ -707,7 +706,7 @@ sub ghost_parent {
        return '[no common parent]' if ($mid eq 'subject dummy');
 
        $mid = PublicInbox::Hval->new_msgid($mid);
-       my $href = $mid->as_href;
+       my $href = $mid->{href};
        my $html = $mid->as_html;
        qq{[parent not found: &lt;<a\nhref="$upfx$href/">$html</a>&gt;]};
 }
@@ -793,7 +792,7 @@ sub _skel_header {
                $s = PublicInbox::Hval->new($s);
                $s = $s->as_html;
        }
-       my $m = PublicInbox::Hval->new_msgid($mid);
+       my $m;
        my $id = '';
        my $mapping = $ctx->{mapping};
        my $end = defined($s) ? "$s</a> $f\n" : "$f</a>\n";
@@ -804,7 +803,7 @@ sub _skel_header {
                $map->[1] = "$d<a\nhref=\"$m\">$end";
                $id = "\nid=r".$id;
        } else {
-               $m = $ctx->{-upfx}.$m->as_href.'/';
+               $m = $ctx->{-upfx}.mid_escape($mid).'/';
        }
        $$dst .=  $d . "<a\nhref=\"$m\"$id>" . $end;
 }
@@ -829,7 +828,7 @@ sub skel_dump {
                $d .= indent_for($level) . th_pfx($level);
                my $upfx = $ctx->{-upfx};
                my $m = PublicInbox::Hval->new_msgid($mid);
-               my $href = $upfx . $m->as_href . '/';
+               my $href = $upfx . $m->{href} . '/';
                my $html = $m->as_html;
 
                if ($map) {
@@ -911,7 +910,7 @@ sub dump_topics {
                @$topic = ();
                next unless defined $top;  # ghost topic
                my $mid = delete $seen->{$top};
-               my $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+               my $href = mid_escape($mid);
                $top = PublicInbox::Hval->new($top)->as_html;
                $ts = fmt_ts($ts);
 
@@ -935,7 +934,7 @@ sub dump_topics {
                        my $sub = $ex[$i + 1];
                        $mid = delete $seen->{$sub};
                        $sub = PublicInbox::Hval->new($sub)->as_html;
-                       $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+                       $href = mid_escape($mid);
                        $s .= indent_for($level) . TCHILD;
                        $s .= "<a\nhref=\"$href/T/#u\">$sub</a>\n";
                }

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 60cb4430114e3e9bd87baa71a956dd0c957affc7..6f6a00331fe99c2ee969383dd4509bb59d13fc10 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -15,7 +15,8 @@ use strict;
 use warnings;
 use PublicInbox::Config;
 use PublicInbox::Hval;
-use URI::Escape qw(uri_escape_utf8 uri_unescape);
+use URI::Escape qw(uri_unescape);
+use PublicInbox::MID qw(mid_escape);
 require PublicInbox::Git;
 use PublicInbox::GitHTTPBackend;
 our $INBOX_RE = qr!\A/([\w\.\-]+)!;
@@ -353,7 +354,7 @@ sub r301 {
        }
        my $url = $obj->base_url($ctx->{env});
        my $qs = $ctx->{env}->{QUERY_STRING};
-       $url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
+       $url .= (mid_escape($mid) . '/') if (defined $mid);
        $url .= $suffix if (defined $suffix);
        $url .= "?$qs" if $qs ne '';
 

diff --git a/scripts/ssoma-replay b/scripts/ssoma-replay
index 91c121dd2f0e3eda8b1232d8c8cdfbab325ec8d7..3c3fdf4857d239fe48462ffb72bc70950bae30d0 100755 (executable)
--- a/scripts/ssoma-replay
+++ b/scripts/ssoma-replay
@@ -53,7 +53,8 @@ if (defined $list_id) {
                if ($mid =~ /\A<(.+)>\z/) {
                        $mid = $1;
                }
-               $mid = uri_escape_utf8($mid);
+               $mid = uri_escape_utf8($mid,
+                               '^A-Za-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@');
                $header_obj->header_set('List-Archive', "<$archive_url>");
 
                foreach my $h (qw(Help Unsubscribe Subscribe Owner)) {

diff --git a/t/cgi.t b/t/cgi.t
index a0f09c594a1127070d8f40ad7ed5e6b1ceca6b4a..092ad8c7ca05a4f38040bd2b35efb71fa2ebca3e 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -118,7 +118,7 @@ EOF
        like($res->{head}, qr/Status:\s*206/i, "info/refs partial past end OK");
        is($res->{body}, substr($orig, 5), 'partial body OK past end');
 }
-
+use Data::Dumper;
 # atom feeds
 {
        local $ENV{HOME} = $home;
@@ -126,7 +126,7 @@ EOF
        like($res->{body}, qr/<title>test for public-inbox/,
                "set title in XML feed");
        like($res->{body},
-               qr!http://test\.example\.com/test/blah%40example\.com/!,
+               qr!http://test\.example\.com/test/blah\@example\.com/!,
                "link id set");
        like($res->{body}, qr/what\?/, "reply included");
 }
@@ -148,7 +148,7 @@ EOF
        $im->add($reply);
        $im->done;
 
-       my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
+       my $res = cgi_run("/test/slashy%2fasdf\@example.com/raw");
        like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
                "slashy mid raw hit");
 
@@ -167,20 +167,20 @@ EOF
        $res = cgi_run("/test/blahblah\@example.com/f/");
        like($res->{head}, qr/Status: 301 Moved/, "301 response");
        like($res->{head},
-               qr!^Location: http://[^/]+/test/blahblah%40example\.com/\r\n!ms,
+               qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms,
                '301 redirect location');
        $res = cgi_run("/test/blahblah\@example.con/");
        like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
 
        $res = cgi_run("/test/new.html");
-       like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
+       like($res->{body}, qr/slashy%2Fasdf\@example\.com/,
                "slashy URL generated correctly");
 }
 
 # retrieve thread as an mbox
 {
        local $ENV{HOME} = $home;
-       my $path = "/test/blahblah%40example.com/t.mbox.gz";
+       my $path = "/test/blahblah\@example.com/t.mbox.gz";
        my $res = cgi_run($path);
        like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled");
        my $indexed = system($index, $maindir) == 0;
@@ -200,7 +200,7 @@ EOF
 
        my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed;
        if ($have_xml_feed) {
-               $path = "/test/blahblah%40example.com/t.atom";
+               $path = "/test/blahblah\@example.com/t.atom";
                $res = cgi_run($path);
                like($res->{head}, qr/^Status: 200 /, "atom returned 200");
                like($res->{head}, qr!^Content-Type: application/atom\+xml!m,

diff --git a/t/check-www-inbox.perl b/t/check-www-inbox.perl
index 6be631e9dc5c0e89ffff5a1530a72cbcddbdb40d..4319049c8a1c8e7ec5fae84a9e3349be28c30cba 100644 (file)
--- a/t/check-www-inbox.perl
+++ b/t/check-www-inbox.perl
@@ -131,10 +131,6 @@ sub worker_loop {
                        warn "W: ".$r->code . " $u\n"
                }
 
-               # check bad links
-               my @at = grep(/@/, @links);
-               print "BAD: $u ", join("\n", @at), "\n" if @at;
-
                my $s;
                # blocking
                foreach my $l (@links, "DONE\t$u") {

diff --git a/t/mid.t b/t/mid.t
new file mode 100644 (file)
index 0000000..b0af838
--- /dev/null
+++ b/t/mid.t
@@ -0,0 +1,11 @@
+# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use Test::More;
+use PublicInbox::MID qw(mid_escape);
+
+is(mid_escape('foo!@(bar)'), 'foo!@(bar)');
+is(mid_escape('foo%!@(bar)'), 'foo%25!@(bar)');
+is(mid_escape('foo%!@(bar)'), 'foo%25!@(bar)');
+
+done_testing();
+1;

diff --git a/t/nntp.t b/t/nntp.t
index de07abb0f38ea9a82b8560329dd9d17a703cdb16..7500d6b9a57662ce7708a644984e7d0616cdd035 100644 (file)
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -112,7 +112,7 @@ use_ok 'PublicInbox::Inbox';
        PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 1, $mid);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
-       is_deeply([ $mime->header('Archived-At') ], [ "<${u}a%40b/>" ],
+       is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
                'Archived-At: set');
        is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ],
                'List-Archive: set');
@@ -128,7 +128,7 @@ use_ok 'PublicInbox::Inbox';
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ],
-               [ "<${u}a%40b/>", '<http://mirror.example.com/m/a%40b/>' ],
+               [ "<${u}a\@b/>", '<http://mirror.example.com/m/a@b/>' ],
                'Archived-At: appended');
        is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
                'Old Xref: clobbered');

diff --git a/t/plack.t b/t/plack.t
index db3a9b23dffb61fdaeeb8f61b971b8a65eb01c52..608afb9e8471804b72cda674f691a902a0bc991b 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -97,7 +97,7 @@ EOF
        foreach my $t (qw(t T)) {
                test_psgi($app, sub {
                        my ($cb) = @_;
-                       my $u = $pfx . "/blah%40example.com/$t";
+                       my $u = $pfx . "/blah\@example.com/$t";
                        my $res = $cb->(GET($u));
                        is(301, $res->code, "redirect for missing /");
                        my $location = $res->header('Location');
@@ -108,11 +108,11 @@ EOF
        foreach my $t (qw(f)) {
                test_psgi($app, sub {
                        my ($cb) = @_;
-                       my $u = $pfx . "/blah%40example.com/$t";
+                       my $u = $pfx . "/blah\@example.com/$t";
                        my $res = $cb->(GET($u));
                        is(301, $res->code, "redirect for legacy /f");
                        my $location = $res->header('Location');
-                       like($location, qr!/blah%40example\.com/\z!,
+                       like($location, qr!/blah\@example\.com/\z!,
                                'redirected with missing /');
                });
        }
@@ -124,7 +124,7 @@ EOF
                is(200, $res->code, 'success response received');
                like($res->content, qr!href="new\.atom"!,
                        'atom URL generated');
-               like($res->content, qr!href="blah%40example\.com/"!,
+               like($res->content, qr!href="blah\@example\.com/"!,
                        'index generated');
        });
 
@@ -133,13 +133,13 @@ EOF
                my $res = $cb->(GET($pfx . '/atom.xml'));
                is(200, $res->code, 'success response received for atom');
                like($res->content,
-                       qr!link\s+href="\Q$pfx\E/blah%40example\.com/"!s,
+                       qr!link\s+href="\Q$pfx\E/blah\@example\.com/"!s,
                        'atom feed generated correct URL');
        });
 
        test_psgi($app, sub {
                my ($cb) = @_;
-               my $path = '/blah%40example.com/';
+               my $path = '/blah@example.com/';
                my $res = $cb->(GET($pfx . $path));
                is(200, $res->code, "success for $path");
                like($res->content, qr!<title>hihi - Me</title>!,
@@ -149,13 +149,13 @@ EOF
                $res = $cb->(GET($pfx . $path));
                is(301, $res->code, "redirect for $path");
                my $location = $res->header('Location');
-               like($location, qr!/blah%40example\.com/\z!,
+               like($location, qr!/blah\@example\.com/\z!,
                        '/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
        });
 
        test_psgi($app, sub {
                my ($cb) = @_;
-               my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
+               my $res = $cb->(GET($pfx . '/blah@example.com/raw'));
                is(200, $res->code, 'success response received for /*/raw');
                like($res->content, qr!^From !sm, "mbox returned");
        });
@@ -164,10 +164,10 @@ EOF
        foreach my $t (qw(m f)) {
                test_psgi($app, sub {
                        my ($cb) = @_;
-                       my $res = $cb->(GET($pfx . "/$t/blah%40example.com.txt"));
+                       my $res = $cb->(GET($pfx . "/$t/blah\@example.com.txt"));
                        is(301, $res->code, "redirect for old $t .txt link");
                        my $location = $res->header('Location');
-                       like($location, qr!/blah%40example\.com/raw\z!,
+                       like($location, qr!/blah\@example\.com/raw\z!,
                                ".txt redirected to /raw");
                });
        }
@@ -180,22 +180,22 @@ EOF
        while (my ($t, $e) = each %umap) {
                test_psgi($app, sub {
                        my ($cb) = @_;
-                       my $res = $cb->(GET($pfx . "/$t/blah%40example.com.html"));
+                       my $res = $cb->(GET($pfx . "/$t/blah\@example.com.html"));
                        is(301, $res->code, "redirect for old $t .html link");
                        my $location = $res->header('Location');
                        like($location,
-                               qr!/blah%40example\.com/$e(?:#u)?\z!,
+                               qr!/blah\@example\.com/$e(?:#u)?\z!,
                                ".html redirected to new location");
                });
        }
        foreach my $sfx (qw(mbox mbox.gz)) {
                test_psgi($app, sub {
                        my ($cb) = @_;
-                       my $res = $cb->(GET($pfx . "/t/blah%40example.com.$sfx"));
+                       my $res = $cb->(GET($pfx . "/t/blah\@example.com.$sfx"));
                        is(301, $res->code, 'redirect for old thread link');
                        my $location = $res->header('Location');
                        like($location,
-                            qr!/blah%40example\.com/t\.mbox(?:\.gz)?\z!,
+                            qr!/blah\@example\.com/t\.mbox(?:\.gz)?\z!,
                             "$sfx redirected to /mbox.gz");
                });
        }

diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index dae45bafe81af1f1a40ab34bced2338cd41e1a4f..4a515c6a0c6e4f610e35eda807130cd59dc3044d 100644 (file)
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -67,7 +67,7 @@ test_psgi($app, sub {
        is($res->code, 200, 'OK with URLMap mount');
        $res = $cb->(GET('/a/test/m/blah%40example.com.html'));
        is($res->header('Location'),
-               'http://localhost/a/test/blah%40example.com/',
+               'http://localhost/a/test/blah@example.com/',
                'redirect functions properly under mount');
 
        $res = $cb->(GET('/test/blah%40example.com/'));