From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 03/15] config: reject newlines consistently in dir names
Date: Thu, 30 Nov 2023 11:40:56 +0000 [thread overview]
Message-ID: <20231130114109.2577708-4-e@80x24.org> (raw)
In-Reply-To: <20231130114109.2577708-1-e@80x24.org>
Explicitly drop support for "\n" in git coderepo pathnames as
we do other stuff. Gcf2 (our libgit2 helper) was always
broken with "\n" in pathnames, and I'm not sure if cgit config
files work with them, either. Dealing with newline characters
requires extra complexity that I'm not willing to deal with when
managing alternates files.
---
lib/PublicInbox/Config.pm | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 779e3140..6bebf790 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -361,12 +361,19 @@ sub parse_cgitrc {
cgit_repo_merge($self, $repo->{dir}, $repo) if $repo;
}
+sub valid_dir ($$) {
+ my $dir = get_1($_[0], $_[1]) // return;
+ index($dir, "\n") < 0 ? $dir : do {
+ warn "E: `$_[1]=$dir' must not contain `\\n'\n";
+ undef;
+ }
+}
+
# parse a code repo, only git is supported at the moment
sub fill_coderepo {
my ($self, $nick) = @_;
my $pfx = "coderepo.$nick";
- my $dir = $self->{"$pfx.dir"} // return undef; # aka "GIT_DIR"
- my $git = PublicInbox::Git->new($dir);
+ my $git = PublicInbox::Git->new(valid_dir($self, "$pfx.dir") // return);
if (defined(my $cgits = $self->{"$pfx.cgiturl"})) {
$git->{cgit_url} = $cgits = _array($cgits);
$self->{"$pfx.cgiturl"} = $cgits;
@@ -450,18 +457,15 @@ sub _fill_ibx {
my $v = $self->{"$pfx.$k"};
$ibx->{$k} = $v if defined $v;
}
- for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax
+ for my $k (qw(filter newsgroup replyto httpbackendmax feedmax
indexlevel indexsequentialshard boost)) {
my $v = get_1($self, "$pfx.$k") // next;
$ibx->{$k} = $v;
}
# "mainrepo" is backwards compatibility:
- my $dir = $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"} // return;
- if (index($dir, "\n") >= 0) {
- warn "E: `$dir' must not contain `\\n'\n";
- return;
- }
+ my $dir = $ibx->{inboxdir} = valid_dir($self, "$pfx.inboxdir") //
+ valid_dir($self, "$pfx.mainrepo") // return;
for my $k (qw(obfuscate)) {
my $v = $self->{"$pfx.$k"} // next;
if (defined(my $bval = git_bool($v))) {
@@ -548,12 +552,8 @@ sub _fill_ei ($$) {
my ($self, $name) = @_;
eval { require PublicInbox::ExtSearch } or return;
my $pfx = "extindex.$name";
- my $d = $self->{"$pfx.topdir"} // return;
+ my $d = valid_dir($self, "$pfx.topdir") // return;
-d $d or return;
- if (index($d, "\n") >= 0) {
- warn "E: `$d' must not contain `\\n'\n";
- return;
- }
my $es = PublicInbox::ExtSearch->new($d);
for my $k (qw(indexlevel indexsequentialshard)) {
my $v = get_1($self, "$pfx.$k") // next;
@@ -573,12 +573,8 @@ sub _fill_csrch ($$) {
return if $name ne '' && !valid_foo_name($name, 'cindex');
eval { require PublicInbox::CodeSearch } or return;
my $pfx = "cindex.$name";
- my $d = $self->{"$pfx.topdir"} // return;
+ my $d = valid_dir($self, "$pfx.topdir") // return;
-d $d or return;
- if (index($d, "\n") >= 0) {
- warn "E: `$d' must not contain `\\n'\n";
- return;
- }
my $csrch = PublicInbox::CodeSearch->new($d, $self);
for my $k (qw(localprefix)) {
my $v = $self->{"$pfx.$k"} // next;
next prev parent reply other threads:[~2023-11-30 11:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 11:40 [PATCH 00/15] various cindex fixes + speedups Eric Wong
2023-11-30 11:40 ` [PATCH 01/15] cindex: fix store_repo+repo_stored on no-op Eric Wong
2023-11-30 11:40 ` [PATCH 02/15] codesearch: allow inbox count to exceed matches Eric Wong
2023-11-30 11:40 ` Eric Wong [this message]
2023-11-30 11:40 ` [PATCH 04/15] cindex: only create {-cidx_err} field on failures Eric Wong
2023-11-30 11:40 ` [PATCH 05/15] cindex: keep batch pipe for pruning SHA-256 repos Eric Wong
2023-11-30 11:40 ` [PATCH 06/15] cindex: store extensions.objectFormat with repo data Eric Wong
2023-11-30 21:36 ` Eric Wong
2023-11-30 11:41 ` [PATCH 07/15] git: share unlinked pack checking code with gcf2 Eric Wong
2023-11-30 11:41 ` [PATCH 08/15] cindex: skip getpid guard for most OnDestroy use Eric Wong
2023-11-30 11:41 ` [PATCH 09/15] spawn: drop IO layer support from redirects Eric Wong
2023-11-30 11:41 ` [PATCH 10/15] cindex: speed up initial scan setup phase Eric Wong
2023-11-30 11:41 ` [PATCH 11/15] inbox: expire resources more aggressively Eric Wong
2023-11-30 11:41 ` [PATCH 12/15] git_async_cat: use git from "all" extindex if possible Eric Wong
2023-11-30 11:41 ` [PATCH 13/15] www_listing: support publicInbox.nameIsUrl Eric Wong
2023-12-01 1:29 ` Kyle Meyer
2023-12-01 2:01 ` [PATCH] doc: config: fix grammar for nameIsUrl Eric Wong
2023-11-30 11:41 ` [PATCH 14/15] inbox: shrink data structures for publicinbox.*.hide Eric Wong
2023-11-30 11:41 ` [PATCH 15/15] codesearch: use retry_reopen for WWW Eric Wong
2023-11-30 21:40 ` [PATCH v2] " Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231130114109.2577708-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).