Skip to content
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

6.2.34 owner_domain fixes #393

Merged
merged 2 commits into from
Aug 16, 2018
Merged

6.2.34 owner_domain fixes #393

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a90d55
Update owner_domain check in Users.pm to properly allow owner name/pr…
mpkut Aug 1, 2018
ceba1bc
Update owner_domain check to handle changes in owner/moderator editin…
mpkut Aug 8, 2018
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
39 changes: 32 additions & 7 deletions src/lib/Sympa/List/Users.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,19 @@ use constant _global_validations => {
my $self = shift;
my $new = shift;

my $list = $self->{context};
my $config = Sympa::List::Config->new($list, config => $list->{'admin'});
my $pinfo = $self->{_pinfo};
my $loglevel = 'debug'; # was set to 'info' during development

# gather parameters
my $owner_domain = $self->get('owner_domain');
my $owner_domain = $config->get('owner_domain');
if (defined($self->get_change('owner_domain'))) {
$owner_domain = $self->get_change('owner_domain');
}
(my $domainrex = "[.\@]($owner_domain)\$") =~ s/ /|/g;

my $owner_domain_min = $self->get('owner_domain_min');
my $owner_domain_min = $config->get('owner_domain_min');
if (defined($self->get_change('owner_domain_min'))) {
$owner_domain_min = $self->get_change('owner_domain_min');
}
Expand All @@ -70,8 +72,30 @@ use constant _global_validations => {
# calculate updated owner list, including deletions
my @owner = map { $_->{'email'} } @{$self->get('owner')};
my $changes = $self->get_change('owner');
map { $owner[$_] = $changes->{$_}->{'email'} }
CORE::keys %{$changes || {}};

#use Data::Dumper;
#my $changedump = Dumper($changes);
#$changedump =~ s/\n//g;
#$changedump =~ s/ +/ /g;
#$log->syslog($loglevel, "conf changes = $changedump");

$log->syslog($loglevel, "BEGIN owner_domain validation");
$log->syslog($loglevel, "original owners: " . join(" ", @owner));

map {
unless (defined($changes->{$_})) {
# value undefined => owner was removed
$log->syslog($loglevel, "remove $_ \"$owner[$_]\"");
$owner[$_] = undef;
} elsif (defined($changes->{$_}->{'email'})) {
# owner address modified
my $oldowner = $owner[$_];
$owner[$_] = $changes->{$_}->{'email'};
$log->syslog($loglevel,
"update $_ \"$oldowner\" => \"$owner[$_]\"");
}
} CORE::keys %{$changes || {}};

@owner = grep defined, @owner;

# count matches and non-matches
Expand All @@ -84,15 +108,15 @@ use constant _global_validations => {
# logging
$log->syslog($loglevel, "owner_domain: $owner_domain");
$log->syslog($loglevel, "owner_domain_min: $owner_domain_min");
$log->syslog($loglevel, "owners: " . join(",", @owner));
$log->syslog($loglevel, "updated owners: " . join(" ", @owner));
$log->syslog($loglevel, "total owners: " . ($#owner + 1));
$log->syslog($loglevel, "domainrex: $domainrex");
$log->syslog($loglevel,
"matching_owners: " . join(",", @matching_owners));
"matching_owners: " . join(" ", @matching_owners));
$log->syslog($loglevel,
"matching_owner_count: $matching_owner_count");
$log->syslog($loglevel,
"non_matching_owners: " . join(",", @non_matching_owners));
"non_matching_owners: " . join(" ", @non_matching_owners));
$log->syslog($loglevel, "non_matching_count: $non_matching_count");

# apply different rules based on min domain requirement
Expand All @@ -116,6 +140,7 @@ use constant _global_validations => {
}
) unless ($matching_owner_count >= $owner_domain_min);
}
$log->syslog($loglevel, "END owner_domain validation");
return '';
},
};
Expand Down