From 0a61ecc6c2ab3b01b01503d9e024c843ad9e00e8 Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@symlink.me>
Date: Wed, 5 Oct 2011 15:42:20 +0200
Subject: [PATCH] improvement of antispam

---
 weboob/backends/aum/antispam.py | 19 +++++++++++++++++++
 weboob/backends/aum/backend.py  |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/weboob/backends/aum/antispam.py b/weboob/backends/aum/antispam.py
index 73dfc643..d9a21095 100644
--- a/weboob/backends/aum/antispam.py
+++ b/weboob/backends/aum/antispam.py
@@ -49,6 +49,25 @@ class AntiSpam(object):
             return False
         if profile['about2'].endswith('mmmmmmmmmmmmmmmm'):
             return False
+        if profile['last_ip'].startswith('41.202.'):
+            return False
+        if profile['last_ip'] == '62.157.186.18':
+            return False
+        return True
+
+    def check_contact(self, contact):
+        if not self.check_profile(contact.aum_profile):
+            return False
+
+        ipaddr = contact.profile['info']['IPaddr'].value
+        if ipaddr.split(' ')[0].endswith('.amsterdam.ananoos.net'):
+            return False
+        if ipaddr.rstrip(')').endswith('.afnet.net'):
+            return False
+        if ipaddr.split(' ')[0].endswith('.tedata.net'):
+            return False
+        if ipaddr.split(' ')[0].endswith('kupo.fr'):
+            return False
         return True
 
     def check_mail(self, mail):
diff --git a/weboob/backends/aum/backend.py b/weboob/backends/aum/backend.py
index 95dfc0ce..9df85e67 100644
--- a/weboob/backends/aum/backend.py
+++ b/weboob/backends/aum/backend.py
@@ -164,7 +164,7 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
                 if not mail['id_from'] in contacts:
                     with self.browser:
                         contacts[mail['id_from']] = self.get_contact(mail['id_from'])
-                if self.antispam and not self.antispam.check_profile(contacts[mail['id_from']].aum_profile):
+                if self.antispam and not self.antispam.check_contact(contacts[mail['id_from']]):
                     self.logger.info('Skipped a spam-mail-profile from %s' % mails['member']['pseudo'])
                     self.report_spam(thread.id)
                     break
@@ -240,7 +240,7 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
                         if basket['isBan'] or parse_dt(basket['date']) <= slut['lastmsg']:
                             continue
                         contact = self.get_contact(basket['id'])
-                        if self.antispam and not self.antispam.check_profile(contact.aum_profile):
+                        if self.antispam and not self.antispam.check_contact(contact):
                             self.logger.info('Skipped a spam-basket from %s' % contact.name)
                             self.report_spam(basket['id'])
                             continue