X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=27222c033c330aed99a4e10af1fb51920b63cc5f;hb=6e6f7999361925e4c944f308df4bc32a1842cd69;hp=355e64bfec6a19036519054b17a716641d2c7310;hpb=ca0a28d52d43609cd6cabf5af085260032e5afa9;p=public-inbox.git diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 355e64bf..27222c03 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -30,9 +30,10 @@ sub new { $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); @@ -49,6 +50,9 @@ sub new { my $nod = join('|', @domains); $self->{-no_obfuscate_re} = qr/(?:$nod)\z/i; } + if (my $css = delete $self->{'publicinbox.css'}) { + $self->{css} = _array($css); + } $self; } @@ -56,8 +60,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; @@ -87,13 +91,22 @@ sub lookup_name ($$) { sub each_inbox { my ($self, $cb) = @_; - my %seen; - foreach my $k (keys %$self) { - $k =~ m!\Apublicinbox\.([^/]+)\.mainrepo\z! or next; - next if $seen{$1}; - $seen{$1} = 1; - my $ibx = lookup_name($self, $1) or next; - $cb->($ibx); + if (my $section_order = $self->{-section_order}) { + foreach my $section (@$section_order) { + next if $section !~ m!\Apublicinbox\.([^/]+)\z!; + $self->{"publicinbox.$1.mainrepo"} or next; + my $ibx = lookup_name($self, $1) or next; + $cb->($ibx); + } + } else { + my %seen; + foreach my $k (keys %$self) { + $k =~ m!\Apublicinbox\.([^/]+)\.mainrepo\z! or next; + next if $seen{$1}; + $seen{$1} = 1; + my $ibx = lookup_name($self, $1) or next; + $cb->($ibx); + } } } @@ -119,8 +132,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; }; } @@ -134,7 +149,8 @@ sub default_file { sub git_config_dump { my ($file) = @_; - my ($in, $out); + my (%section_seen, @section_order); + return {} unless -e $file; my @cmd = (qw/git config/, "--file=$file", '-l'); my $cmd = join(' ', @cmd); my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n"; @@ -143,8 +159,14 @@ sub git_config_dump { while (defined(my $line = <$fh>)) { chomp $line; my ($k, $v) = split(/=/, $line, 2); - my $cur = $rv{$k}; + my ($section) = ($k =~ /\A(\S+)\.[^\.]+\z/); + unless (defined $section_seen{$section}) { + $section_seen{$section} = 1; + push @section_order, $section; + } + + my $cur = $rv{$k}; if (defined $cur) { if (ref($cur) eq "ARRAY") { push @$cur, $v; @@ -156,6 +178,7 @@ sub git_config_dump { } } close $fh or die "failed to close ($cmd) pipe: $?"; + $rv{-section_order} = \@section_order; \%rv; } @@ -177,15 +200,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)=(\d+)\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; } @@ -206,8 +362,6 @@ sub _fill_code_repo { } @$cgits; } } - # TODO: support gitweb and other repository viewers? - # TODO: parse cgitrc $git; } @@ -272,7 +426,11 @@ sub _fill { my $code_repos = $self->{-code_repos}; my $repo_objs = $rv->{-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;