view: fix addr2urlmap with Plack::Builder::mount

Plack::App::URLMap does not preserve SCRIPT_NAME set for PSGI
`mount' directives when running response callbacks.  Thus we
must get $ibx->base_url($ctx->{env}) calls to generate correct
full URLs when relying on publicinbox.nameIsUrl up front before
the PSGI response callback is returned.

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index a1c1d4d64057c841b16cde7446a0b3ef5bedc24b..b6e4267f98c2442a0815bd49dc8c275c35a1a892 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -19,6 +19,7 @@ sub generate {
        my ($ctx) = @_;
        my $msgs = $ctx->{msgs} = recent_msgs($ctx);
        return _no_thread() unless @$msgs;
+       PublicInbox::View::addr2urlmap $ctx;
        PublicInbox::WwwAtomStream->response($ctx, \&generate_i);
 }
 
@@ -26,6 +27,7 @@ sub generate_thread_atom {
        my ($ctx) = @_;
        my $msgs = $ctx->{msgs} = $ctx->{ibx}->over->get_thread($ctx->{mid});
        return _no_thread() unless @$msgs;
+       PublicInbox::View::addr2urlmap $ctx;
        PublicInbox::WwwAtomStream->response($ctx, \&generate_i);
 }
 
@@ -69,6 +71,7 @@ sub new_html {
        $ctx->{-upfx} = '';
        $ctx->{-spfx} = '' if $ctx->{ibx}->{coderepo};
        $ctx->{-hr} = 1;
+       PublicInbox::View::addr2urlmap $ctx;
        PublicInbox::WwwStream::aresponse($ctx, \&new_html_i);
 }
 

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 3729c27bb19f7c8afc8d2399f1f6f109d0abc341..1213b3d3748f502c5e193890789d4f38a29d7a8a 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -33,6 +33,7 @@ sub sres_top_html {
        my $srch = $ctx->{srch} = $ctx->{ibx}->isrch or
                return PublicInbox::WWW::need($ctx, 'Search');
        my $q = PublicInbox::SearchQuery->new($ctx->{qp});
+       PublicInbox::View::addr2urlmap $ctx if $q->{x} eq 't';
        my $o = $q->{o} // 0;
        my $asc;
        if ($o < 0) {

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 19f4168edc6978aa767fa3e53ee1cfcedbb34de8..75387dce1322b34d12110dfad36f71fde8692f9a 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -64,10 +64,39 @@ sub no_over_html ($) {
        $ctx->html_done;
 }
 
+sub addr2urlmap ($) {
+       my ($ctx) = @_;
+       # cache makes a huge difference with /[tT] and large threads
+       my $key = PublicInbox::Git::host_prefix_url($ctx->{env}, '');
+       my $ent = $ctx->{www}->{pi_cfg}->{-addr2urlmap}->{$key} // do {
+               my $by_addr = $ctx->{www}->{pi_cfg}->{-by_addr};
+               my (%addr2url, $url);
+               while (my ($addr, $ibx) = each %$by_addr) {
+                       $url = $ibx->base_url // $ibx->base_url($ctx->{env});
+                       $addr2url{ascii_html($addr)} = ascii_html($url) if
+                               defined $url
+               }
+               # don't allow attackers to randomly change Host: headers
+               # and OOM us if the server handles all hostnames:
+               my $tmp = $ctx->{www}->{pi_cfg}->{-addr2urlmap};
+               my @k = keys %$tmp; # random order
+               delete @$tmp{@k[0..3]} if scalar(@k) > 7;
+               if (scalar keys %addr2url) {
+                       my $re = join('|', map { quotemeta } keys %addr2url);
+                       $tmp->{$key} = [ qr/\b($re)\b/i, \%addr2url ];
+               } else { # nothing? NUL should never match:
+                       [ qr/(\0)/, { "\0" => './' } ];
+               }
+       };
+       $ctx->{-addr2urlmap} = $ent;
+}
+
 # public functions: (unstable)
 
+# GET /$INBOX/$MSGID/ (single message page)
 sub msg_page {
        my ($ctx) = @_;
+       addr2urlmap $ctx;
        my $ibx = $ctx->{ibx};
        $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
        my $over = $ibx->over or return no_over_html($ctx);
@@ -187,38 +216,10 @@ sub nr_to_s ($$$) {
        $nr == 1 ? "$nr $singular" : "$nr $plural";
 }
 
-sub addr2urlmap ($) {
-       my ($ctx) = @_;
-       # cache makes a huge difference with /[tT] and large threads
-       my $key = PublicInbox::Git::host_prefix_url($ctx->{env}, '');
-       my $ent = $ctx->{www}->{pi_cfg}->{-addr2urlmap}->{$key} // do {
-               my $by_addr = $ctx->{www}->{pi_cfg}->{-by_addr};
-               my (%addr2url, $url);
-               while (my ($addr, $ibx) = each %$by_addr) {
-                       $url = $ibx->base_url // $ibx->base_url($ctx->{env});
-                       $addr2url{ascii_html($addr)} = ascii_html($url) if
-                               defined $url;
-               }
-               # don't allow attackers to randomly change Host: headers
-               # and OOM us if the server handles all hostnames:
-               my $tmp = $ctx->{www}->{pi_cfg}->{-addr2urlmap};
-               my @k = keys %$tmp; # random order
-               delete @$tmp{@k[0..3]} if scalar(@k) > 7;
-               if (scalar keys %addr2url) {
-                       my $re = join('|', map { quotemeta } keys %addr2url);
-                       $tmp->{$key} = [ qr/\b($re)\b/i, \%addr2url ];
-               } else { # nothing? NUL should never match:
-                       [ qr/(\0)/, { "\0" => './' } ];
-               }
-       };
-       @$ent;
-}
-
 # called by /$INBOX/$MSGID/[tT]/
 sub to_cc_html ($$$$) {
        my ($ctx, $eml, $field, $t) = @_;
        my @vals = $eml->header($field) or return ('', 0);
-       my (undef, $addr2url) = addr2urlmap($ctx);
        my $pairs = PublicInbox::Address::pairs(join(', ', @vals));
        my ($len, $line_len, $html) = (0, 0, '');
        my ($pair, $url);
@@ -227,6 +228,7 @@ sub to_cc_html ($$$$) {
        my @html = split /\n/, ascii_html(join("\n", map {
                $_->[0] // (split(/\@/, $_->[1]))[0]; # addr user if no name
        } @$pairs));
+       my (undef, $addr2url) = @{$ctx->{-addr2urlmap}};
        for my $n (@html) {
                $pair = shift @$pairs;
                if ($line_len) { # 9 = display width of ",\t":
@@ -552,6 +554,7 @@ EOM
        walk_thread($rootset, $ctx, \&pre_thread); # pushes to ctx->{skel}
 
        push @{$ctx->{skel}}, '</pre>';
+       addr2urlmap $ctx;
        return stream_thread($rootset, $ctx) unless $ctx->{flat};
 
        # flat display: lazy load the full message from smsg
@@ -724,7 +727,7 @@ href="d/">diff</a>)</pre><pre>];
        $hbuf .= "Date: $_\n" for $eml->header('Date');
        $hbuf = ascii_html($hbuf);
        my $t = $ts ? '?t='.ts2str($ts) : '';
-       my ($re, $addr2url) = addr2urlmap($ctx);
+       my ($re, $addr2url) = @{$ctx->{-addr2urlmap}};
        # $url is relative to /$INBOX/$MSGID/
        $hbuf =~ s#$re#
                my ($addr, $url) = ($1, $addr2url->{lc $1});