Merge pull request #1 from serranos/modules-maintenance

Replacing discontinued module amada by module palevo also from Abuse.ch.
Rafiot · May 6, 2012 · b90063f · b90063f
2 parents 49143e3 + fbb46fa
commit b90063f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/doc/sphinx/source/code/Modules.rst b/doc/sphinx/source/code/Modules.rst
@@ -16,12 +16,12 @@ Abuse.ch
 
 The datasets are flat files.
 
-.. _amada: http://amada.abuse.ch/
+.. _palevo: https://palevotracker.abuse.ch/
 .. _spyeye: https://spyeyetracker.abuse.ch/
 .. _zeus: https://zeustracker.abuse.ch/
 
-There is several tracker provided by this website and each has a blocklist:
+There are several trackers provided by this website and each has a blocklist:
- - amada_
+ - palevo_
  - spyeye_
  - zeus_
 
@@ -121,4 +121,4 @@ The dataset is a flat file
 
 .. _Blocklist.de: http://www.blocklist.de
 
-More information available on the `URL Query`_ website.
+More information available on the `URL Query`_ website.
diff --git a/etc/bgp-ranking.conf.redis b/etc/bgp-ranking.conf.redis
@@ -23,7 +23,6 @@
 ; all the modules to use. 
 [modules]
 ; classname = impact home_dir url
-AmadaIpBlockList    = 7 amada/ipblocklist/ http://amada.abuse.ch/blocklist.php?download=ipblocklist
 BlocklistDe         = 0.1
 BlocklistDeSsh      = 5 blocklist_de/ssh/ http://www.blocklist.de/lists/ssh.txt
 BlocklistDeMail     = 0.1 blocklist_de/mail/ http://www.blocklist.de/lists/mail.txt
@@ -41,6 +40,7 @@ DshieldDaily        = 0.1 dshield/daily/ http://www.dshield.org/feeds/daily_sour
 DshieldTopIPs       = 1 dshield/topips/ http://www.dshield.org/feeds/topips.txt
 Malc0de             = 5 malc0de/blocklist/ http://malc0de.com/bl/IP_Blacklist.txt
 MalwareDomainListIP = 5 malwaredomainlist/ip/ http://www.malwaredomainlist.com/hostslist/ip.txt
+PalevotrackerIpBlockList = 5 palevo/ipblocklist/ https://palevotracker.abuse.ch/blocklists.php?download=ipblocklist
 SpyeyetrackerDdos   = 3 spyeye/ddos/
 SpyeyetrackerIpBlockList = 7 spyeye/ipblocklist/ http://www.abuse.ch/spyeyetracker/blocklist.php?download=ipblocklist
 SshblBase           = 5 sshbl/base/ http://www.sshbl.org/lists/date.txt

diff --git a/lib/modules/__init__.py b/lib/modules/__init__.py
@@ -1,4 +1,4 @@
-from abuse_ch_lists import AmadaIpBlockList, SpyeyetrackerIpBlockList, ZeustrackerIpBlockList, SpyeyetrackerDdos,ZeustrackerDdos
+from abuse_ch_lists import PalevotrackerIpBlockList, SpyeyetrackerIpBlockList, ZeustrackerIpBlockList, SpyeyetrackerDdos, ZeustrackerDdos
 from blocklist_de import BlocklistDeSsh, BlocklistDeMail, BlocklistDeApache, BlocklistDePop3, BlocklistDeFtp
 from clean_mx_lists import CleanMXMalwares, CleanMXPhishing, CleanMXPortals
 from emergingthreats_rbn import EmergingThreatsRBN

diff --git a/lib/modules/abuse_ch_lists.py b/lib/modules/abuse_ch_lists.py
@@ -28,13 +28,9 @@ def __init__(self, raw_dir):
         self.list_type = 1
         AbuseCh.__init__(self, raw_dir)
 
-class AmadaIpBlockList(AbuseCh):
+class PalevotrackerIpBlockList(AbuseCh):
     """
-        Amada IPblocklist provided by Abuse.ch
+        Palevotracker IPblocklist provided by Abuse.ch
-
-        .. note::
-            the type of the infection is available in the list but
-            not saved by the module
     """
 
     def __init__(self, raw_dir):

diff --git a/var/raw_data/palevo/ipblocklist/old/.keepdir b/var/raw_data/palevo/ipblocklist/old/.keepdir
diff --git a/var/raw_data/palevo/ipblocklist/temp/.keepdir b/var/raw_data/palevo/ipblocklist/temp/.keepdir