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 d34d11ad5cee2a3ef1d4334e8dc94b044b4e5e85..0597a527baf7b0aa0a58d61d1187d09da9d69252 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -20,6 +20,7 @@ sub new {
        $self->{-by_addr} ||= {};
        $self->{-by_name} ||= {};
        $self->{-by_newsgroup} ||= {};
+       $self->{-limiters} ||= {};
        $self;
 }
 
@@ -85,10 +86,13 @@ 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} || "$ENV{HOME}/.public-inbox" }
@@ -107,7 +111,7 @@ sub git_config_dump {
        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};
@@ -131,14 +135,36 @@ sub _fill {
        my $rv = {};
 
        foreach my $k (qw(mainrepo address filter url newsgroup
-                       watch watchheader)) {
+                       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;
+       $rv->{-pi_config} = $self;
        $rv = PublicInbox::Inbox->new($rv);
        my $v = $rv->{address};
        if (ref($v) eq 'ARRAY') {