Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1 from serranos/modules-maintenance

Replacing discontinued module amada by module palevo also from Abuse.ch.
  • Loading branch information...
commit b90063ff1a3f8006095f2ee25305fc9c39db091a 2 parents 49143e3 + fbb46fa
Raphaël Vinot authored
8 doc/sphinx/source/code/Modules.rst
View
@@ -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:
- - amada_
+There are several trackers provided by this website and each has a blocklist:
+ - 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.
2  etc/bgp-ranking.conf.redis
View
@@ -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
2  lib/modules/__init__.py
View
@@ -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
8 lib/modules/abuse_ch_lists.py
View
@@ -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
-
- .. note::
- the type of the infection is available in the list but
- not saved by the module
+ Palevotracker IPblocklist provided by Abuse.ch
"""
def __init__(self, raw_dir):
0  var/raw_data/palevo/ipblocklist/old/.keepdir
View
No changes.
0  var/raw_data/palevo/ipblocklist/temp/.keepdir
View
No changes.
Please sign in to comment.
Something went wrong with that request. Please try again.