$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;
}
}
}
close $fh or die "failed to close ($cmd) pipe: $?";
+
\%rv;
}
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(address altid nntpmirror)) {
$rv->{name} = $name;
$rv->{-pi_config} = $self;
$rv = PublicInbox::Inbox->new($rv);
- $self->{-by_addr}->{lc($_)} = $rv foreach @{$rv->{address}};
+ 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;
sub msg_html {
my ($ctx, $mime) = @_;
my $hdr = $mime->header_obj;
- my $obfs = $ctx->{-inbox}->{obfuscate};
- my $tip = _msg_html_prepare($hdr, $ctx, $obfs);
+ my $ibx = $ctx->{-inbox};
+ my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+ my $tip = _msg_html_prepare($hdr, $ctx, $obfs_ibx);
PublicInbox::WwwStream->response($ctx, 200, sub {
my ($nr, undef) = @_;
if ($nr == 1) {
- $tip . multipart_text_as_html($mime, '', $obfs) .
+ $tip . multipart_text_as_html($mime, '', $obfs_ibx) .
'</pre><hr>'
} elsif ($nr == 2) {
# fake an EOF if generating the footer fails;
my $root_anchor = $ctx->{root_anchor} || '';
my $irt;
- my $obfs = $ctx->{-obfuscate};
+ my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = "<a\nhref=#e$id\nid=m$id>*</a> ";
$subj = '<b>'.ascii_html($subj).'</b>';
- obfuscate_addrs($subj) if $obfs;
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
$subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id_m;
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
foreach my $f (qw(To Cc)) {
my $dst = _hdr_names_html($hdr, $f);
if ($dst ne '') {
- obfuscate_addrs($dst) if $obfs;
+ obfuscate_addrs($obfs_ibx, $dst) if $obfs_ibx;
push @tocc, "$f: $dst";
}
}
my $from = _hdr_names_html($hdr, 'From');
- obfuscate_addrs($from) if $obfs;
+ obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ "._msg_date($hdr)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . mid_escape($mid_raw) . '/';
$rv .= "\n";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs, $_[0]) });
+ msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs_ibx, $_[0]) });
# add the footer
$rv .= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
}
return missing_thread($ctx) unless $mime;
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
$mime = PublicInbox::MIME->new($mime);
$ctx->{-title_html} = ascii_html($mime->header('Subject'));
$ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
my $rootset = thread_results($msgs);
# reduce hash lookups in pre_thread->skel_dump
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ my $inbox = $ctx->{-inbox};
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
walk_thread($rootset, $ctx, *pre_thread);
$skel .= '</pre>';
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- my $inbox = $ctx->{-inbox};
my $mime;
while ($mime = shift @$msgs) {
$mime = $inbox->msg_by_smsg($mime) and last;
}
sub multipart_text_as_html {
- my ($mime, $upfx, $obfs) = @_;
+ my ($mime, $upfx, $obfs_ibx) = @_;
my $rv = "";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs, $_[0]) });
+ msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs_ibx, $_[0]) });
$rv;
}
}
sub add_text_body {
- my ($upfx, $obfs, $p) = @_;
+ my ($upfx, $obfs_ibx, $p) = @_;
# $p - from msg_iter: [ Email::MIME, depth, @idx ]
my ($part, $depth) = @$p; # attachment @idx is unused
my $ct = $part->content_type || 'text/plain';
if (@quot) { # ugh, top posted
flush_quote(\$s, $l, \@quot);
- obfuscate_addrs($s) if $obfs;
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
$s;
} else {
- obfuscate_addrs($s) if $obfs;
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
if ($s =~ /\n\z/s) { # common, last line ends with a newline
$s;
} else { # some editors don't do newlines...
}
sub _msg_html_prepare {
- my ($hdr, $ctx, $obfs) = @_;
+ my ($hdr, $ctx, $obfs_ibx) = @_;
my $srch = $ctx->{srch} if $ctx;
my $atom = '';
my $rv = "<pre\nid=b>"; # anchor for body start
if ($h eq 'From') {
my @n = PublicInbox::Address::names($v->raw);
$title[1] = ascii_html(join(', ', @n));
- obfuscate_addrs($title[1]) if $obfs;
+ obfuscate_addrs($obfs_ibx, $title[1]) if $obfs_ibx;
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
}
}
$v = $v->as_html;
- obfuscate_addrs($v) if $obfs;
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
$rv .= "$h: $v\n";
}
$sres = load_results($srch, $sres);
# reduce hash lookups in skel_dump
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ my $ibx = $ctx->{-inbox};
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
walk_thread(thread_results($sres), $ctx, *skel_dump);
$ctx->{parent_msg} = $parent;
my $mid = $smsg->{mid};
my $f = ascii_html($smsg->from_name);
- my $obfs = $ctx->{-obfuscate};
- obfuscate_addrs($f) if $obfs;
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level);
my $attr = $f;
$ctx->{seen}->{$h} = 1;
$subj = PublicInbox::Hval->new($subj);
$subj = $subj->as_html;
- obfuscate_addrs($subj) if $obfs;
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
}
my $m;
my $id = '';
}
my @out;
- my $obfs = $ctx->{-inbox}->{obfuscate};
+ my $ibx = $ctx->{-inbox};
+ my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
my $subj = $ex[$i + 1];
$mid = delete $seen->{$subj};
$subj = ascii_html($subj);
- obfuscate_addrs($subj) if $obfs;
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
$href = mid_escape($mid);
$s .= indent_for($level) . TCHILD;
$s .= "<a\nhref=\"$href/T/#u\">$subj</a>\n";
is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
}
+# no obfuscate domains
+{
+ my $pfx = "publicinbox.test";
+ my $pfx2 = "publicinbox.foo";
+ my %h = (
+ "$pfx.address" => 'test@example.com',
+ "$pfx.mainrepo" => '/path/to/non/existent',
+ "$pfx2.address" => 'foo@example.com',
+ "$pfx2.mainrepo" => '/path/to/foo',
+ lc("publicinbox.noObfuscate") =>
+ 'public-inbox.org @example.com z@EXAMPLE.com',
+ "$pfx.obfuscate" => 'true', # :<
+ );
+ my %tmp = %h;
+ my $cfg = PublicInbox::Config->new(\%tmp);
+ my $ibx = $cfg->lookup_name('test');
+ my $re = $ibx->{-no_obfuscate_re};
+ like('meta@public-inbox.org', $re,
+ 'public-inbox.org address not to be obfuscated');
+ like('t@example.com', $re, 'example.com address not to be obfuscated');
+ unlike('t@example.comM', $re, 'example.comM address does not match');
+ is_deeply($ibx->{-no_obfuscate}, {
+ 'test@example.com' => 1,
+ 'foo@example.com' => 1,
+ 'z@example.com' => 1,
+ }, 'known addresses populated');
+}
+
done_testing();