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 8d66cf8c35fcb9aba02aaed2286e5e4da580234c..0597a527baf7b0aa0a58d61d1187d09da9d69252 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -90,21 +90,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 +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};
@@ -145,10 +135,22 @@ sub _fill {
        my $rv = {};
 
        foreach my $k (qw(mainrepo address filter url newsgroup
-                       infourl watch watchheader httpbackendmax)) {
+                       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