update copyrights for 2018

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 6e31df7267fe0c64be3c8dc95db8e8f66819a9df..289c36a6ccf1a6c6e5518cd4dff12f4e8cd63fce 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used throughout the project for reading configuration
 package PublicInbox::Config;
@@ -20,7 +20,28 @@ sub new {
        $self->{-by_addr} ||= {};
        $self->{-by_name} ||= {};
        $self->{-by_newsgroup} ||= {};
+       $self->{-no_obfuscate} ||= {};
        $self->{-limiters} ||= {};
+
+       if (my $no = delete $self->{'publicinbox.noobfuscate'}) {
+               $no = [ $no ] if ref($no) ne 'ARRAY';
+               my @domains;
+               foreach my $n (@$no) {
+                       my @n = split(/\s+/, $n);
+                       foreach (@n) {
+                               if (/\S+@\S+/) { # full address
+                                       $self->{-no_obfuscate}->{lc $_} = 1;
+                               } else {
+                                       # allow "example.com" or "@example.com"
+                                       s/\A@//;
+                                       push @domains, quotemeta($_);
+                               }
+                       }
+               }
+               my $nod = join('|', @domains);
+               $self->{-no_obfuscate_re} = qr/(?:$nod)\z/i;
+       }
+
        $self;
 }
 
@@ -90,21 +111,11 @@ sub limiter {
        my ($self, $name) = @_;
        $self->{-limiters}->{$name} ||= do {
                require PublicInbox::Qspawn;
-               my $max;
-               # XXX "limiter.<name>.max" was a historical mistake
-               foreach my $pfx (qw(publicinboxlimiter limiter)) {
-                       $max ||= $self->{"$pfx.$name.max"};
-               }
+               my $max = $self->{"publicinboxlimiter.$name.max"};
                PublicInbox::Qspawn::Limiter->new($max);
        };
 }
 
-sub get {
-       my ($self, $inbox, $key) = @_;
-
-       $self->{"publicinbox.$inbox.$key"};
-}
-
 sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
 
 sub default_file {
@@ -121,7 +132,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};
@@ -137,6 +148,7 @@ sub git_config_dump {
                }
        }
        close $fh or die "failed to close ($cmd) pipe: $?";
+
        \%rv;
 }
 
@@ -144,16 +156,26 @@ sub _fill {
        my ($self, $pfx) = @_;
        my $rv = {};
 
-       foreach my $k (qw(mainrepo address filter url newsgroup
+       foreach my $k (qw(mainrepo filter url newsgroup
                        infourl watch watchheader httpbackendmax
-                       feedmax)) {
+                       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)) {
+       foreach my $k (qw(address altid nntpmirror)) {
                if (defined(my $v = $self->{"$pfx.$k"})) {
                        $rv->{$k} = ref($v) eq 'ARRAY' ? $v : [ $v ];
                }
@@ -165,16 +187,21 @@ sub _fill {
        $rv->{name} = $name;
        $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 {
-               $self->{-by_addr}->{lc($v)} = $rv;
+       foreach (@{$rv->{address}}) {
+               my $lc_addr = lc($_);
+               $self->{-by_addr}->{$lc_addr} = $rv;
+               $self->{-no_obfuscate}->{$lc_addr} = 1;
        }
        if (my $ng = $rv->{newsgroup}) {
                $self->{-by_newsgroup}->{$ng} = $rv;
        }
        $self->{-by_name}->{$name} = $rv;
+       if ($rv->{obfuscate}) {
+               $rv->{-no_obfuscate} = $self->{-no_obfuscate};
+               $rv->{-no_obfuscate_re} = $self->{-no_obfuscate_re};
+               each_inbox($self, sub {}); # noop to populate -no_obfuscate
+       }
+       $rv
 }
 
 1;