Fix sympa-community#295 — Add domain blacklist feature

ldidry · Nov 13, 2018 · 85acc21 · 85acc21
1 parent 2779fac
commit 85acc21
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 0 deletions.
diff --git a/default/mail_tt2/report.tt2 b/default/mail_tt2/report.tt2
@@ -597,6 +597,9 @@ Warning: this message may already have been sent by one of the list's moderators
 [%~ ELSIF report_entry == 'incorrect_email' ~%]
   [%|loc(report_param.email || report_param.value)%]Address "%1" is incorrect[%END%]
 
+[%~ ELSIF report_entry == 'blacklisted_domain' ~%]
+  [%|loc(report_param.email || report_param.value)%]Address "%1" belongs to a blacklisted domain[%END%]
+
 [%~ ELSIF report_entry == 'incorrect_passwd' ~%]
   [%|loc%]Provided password is incorrect[%END%]
 

diff --git a/src/lib/Sympa/ConfDef.pm b/src/lib/Sympa/ConfDef.pm
@@ -2123,6 +2123,18 @@ our @params = (
         'file'       => 'wwsympa.conf',
         'optional'   => 1,
     },
+    {
+        'name'       => 'domains_blacklist',
+        'gettext_id' =>
+            'Prevent people to subscribe to a list with adresses using these domains',
+        'gettext_comment' =>
+            'This parameter is a comma-separated list.',
+        'default'    => undef,
+        'sample'     => 'example.org,spammer.com',
+        'split_char' => ',',
+        'file'       => 'sympa.conf',
+        'optional'   => 1,
+    },
 
 ## Not implemented yet.
 ##    {

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
@@ -3826,6 +3826,20 @@ sub add_list_member {
                 $new_user->{'email'});
             next;
         }
+        if (defined($Conf::Conf{'domains_blacklist'})) {
+            my @parts = split '@', $who;
+            my $next  = 0;
+            foreach my $f (split ',', lc($Conf::Conf{'domains_blacklist'})) {
+                if ($parts[1] && $parts[1] eq $f) {
+                    $log->syslog('err',
+                        'Ignoring %s which uses a blacklisted domain',
+                        $new_user->{'email'});
+                    $next++;
+                    next;
+                }
+            }
+            next if $next;
+        }
         unless (
             $current_list_members_count < $self->{'admin'}{'max_list_members'}
             || $self->{'admin'}{'max_list_members'} == 0) {

diff --git a/src/lib/Sympa/Request/Handler/add.pm b/src/lib/Sympa/Request/Handler/add.pm
@@ -71,6 +71,20 @@ sub _twist {
         return undef;
     }
 
+    if (defined($Conf::Conf{'domains_blacklist'})) {
+        my @parts = split '@', Sympa::Tools::Text::canonic_email($email);
+        foreach my $f (split ',', lc($Conf::Conf{'domains_blacklist'})) {
+            if ($parts[1] && $parts[1] eq $f) {
+                $self->add_stash($request, 'user', 'blacklisted_domain',
+                    {'email' => $email});
+                $log->syslog('err',
+                    'ADD command rejected; blacklisted domain for "%s"',
+                    $email);
+                return undef;
+            }
+        }
+    }
+
     if ($list->is_list_member($email)) {
         $self->add_stash($request, 'user', 'already_subscriber',
             {'email' => $email, 'listname' => $list->{'name'}});