X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=f2e5d5f0801e4c0f566f51ae654bdc55a5112c38;hb=1d6ebab439828dce8b7e8cbb99dfbc237e9d5a74;hp=113975dd9e2816b7e32366df030423eabecad3d9;hpb=be940983157a1f8bd353cb1891f6971645c73e5d;p=public-inbox.git diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 113975dd..f2e5d5f0 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -12,23 +12,24 @@ use strict; use v5.10.1; use PublicInbox::Inbox; use PublicInbox::Spawn qw(popen_rd); +our $LD_PRELOAD = $ENV{LD_PRELOAD}; # only valid at startup sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] } # returns key-value pairs of config directives in a hash # if keys may be multi-value, the value is an array ref containing all values sub new { - my ($class, $file) = @_; + my ($class, $file, $errfh) = @_; $file //= default_file(); my $self; if (ref($file) eq 'SCALAR') { # used by some tests open my $fh, '<', $file or die; # PerlIO::scalar $self = config_fh_parse($fh, "\n", '='); + bless $self, $class; } else { - $self = git_config_dump($file); + $self = git_config_dump($class, $file, $errfh); $self->{'-f'} = $file; } - bless $self, $class; # caches $self->{-by_addr} = {}; $self->{-by_list_id} = {}; @@ -96,6 +97,11 @@ sub lookup_ei { $self->{-ei_by_name}->{$name} //= _fill_ei($self, $name); } +sub lookup_eidx_key { + my ($self, $eidx_key) = @_; + _lookup_fill($self, '-by_eidx_key', $eidx_key); +} + # special case for [extindex "all"] sub ALL { lookup_ei($_[0], 'all') } @@ -158,13 +164,13 @@ sub config_fh_parse ($$$) { } sub git_config_dump { - my ($file) = @_; - return {} unless -e $file; + my ($class, $file, $errfh) = @_; + return bless {}, $class unless -e $file; my $cmd = [ qw(git config -z -l --includes), "--file=$file" ]; - my $fh = popen_rd($cmd); + my $fh = popen_rd($cmd, undef, { 2 => $errfh // 2 }); my $rv = config_fh_parse($fh, "\0", "\n"); - close $fh or die "failed to close (@$cmd) pipe: $?"; - $rv; + close $fh or die "@$cmd failed: \$?=$?\n"; + bless $rv, $class; } sub valid_foo_name ($;$) { @@ -322,39 +328,25 @@ sub parse_cgitrc { sub _fill_code_repo { my ($self, $nick) = @_; my $pfx = "coderepo.$nick"; - - # TODO: support gitweb and other repository viewers? - if (defined(my $cgitrc = delete $self->{-cgitrc_unparsed})) { - parse_cgitrc($self, $cgitrc, 0); - } - my $dir = $self->{"$pfx.dir"}; # aka "GIT_DIR" - unless (defined $dir) { + my $dir = $self->{"$pfx.dir"} // do { # aka "GIT_DIR" warn "$pfx.dir unset\n"; return; - } - + }; my $git = PublicInbox::Git->new($dir); - foreach my $t (qw(blob commit tree tag)) { - $git->{$t.'_url_format'} = - _array($self->{lc("$pfx.${t}UrlFormat")}); - } - if (defined(my $cgits = $self->{"$pfx.cgiturl"})) { $git->{cgit_url} = $cgits = _array($cgits); $self->{"$pfx.cgiturl"} = $cgits; - - # cgit supports "/blob/?id=%s", but it's only a plain-text - # display and requires an unabbreviated id= - foreach my $t (qw(blob commit tag)) { - $git->{$t.'_url_format'} //= map { - "$_/$t/?id=%s" - } @$cgits; - } } $git; } +sub get_all { + my ($self, $key) = @_; + my $v = $self->{$key} // return; + _array($v); +} + sub git_bool { my ($val) = $_[-1]; # $_[0] may be $self, or $val if ($val =~ /\A(?:false|no|off|[\-\+]?(?:0x)?0+)\z/i) { @@ -376,25 +368,53 @@ sub rel2abs_collapsed { Cwd::abs_path($p); } -sub _one_val { - my ($self, $pfx, $k) = @_; - my $v = $self->{"$pfx.$k"} // return; +sub get_1 { + my ($self, $key) = @_; + my $v = $self->{$key}; return $v if !ref($v); - warn "W: $pfx.$k has multiple values, only using `$v->[-1]'\n"; + warn "W: $key has multiple values, only using `$v->[-1]'\n"; $v->[-1]; } +sub repo_objs { + my ($self, $ibxish) = @_; + my $ibx_code_repos = $ibxish->{coderepo} or return; + $ibxish->{-repo_objs} //= do { + my $code_repos = $self->{-code_repos}; + my @repo_objs; + for my $nick (@$ibx_code_repos) { + my @parts = split(m!/!, $nick); + for (@parts) { + @parts = () unless valid_foo_name($_); + } + unless (@parts) { + warn "invalid coderepo name: `$nick'\n"; + next; + } + my $repo = $code_repos->{$nick} //= + _fill_code_repo($self, $nick); + push @repo_objs, $repo if $repo; + } + if (scalar @repo_objs) { + \@repo_objs; + } else { + delete $ibxish->{coderepo}; + undef; + } + } +} + sub _fill_ibx { my ($self, $name) = @_; my $pfx = "publicinbox.$name"; my $ibx = {}; - for my $k (qw(watch nntpserver)) { + for my $k (qw(watch)) { my $v = $self->{"$pfx.$k"}; $ibx->{$k} = $v if defined $v; } for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax - indexlevel indexsequentialshard)) { - my $v = _one_val($self, $pfx, $k) // next; + indexlevel indexsequentialshard boost)) { + my $v = get_1($self, "$pfx.$k") // next; $ibx->{$k} = $v; } @@ -414,8 +434,9 @@ sub _fill_ibx { } # TODO: more arrays, we should support multi-value for # more things to encourage decentralization - for my $k (qw(address altid nntpmirror coderepo hide listid url - infourl watchheader)) { + for my $k (qw(address altid nntpmirror imapmirror + coderepo hide listid url + infourl watchheader nntpserver imapserver)) { my $v = $self->{"$pfx.$k"} // next; $ibx->{$k} = _array($v); } @@ -467,20 +488,6 @@ sub _fill_ibx { $ibx->{-no_obfuscate_re} = $self->{-no_obfuscate_re}; fill_all($self); # noop to populate -no_obfuscate } - if (my $ibx_code_repos = $ibx->{coderepo}) { - my $code_repos = $self->{-code_repos}; - my $repo_objs = $ibx->{-repo_objs} = []; - foreach my $nick (@$ibx_code_repos) { - my @parts = split(m!/!, $nick); - my $valid = 0; - $valid += valid_foo_name($_) foreach (@parts); - $valid == scalar(@parts) or next; - - my $repo = $code_repos->{$nick} //= - _fill_code_repo($self, $nick); - push @$repo_objs, $repo if $repo; - } - } if (my $es = ALL($self)) { require PublicInbox::Isearch; $ibx->{isrch} = PublicInbox::Isearch->new($ibx, $es); @@ -494,12 +501,16 @@ sub _fill_ei ($$) { my $pfx = "extindex.$name"; my $d = $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 = _one_val($self, $pfx, $k) // next; + my $v = get_1($self, "$pfx.$k") // next; $es->{$k} = $v; } - for my $k (qw(altid coderepo hide url infourl)) { + for my $k (qw(coderepo hide url infourl)) { my $v = $self->{"$pfx.$k"} // next; $es->{$k} = _array($v); } @@ -539,4 +550,13 @@ sub json { }; } +sub squote_maybe ($) { + my ($val) = @_; + if ($val =~ m{([^\w@\./,\%\+\-])}) { + $val =~ s/(['!])/'\\$1'/g; # '!' for csh + return "'$val'"; + } + $val; +} + 1;