* Re: [PATCH] www: fix manifest.js.gz for default publicInbox.grokManifest
2021-06-28 21:59 5% ` [PATCH] www: fix manifest.js.gz for default publicInbox.grokManifest Eric Wong
@ 2021-06-30 2:37 7% ` Kyle Meyer
0 siblings, 0 replies; 2+ results
From: Kyle Meyer @ 2021-06-30 2:37 UTC (permalink / raw)
To: Eric Wong; +Cc: meta
Eric Wong writes:
> Fixes: 520be116e8a686cb ("www_listing: start updating for pagination + search")
Confirmed. Thank you for the quick fix.
^ permalink raw reply [relevance 7%]
* [PATCH] www: fix manifest.js.gz for default publicInbox.grokManifest
@ 2021-06-28 21:59 5% ` Eric Wong
2021-06-30 2:37 7% ` Kyle Meyer
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-06-28 21:59 UTC (permalink / raw)
To: meta; +Cc: Kyle Meyer
ManifestJsGz->response was not invoking the new "url_filter"
method properly. Furthermore, fix url_filter for returning 404
responses.
Reported-by: Kyle Meyer <kyle@kyleam.com>
Link: https://public-inbox.org/meta/87fsx3128a.fsf@kyleam.com/
Fixes: 520be116e8a686cb ("www_listing: start updating for pagination + search")
---
lib/PublicInbox/ManifestJsGz.pm | 4 +--
lib/PublicInbox/WwwListing.pm | 2 +-
t/www_listing.t | 53 ++++++++++++++++++++-------------
3 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/lib/PublicInbox/ManifestJsGz.pm b/lib/PublicInbox/ManifestJsGz.pm
index 9dc10791..7fee78dd 100644
--- a/lib/PublicInbox/ManifestJsGz.pm
+++ b/lib/PublicInbox/ManifestJsGz.pm
@@ -13,11 +13,11 @@ use HTTP::Date qw(time2str);
my $json = PublicInbox::Config::json();
-sub url_regexp {
+sub url_filter {
my ($ctx) = @_;
# grokmirror uses relative paths, so it's domain-dependent
# SUPER calls PublicInbox::WwwListing::url_filter
- ($ctx->url_filter('publicInbox.grokManifest', 'match=domain'))[0];
+ $ctx->SUPER::url_filter('publicInbox.grokManifest', 'match=domain');
}
sub inject_entry ($$$;$) {
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index 76c76663..98a69986 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -55,7 +55,7 @@ again:
} elsif ($v eq 'all') {
(qr/./, undef);
} elsif ($v eq '404') {
- undef;
+ (undef, undef);
} else {
warn <<EOF;
`$v' is not a valid value for `$key'
diff --git a/t/www_listing.t b/t/www_listing.t
index 6a2892de..6b3b408f 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -1,14 +1,15 @@
+#!perl -w
# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# manifest.js.gz generation and grok-pull integration test
use strict;
-use warnings;
+use v5.10.1;
use Test::More;
use PublicInbox::Spawn qw(which);
use PublicInbox::TestCommon;
use PublicInbox::Import;
-require_mods(qw(json URI::Escape Plack::Builder Digest::SHA
- IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny));
+use IO::Uncompress::Gunzip qw(gunzip);
+require_mods(qw(json URI::Escape Plack::Builder Digest::SHA HTTP::Tiny));
require PublicInbox::WwwListing;
require PublicInbox::ManifestJsGz;
use PublicInbox::Config;
@@ -32,21 +33,23 @@ like($bare->manifest_entry->{fingerprint}, qr/\A[a-f0-9]{40}\z/,
'got fingerprint with non-empty repo');
sub tiny_test {
- my ($json, $host, $port) = @_;
- my $tmp;
+ my ($json, $host, $port, $html) = @_;
+ my ($tmp, $res);
my $http = HTTP::Tiny->new;
- my $res = $http->get("http://$host:$port/");
- is($res->{status}, 200, 'got HTML listing');
- like($res->{content}, qr!</html>!si, 'listing looks like HTML');
-
- $res = $http->get("http://$host:$port/", {'Accept-Encoding'=>'gzip'});
- is($res->{status}, 200, 'got gzipped HTML listing');
- IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp);
- like($tmp, qr!</html>!si, 'unzipped listing looks like HTML');
-
+ if ($html) {
+ $res = $http->get("http://$host:$port/");
+ is($res->{status}, 200, 'got HTML listing');
+ like($res->{content}, qr!</html>!si, 'listing looks like HTML');
+
+ $res = $http->get("http://$host:$port/",
+ {'Accept-Encoding'=>'gzip'});
+ is($res->{status}, 200, 'got gzipped HTML listing');
+ gunzip(\(delete $res->{content}) => \$tmp);
+ like($tmp, qr!</html>!si, 'unzipped listing looks like HTML');
+ }
$res = $http->get("http://$host:$port/manifest.js.gz");
is($res->{status}, 200, 'got manifest');
- IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp);
+ gunzip(\(delete $res->{content}) => \$tmp);
unlike($tmp, qr/"modified":\s*"/, 'modified is an integer');
my $manifest = $json->decode($tmp);
ok(my $clone = $manifest->{'/alt'}, '/alt in manifest');
@@ -95,10 +98,9 @@ SKIP: {
"lorelei \xc4\x80"), 0,
'set gitweb user');
ok(unlink("$bare->{git_dir}/description"), 'removed bare/description');
- open $fh, '>', $cfgfile or die;
- print $fh <<"" or die;
-[publicinbox]
- wwwlisting = all
+ open $fh, '>', $cfgfile or xbail "open $cfgfile: $!";
+ $fh->autoflush(1);
+ print $fh <<"" or xbail "print $!";
[publicinbox "bare"]
inboxdir = $bare->{git_dir}
url = http://$host/bare
@@ -112,13 +114,22 @@ SKIP: {
url = http://$host/v2
address = v2\@example.com
- close $fh or die;
my $env = { PI_CONFIG => $cfgfile };
my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
$td = start_script($cmd, $env, { 3 => $sock });
- $sock = undef;
+ # default publicinboxGrokManifest match=domain default
tiny_test($json, $host, $port);
+ undef $td;
+
+ print $fh <<"" or xbail "print $!";
+[publicinbox]
+ wwwlisting = all
+
+ close $fh or xbail "close $!";
+ $td = start_script($cmd, $env, { 3 => $sock });
+ tiny_test($json, $host, $port, 1);
+ undef $sock;
my $grok_pull = which('grok-pull') or
skip('grok-pull not available', 12);
^ permalink raw reply related [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-06-27 20:28 empty /manifest.js.gz response as of 520be116 Kyle Meyer
2021-06-28 21:59 5% ` [PATCH] www: fix manifest.js.gz for default publicInbox.grokManifest Eric Wong
2021-06-30 2:37 7% ` Kyle Meyer
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).