X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=c2fa40f970d6575306e02c93cdf0f148ffdcc89b;hb=53a8e32b97985803e9de12c4312a86a8850208b3;hp=ccfc114f9888a7da1711ab9a582c825470afc913;hpb=cfa8ff7c256e20f3240aed5f98d155c019788e3b;p=public-inbox.git diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index ccfc114f..c2fa40f9 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2018 all contributors +# Copyright (C) 2014-2019 all contributors # License: AGPL-3.0+ # # Used throughout the project for reading configuration @@ -25,14 +25,16 @@ sub new { # caches $self->{-by_addr} ||= {}; + $self->{-by_list_id} ||= {}; $self->{-by_name} ||= {}; $self->{-by_newsgroup} ||= {}; $self->{-no_obfuscate} ||= {}; $self->{-limiters} ||= {}; $self->{-code_repos} ||= {}; # nick => PublicInbox::Git object + $self->{-cgitrc_unparsed} = $self->{'publicinbox.cgitrc'}; if (my $no = delete $self->{'publicinbox.noobfuscate'}) { - $no = [ $no ] if ref($no) ne 'ARRAY'; + $no = _array($no); my @domains; foreach my $n (@$no) { my @n = split(/\s+/, $n); @@ -59,8 +61,8 @@ sub new { sub lookup { my ($self, $recipient) = @_; my $addr = lc($recipient); - my $inbox = $self->{-by_addr}->{$addr}; - return $inbox if $inbox; + my $ibx = $self->{-by_addr}->{$addr}; + return $ibx if $ibx; my $pfx; @@ -83,6 +85,33 @@ sub lookup { _fill($self, $pfx); } +sub lookup_list_id { + my ($self, $list_id) = @_; + $list_id = lc($list_id); + my $ibx = $self->{-by_list_id}->{$list_id}; + return $ibx if $ibx; + + my $pfx; + + foreach my $k (keys %$self) { + $k =~ /\A(publicinbox\.[\w-]+)\.listid\z/ or next; + my $v = $self->{$k}; + if (ref($v) eq "ARRAY") { + foreach my $alias (@$v) { + (lc($alias) eq $list_id) or next; + $pfx = $1; + last; + } + } else { + (lc($v) eq $list_id) or next; + $pfx = $1; + last; + } + } + defined $pfx or return; + _fill($self, $pfx); +} + sub lookup_name ($$) { my ($self, $name) = @_; $self->{-by_name}->{$name} || _fill($self, "publicinbox.$name"); @@ -112,16 +141,16 @@ sub each_inbox { sub lookup_newsgroup { my ($self, $ng) = @_; $ng = lc($ng); - my $rv = $self->{-by_newsgroup}->{$ng}; - return $rv if $rv; + my $ibx = $self->{-by_newsgroup}->{$ng}; + return $ibx if $ibx; foreach my $k (keys %$self) { $k =~ m!\A(publicinbox\.[^/]+)\.newsgroup\z! or next; my $v = $self->{$k}; my $pfx = $1; if ($v eq $ng) { - $rv = _fill($self, $pfx); - return $rv; + $ibx = _fill($self, $pfx); + return $ibx; } } undef; @@ -131,8 +160,10 @@ sub limiter { my ($self, $name) = @_; $self->{-limiters}->{$name} ||= do { require PublicInbox::Qspawn; - my $max = $self->{"publicinboxlimiter.$name.max"}; - PublicInbox::Qspawn::Limiter->new($max); + my $max = $self->{"publicinboxlimiter.$name.max"} || 1; + my $limiter = PublicInbox::Qspawn::Limiter->new($max); + $limiter->setup_rlimit($name, $self); + $limiter; }; } @@ -147,14 +178,15 @@ sub default_file { sub git_config_dump { my ($file) = @_; my (%section_seen, @section_order); - my @cmd = (qw/git config/, "--file=$file", '-l'); + return {} unless -e $file; + my @cmd = (qw/git config -z -l/, "--file=$file"); my $cmd = join(' ', @cmd); my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n"; my %rv; - local $/ = "\n"; + local $/ = "\0"; while (defined(my $line = <$fh>)) { chomp $line; - my ($k, $v) = split(/=/, $line, 2); + my ($k, $v) = split(/\n/, $line, 2); my ($section) = ($k =~ /\A(\S+)\.[^\.]+\z/); unless (defined $section_seen{$section}) { @@ -196,15 +228,148 @@ sub valid_inbox_name ($) { 1; } +# XXX needs testing for cgit compatibility +# cf. cgit/scan-tree.c::add_repo +sub cgit_repo_merge ($$$) { + my ($self, $base, $repo) = @_; + my $path = $repo->{dir}; + if (defined(my $se = $self->{-cgit_strict_export})) { + return unless -e "$path/$se"; + } + return if -e "$path/noweb"; + # $repo = { url => 'foo.git', dir => '/path/to/foo.git' } + my $rel = $repo->{url}; + unless (defined $rel) { + my $off = index($path, $base, 0); + if ($off != 0) { + $rel = $path; + } else { + $rel = substr($path, length($base) + 1); + } + + $rel =~ s!/\.git\z!! or + $rel =~ s!/+\z!!; + + $self->{-cgit_remove_suffix} and + $rel =~ s!/?\.git\z!!; + } + $self->{"coderepo.$rel.dir"} ||= $path; + $self->{"coderepo.$rel.cgiturl"} ||= $rel; +} + +sub is_git_dir ($) { + my ($git_dir) = @_; + -d "$git_dir/objects" && -f "$git_dir/HEAD"; +} + +# XXX needs testing for cgit compatibility +sub scan_path_coderepo { + my ($self, $base, $path) = @_; + opendir(my $dh, $path) or do { + warn "error opening directory: $path\n"; + return + }; + my $git_dir = $path; + if (is_git_dir($git_dir) || is_git_dir($git_dir .= '/.git')) { + my $repo = { dir => $git_dir }; + cgit_repo_merge($self, $base, $repo); + return; + } + while (defined(my $dn = readdir $dh)) { + next if $dn eq '.' || $dn eq '..'; + if (index($dn, '.') == 0 && !$self->{-cgit_scan_hidden_path}) { + next; + } + my $dir = "$path/$dn"; + scan_path_coderepo($self, $base, $dir) if -d $dir; + } +} + +sub scan_tree_coderepo ($$) { + my ($self, $path) = @_; + scan_path_coderepo($self, $path, $path); +} + +sub scan_projects_coderepo ($$$) { + my ($self, $list, $path) = @_; + open my $fh, '<', $list or do { + warn "failed to open cgit projectlist=$list: $!\n"; + return; + }; + foreach (<$fh>) { + chomp; + scan_path_coderepo($self, $path, "$path/$_"); + } +} + +sub parse_cgitrc { + my ($self, $cgitrc, $nesting) = @_; + if ($nesting == 0) { + # defaults: + my %s = map { $_ => 1 } qw(/cgit.css /cgit.png + /favicon.ico /robots.txt); + $self->{-cgit_static} = \%s; + } + + # same limit as cgit/configfile.c::parse_configfile + return if $nesting > 8; + + open my $fh, '<', $cgitrc or do { + warn "failed to open cgitrc=$cgitrc: $!\n"; + return; + }; + + # FIXME: this doesn't support macro expansion via $VARS, yet + my $repo; + foreach (<$fh>) { + chomp; + if (m!\Arepo\.url=(.+?)/*\z!) { + my $nick = $1; + cgit_repo_merge($self, $repo->{dir}, $repo) if $repo; + $repo = { url => $nick }; + } elsif (m!\Arepo\.path=(.+)\z!) { + if (defined $repo) { + $repo->{dir} = $1; + } else { + warn "$_ without repo.url\n"; + } + } elsif (m!\Ainclude=(.+)\z!) { + parse_cgitrc($self, $1, $nesting + 1); + } elsif (m!\A(scan-hidden-path|remove-suffix)=([0-9]+)\z!) { + my ($k, $v) = ($1, $2); + $k =~ tr/-/_/; + $self->{"-cgit_$k"} = $v; + } elsif (m!\A(project-list|strict-export)=(.+)\z!) { + my ($k, $v) = ($1, $2); + $k =~ tr/-/_/; + $self->{"-cgit_$k"} = $v; + } elsif (m!\Ascan-path=(.+)\z!) { + if (defined(my $list = $self->{-cgit_project_list})) { + scan_projects_coderepo($self, $list, $1); + } else { + scan_tree_coderepo($self, $1); + } + } elsif (m!\A(?:css|favicon|logo|repo\.logo)=(/.+)\z!) { + # absolute paths for static files via PublicInbox::Cgit + $self->{-cgit_static}->{$1} = 1; + } + } + cgit_repo_merge($self, $repo->{dir}, $repo) if $repo; +} + # parse a code repo # Only git is supported at the moment, but SVN and Hg are possibilities 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) { - warn "$pfx.repodir unset"; + warn "$pfx.dir unset\n"; return; } @@ -225,42 +390,49 @@ sub _fill_code_repo { } @$cgits; } } - # TODO: support gitweb and other repository viewers? - # TODO: parse cgitrc $git; } +sub _git_config_bool ($) { + my ($val) = @_; + if ($val =~ /\A(?:false|no|off|[\-\+]?(?:0x)?0+)\z/i) { + 0; + } elsif ($val =~ /\A(?:true|yes|on|[\-\+]?(?:0x)?[0-9]+)\z/i) { + 1; + } else { + undef; + } +} + sub _fill { my ($self, $pfx) = @_; - my $rv = {}; + my $ibx = {}; foreach my $k (qw(mainrepo filter url newsgroup infourl watch watchheader httpbackendmax replyto feedmax nntpserver indexlevel)) { my $v = $self->{"$pfx.$k"}; - $rv->{$k} = $v if defined $v; + $ibx->{$k} = $v if defined $v; } foreach my $k (qw(obfuscate)) { my $v = $self->{"$pfx.$k"}; defined $v or next; - if ($v =~ /\A(?:false|no|off|0)\z/) { - $rv->{$k} = 0; - } elsif ($v =~ /\A(?:true|yes|on|1)\z/) { - $rv->{$k} = 1; + if (defined(my $bval = _git_config_bool($v))) { + $ibx->{$k} = $bval; } else { warn "Ignoring $pfx.$k=$v in config, not boolean\n"; } } # TODO: more arrays, we should support multi-value for # more things to encourage decentralization - foreach my $k (qw(address altid nntpmirror coderepo)) { + foreach my $k (qw(address altid nntpmirror coderepo hide listid)) { if (defined(my $v = $self->{"$pfx.$k"})) { - $rv->{$k} = _array($v); + $ibx->{$k} = _array($v); } } - return unless $rv->{mainrepo}; + return unless $ibx->{mainrepo}; my $name = $pfx; $name =~ s/\Apublicinbox\.//; @@ -269,36 +441,45 @@ sub _fill { return; } - $rv->{name} = $name; - $rv->{-pi_config} = $self; - $rv = PublicInbox::Inbox->new($rv); - foreach (@{$rv->{address}}) { + $ibx->{name} = $name; + $ibx->{-pi_config} = $self; + $ibx = PublicInbox::Inbox->new($ibx); + foreach (@{$ibx->{address}}) { my $lc_addr = lc($_); - $self->{-by_addr}->{$lc_addr} = $rv; + $self->{-by_addr}->{$lc_addr} = $ibx; $self->{-no_obfuscate}->{$lc_addr} = 1; } - if (my $ng = $rv->{newsgroup}) { - $self->{-by_newsgroup}->{$ng} = $rv; + if (my $listids = $ibx->{listid}) { + foreach my $list_id (@$listids) { + $self->{-by_list_id}->{$list_id} = $ibx; + } + } + if (my $ng = $ibx->{newsgroup}) { + $self->{-by_newsgroup}->{$ng} = $ibx; } - $self->{-by_name}->{$name} = $rv; - if ($rv->{obfuscate}) { - $rv->{-no_obfuscate} = $self->{-no_obfuscate}; - $rv->{-no_obfuscate_re} = $self->{-no_obfuscate_re}; + $self->{-by_name}->{$name} = $ibx; + if ($ibx->{obfuscate}) { + $ibx->{-no_obfuscate} = $self->{-no_obfuscate}; + $ibx->{-no_obfuscate_re} = $self->{-no_obfuscate_re}; each_inbox($self, sub {}); # noop to populate -no_obfuscate } - if (my $ibx_code_repos = $rv->{coderepo}) { + if (my $ibx_code_repos = $ibx->{coderepo}) { my $code_repos = $self->{-code_repos}; - my $repo_objs = $rv->{-repo_objs} = []; + my $repo_objs = $ibx->{-repo_objs} = []; foreach my $nick (@$ibx_code_repos) { - valid_inbox_name($nick) or next; + my @parts = split(m!/!, $nick); + my $valid = 0; + $valid += valid_inbox_name($_) foreach (@parts); + $valid == scalar(@parts) or next; + my $repo = $code_repos->{$nick} ||= _fill_code_repo($self, $nick); push @$repo_objs, $repo if $repo; } } - $rv + $ibx } 1;