view: implement optional address obfuscation

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index a8c5105e636b50a2866860d686d7e4bb1eab16da..0597a527baf7b0aa0a58d61d1187d09da9d69252 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -7,7 +7,6 @@ use strict;
 use warnings;
 require PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
-use File::Path::Expand qw/expand_filename/;
 
 # 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
@@ -21,6 +20,7 @@ sub new {
        $self->{-by_addr} ||= {};
        $self->{-by_name} ||= {};
        $self->{-by_newsgroup} ||= {};
+       $self->{-limiters} ||= {};
        $self;
 }
 
@@ -51,11 +51,21 @@ sub lookup {
        _fill($self, $pfx);
 }
 
-sub lookup_name {
+sub lookup_name ($$) {
        my ($self, $name) = @_;
-       my $rv = $self->{-by_name}->{$name};
-       return $rv if $rv;
-       $rv = _fill($self, "publicinbox.$name") or return;
+       $self->{-by_name}->{$name} || _fill($self, "publicinbox.$name");
+}
+
+sub each_inbox {
+       my ($self, $cb) = @_;
+       my %seen;
+       foreach my $k (keys %$self) {
+               $k =~ /\Apublicinbox\.([A-Z0-9a-z-]+)\.mainrepo\z/ or next;
+               next if $seen{$1};
+               $seen{$1} = 1;
+               my $ibx = lookup_name($self, $1) or next;
+               $cb->($ibx);
+       }
 }
 
 sub lookup_newsgroup {
@@ -76,13 +86,16 @@ sub lookup_newsgroup {
        undef;
 }
 
-sub get {
-       my ($self, $inbox, $key) = @_;
-
-       $self->{"publicinbox.$inbox.$key"};
+sub limiter {
+       my ($self, $name) = @_;
+       $self->{-limiters}->{$name} ||= do {
+               require PublicInbox::Qspawn;
+               my $max = $self->{"publicinboxlimiter.$name.max"};
+               PublicInbox::Qspawn::Limiter->new($max);
+       };
 }
 
-sub config_dir { $ENV{PI_DIR} || expand_filename('~/.public-inbox') }
+sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
 
 sub default_file {
        my $f = $ENV{PI_CONFIG};
@@ -95,10 +108,10 @@ sub git_config_dump {
        my ($in, $out);
        my @cmd = (qw/git config/, "--file=$file", '-l');
        my $cmd = join(' ', @cmd);
-       my $fh = popen_rd(\@cmd);
+       my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
        my %rv;
        local $/ = "\n";
-       foreach my $line (<$fh>) {
+       while (defined(my $line = <$fh>)) {
                chomp $line;
                my ($k, $v) = split(/=/, $line, 2);
                my $cur = $rv{$k};
@@ -121,18 +134,39 @@ sub _fill {
        my ($self, $pfx) = @_;
        my $rv = {};
 
-       foreach my $k (qw(mainrepo address filter url newsgroup)) {
+       foreach my $k (qw(mainrepo address filter url newsgroup
+                       infourl watch watchheader httpbackendmax
+                       replyto feedmax nntpserver)) {
                my $v = $self->{"$pfx.$k"};
                $rv->{$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;
+               } 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(altid nntpmirror)) {
+               if (defined(my $v = $self->{"$pfx.$k"})) {
+                       $rv->{$k} = ref($v) eq 'ARRAY' ? $v : [ $v ];
+               }
+       }
+
        return unless $rv->{mainrepo};
        my $name = $pfx;
        $name =~ s/\Apublicinbox\.//;
        $rv->{name} = $name;
-       my $v = $rv->{address} ||= 'public-inbox@example.com';
-       my $p = $rv->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
-       $rv->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
+       $rv->{-pi_config} = $self;
        $rv = PublicInbox::Inbox->new($rv);
+       my $v = $rv->{address};
        if (ref($v) eq 'ARRAY') {
                $self->{-by_addr}->{lc($_)} = $rv foreach @$v;
        } else {