Skip to content

Make the RBLDNS config change mandatory #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make the RBLDNS config change mandatory #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Revision history for Mail-Milter-Authentication

- RBLDNS: Config structure change is now mandatory

[UPDATED Config Items for RBLDNS]
RBLDNS config items MUST be moved under a new rbls key

{{$NEXT}}
- DNS: More consistent error logging on DNS lookup timeouts
- RBLDNS: Config structure change
Expand Down
8 changes: 4 additions & 4 deletions lib/Mail/Milter/Authentication/Handler/RBLDNS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ sub register_metrics {

sub setup_callback {
my ($self) = @_;
my $config = $self->handler_config();
$config = $config->{rbls} if exists $config->{rbls};
my $handler_config = $self->handler_config();
$config = $handler_config->{rbls} // {};
foreach my $rbl ( sort keys $config->%* ) {
my $sanitize_header = $config->{$rbl}->{sanitize_header} // 'yes';
$self->add_header_to_sanitize_list(lc $config->{$rbl}->{add_header}, $sanitize_header eq 'silent') if $config->{$rbl}->{add_header} && $sanitize_header ne 'no';
Expand All @@ -61,8 +61,8 @@ sub setup_callback {

sub connect_callback {
my ( $self, $hostname, $ip ) = @_;
my $config = $self->handler_config();
$config = $config->{rbls} if exists $config->{rbls};
my $handler_config = $self->handler_config();
$config = $handler_config->{rbls} // {};

my @states;

Expand Down