diff options
author | Eric Wong <e@yhbt.net> | 2020-07-17 06:07:10 +0000 |
---|---|---|
committer | Eric Wong <e@yhbt.net> | 2020-07-17 18:54:53 +0000 |
commit | d87dd0e6795870439422ee4f0039d0d76d1974b3 (patch) | |
tree | 6f548bc6a49623cb183e387ba12d39a1e5f3ce3f | |
parent | 95d17835014ece9d53791a07ddf294ad2986abf9 (diff) | |
download | public-inbox-d87dd0e6795870439422ee4f0039d0d76d1974b3.tar.gz |
"\n" and other characters requiring quoting and/or escaping in in $GIT_DIR/objects/info/alternates was not supported in git 2.11 and earlier; nor does it seem supported at all in libgit2. This will allow us to support sharing git-cat-file or similar endpoints across multiple inboxes via alternates. This breaks an existing use case for anybody wacky enough to put `\n' in the `inboxdir' pathname; but I doubt this affects anybody.
-rw-r--r-- | lib/PublicInbox/Config.pm | 5 | ||||
-rwxr-xr-x | script/public-inbox-init | 1 | ||||
-rw-r--r-- | t/config.t | 16 | ||||
-rw-r--r-- | t/init.t | 8 |
4 files changed, 26 insertions, 4 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index c0e2cc57..67199bb3 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -393,7 +393,10 @@ sub _fill { # backwards compatibility: $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"}; - + if (($ibx->{inboxdir} // '') =~ /\n/s) { + warn "E: `$ibx->{inboxdir}' must not contain `\\n'\n"; + return; + } foreach my $k (qw(obfuscate)) { my $v = $self->{"$pfx.$k"}; defined $v or next; diff --git a/script/public-inbox-init b/script/public-inbox-init index c7f3da6f..951338af 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -115,6 +115,7 @@ my $pfx = "publicinbox.$name"; my @x = (qw/git config/, "--file=$pi_config_tmp"); $inboxdir = abs_path($inboxdir); +die "`\\n' not allowed in `$inboxdir'\n" if $inboxdir =~ /\n/s; if (-f "$inboxdir/inbox.lock") { if (!defined $version) { $version = 2; @@ -10,13 +10,23 @@ my ($tmpdir, $for_destroy) = tmpdir(); { PublicInbox::Import::init_bare($tmpdir); - my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi"); + my $inboxdir = "$tmpdir/new\nline"; + my @cmd = ('git', "--git-dir=$tmpdir", + qw(config publicinbox.foo.inboxdir), $inboxdir); is(xsys(@cmd), 0, "set config"); my $tmp = PublicInbox::Config->new("$tmpdir/config"); - is("hi\nhi", $tmp->{"foo.bar"}, "config read correctly"); - is("true", $tmp->{"core.bare"}, "used --bare repo"); + is($tmp->{'publicinbox.foo.inboxdir'}, $inboxdir, + 'config read correctly'); + is($tmp->{'core.bare'}, 'true', 'init used --bare repo'); + + my @warn; + local $SIG{__WARN__} = sub { push @warn, @_ }; + $tmp = PublicInbox::Config->new("$tmpdir/config"); + is($tmp->lookup_name('foo'), undef, 'reject invalid inboxdir'); + like("@warn", qr/^E:.*must not contain `\\n'/sm, + 'warned about newline'); } { @@ -49,6 +49,14 @@ sub quiet_fail { ok(unlink("$cfgfile.lock"), '-init did not unlink lock on failure'); } +{ + my $rdr = { 2 => \(my $err = '') }; + my $cmd = [ '-init', 'alist', "$tmpdir/a\nlist", + qw(http://example.com/alist alist@example.com) ]; + ok(!run_script($cmd, undef, $rdr), + 'public-inbox-init rejects LF in inboxdir'); + like($err, qr/`\\n' not allowed in `/s, 'reported \\n'); +} SKIP: { require_mods(qw(DBD::SQLite Search::Xapian::WritableDatabase), 2); |