diff options
| -rw-r--r-- | lib/PublicInbox/Config.pm | 7 | ||||
| -rw-r--r-- | lib/PublicInbox/Hval.pm | 6 | ||||
| -rw-r--r-- | lib/PublicInbox/Inbox.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/WwwListing.pm | 4 | ||||
| -rw-r--r-- | t/config.t | 4 | ||||
| -rw-r--r-- | t/feed.t | 2 | ||||
| -rw-r--r-- | t/inbox.t | 4 | ||||
| -rw-r--r-- | t/nntp.t | 2 |
8 files changed, 19 insertions, 12 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 8ecf549d..ffc31f83 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -362,8 +362,8 @@ sub _fill { my ($self, $pfx) = @_; my $ibx = {}; - foreach my $k (qw(inboxdir filter url newsgroup - infourl watch watchheader httpbackendmax + foreach my $k (qw(inboxdir filter newsgroup + watch watchheader httpbackendmax replyto feedmax nntpserver indexlevel)) { my $v = $self->{"$pfx.$k"}; $ibx->{$k} = $v if defined $v; @@ -383,7 +383,8 @@ sub _fill { } # TODO: more arrays, we should support multi-value for # more things to encourage decentralization - foreach my $k (qw(address altid nntpmirror coderepo hide listid)) { + foreach my $k (qw(address altid nntpmirror coderepo hide listid url + infourl)) { if (defined(my $v = $self->{"$pfx.$k"})) { $ibx->{$k} = _array($v); } diff --git a/lib/PublicInbox/Hval.pm b/lib/PublicInbox/Hval.pm index 4a79439f..cd3a4df3 100644 --- a/lib/PublicInbox/Hval.pm +++ b/lib/PublicInbox/Hval.pm @@ -86,6 +86,12 @@ sub raw { sub prurl { my ($env, $u) = @_; + if (ref($u) eq 'ARRAY') { + my $h = $env->{HTTP_HOST} // $env->{SERVER_NAME}; + my @host_match = grep(/\b\Q$h\E\b/, @$u); + $u = $host_match[0] // $u->[0]; + # fall through to below: + } index($u, '//') == 0 ? "$env->{'psgi.url_scheme'}:$u" : $u; } diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index f294c0d5..a3cdcbc0 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -252,7 +252,7 @@ sub base_url { } else { # either called from a non-PSGI environment (e.g. NNTP/POP3) $self->{-base_url} ||= do { - my $url = $self->{url} or return undef; + my $url = $self->{url}->[0] or return undef; # expand protocol-relative URLs to HTTPS if we're # not inside a web server $url = "https:$url" if $url =~ m!\A//!; diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm index 1faade6c..4f076b7d 100644 --- a/lib/PublicInbox/WwwListing.pm +++ b/lib/PublicInbox/WwwListing.pm @@ -32,7 +32,7 @@ sub list_all ($$$) { sub list_match_domain_i { my ($ibx, $arg) = @_; my ($list, $hide_key, $re) = @$arg; - if (!$ibx->{-hide}->{$hide_key} && $ibx->{url} =~ $re) { + if (!$ibx->{-hide}->{$hide_key} && grep($re, @{$ibx->{url}})) { push @$list, $ibx; } } @@ -90,7 +90,7 @@ sub ibx_entry { ${\$ibx->description} if (defined(my $info_url = $ibx->{infourl})) { - $tmp .= ' ' . $info_url . "\n"; + $tmp .= ' ' . PublicInbox::Hval::prurl($env, $info_url) . "\n"; } $tmp; } @@ -27,7 +27,7 @@ my ($tmpdir, $for_destroy) = tmpdir(); 'inboxdir' => '/home/pi/meta-main.git', 'address' => [ 'meta@public-inbox.org' ], 'domain' => 'public-inbox.org', - 'url' => 'http://example.com/meta', + 'url' => [ 'http://example.com/meta' ], -primary_address => 'meta@public-inbox.org', 'name' => 'meta', feedmax => 25, @@ -48,7 +48,7 @@ my ($tmpdir, $for_destroy) = tmpdir(); 'domain' => 'public-inbox.org', 'name' => 'test', feedmax => 25, - 'url' => 'http://example.com/test', + 'url' => [ 'http://example.com/test' ], -httpbackend_limiter => undef, nntpserver => undef, }, "lookup matches expected output for test"); @@ -29,7 +29,7 @@ my $ibx = PublicInbox::Inbox->new({ address => 'test@example', name => 'testbox', inboxdir => $git_dir, - url => 'http://example.com/test', + url => [ 'http://example.com/test' ], feedmax => 3, }); my $git = $ibx->git; @@ -4,9 +4,9 @@ use strict; use warnings; use Test::More; use_ok 'PublicInbox::Inbox'; -my $x = PublicInbox::Inbox->new({url => '//example.com/test/'}); +my $x = PublicInbox::Inbox->new({url => [ '//example.com/test/' ]}); is($x->base_url, 'https://example.com/test/', 'expanded protocol-relative'); -$x = PublicInbox::Inbox->new({url => 'http://example.com/test'}); +$x = PublicInbox::Inbox->new({url => [ 'http://example.com/test' ]}); is($x->base_url, 'http://example.com/test/', 'added trailing slash'); $x = PublicInbox::Inbox->new({}); @@ -104,7 +104,7 @@ use_ok 'PublicInbox::Inbox'; -primary_address => 'a@example.com', newsgroup => 'test', domain => 'example.com', - url => '//example.com/a'}); + url => [ '//example.com/a' ]}); is($ng->base_url, $u, 'URL expanded'); my $mid = 'a@b'; my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n"); |