From dbb6c7b51862d0ea7438f5fb393d115ea46f1fab Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 1 Oct 2019 07:01:30 +0000 Subject: www: fix absolute URLs when mounted under a subdir While we avoid generating absolute URLs in most cases, our "git clone" instructions and URL headers in mboxrd files contain full URLs. So do the same thing we do for WwwAtomStream and pre-generate the full URL before Plack::App::URLMap changes $env->{PATH_INFO} and $env->{SCRIPT_NAME} back to their original values. Reported-by: edef Link: https://public-inbox.org/meta/cover.0f97c47bb88db8b875be7497289d8fedd3b11991.1569296942.git-series.edef@edef.eu/ --- t/psgi_mount.t | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/psgi_mount.t b/t/psgi_mount.t index 05dbd736..8da2bc89 100644 --- a/t/psgi_mount.t +++ b/t/psgi_mount.t @@ -60,11 +60,24 @@ test_psgi($app, sub { unlike($res->content, qr!\b\Qhttp://[^/]+/test/\E!, 'No URLs which are not mount-aware'); - # redirects + $res = $cb->(GET('/a/test/new.html')); + like($res->content, qr!git clone --mirror http://[^/]+/a/test\b!, + 'clone URL in new.html is mount-aware'); + $res = $cb->(GET('/a/test/blah%40example.com/')); is($res->code, 200, 'OK with URLMap mount'); + like($res->content, qr!git clone --mirror http://[^/]+/a/test\b!, + 'clone URL in /$INBOX/$MESSAGE_ID/ is mount-aware'); + $res = $cb->(GET('/a/test/blah%40example.com/raw')); is($res->code, 200, 'OK with URLMap mount'); + like($res->content, qr!^List-Archive: !m, + 'List-Archive set in /raw mboxrd'); + like($res->content, + qr!^Archived-At: !m, + 'Archived-At set in /raw mboxrd'); + + # redirects $res = $cb->(GET('/a/test/m/blah%40example.com.html')); is($res->header('Location'), 'http://localhost/a/test/blah@example.com/', @@ -72,7 +85,28 @@ test_psgi($app, sub { $res = $cb->(GET('/test/blah%40example.com/')); is($res->code, 404, 'intentional 404 with URLMap mount'); - }); +SKIP: { + my @mods = qw(DBI DBD::SQLite Search::Xapian IO::Uncompress::Gunzip); + foreach my $mod (@mods) { + eval "require $mod" or skip "$mod not available: $@", 2; + } + my $ibx = $config->lookup_name('test'); + PublicInbox::SearchIdx->new($ibx, 1)->index_sync; + test_psgi($app, sub { + my ($cb) = @_; + my $res = $cb->(GET('/a/test/blah@example.com/t.mbox.gz')); + my $gz = $res->content; + my $raw; + IO::Uncompress::Gunzip::gunzip(\$gz => \$raw); + like($raw, qr!^List-Archive: !m, + 'List-Archive set in /t.mbox.gz mboxrd'); + like($raw, + qr!^Archived-At:\x20 + !mx, + 'Archived-At set in /t.mbox.gz mboxrd'); + }); +} + done_testing(); -- cgit v1.2.3-24-ge0c7