add spam and malware categories

Author: superstes

.gitignore

@@ -4,3 +4,6 @@ visualization/*.zip
 visualization/LICENSE.txt
 src/riskdb/builder/build/*.json
 src/riskdb/builder/build/*.mmdb
+src/riskdb/dnsbl/*.txt
+src/riskdb/dnsbl/*.json
+src/riskdb/dnsbl/*.zip

README.md

@@ -188,7 +188,7 @@ curl -XPOST https://risk.oxl.app/api/report --data '{"ip": "1.1.1.1", "cat": "at
 
 ```
 
-Available categories are: `bot, probe, rate, attack, crawler, hosting, vpn, proxy`
+Available categories are: `bot, probe, rate, attack, crawler, spam, malware, hosting, vpn, proxy`
 
 **Limits**:
 

src/riskdb/api/apidocs/report.yml

@@ -23,7 +23,7 @@ definitions:
         description: 'IP of the Abuser'
       cat:
         type: 'string'
-        enum: ['bot', 'attack', 'crawler', 'rate', 'hosting', 'vpn', 'proxy', 'probe']
+        enum: ['bot', 'attack', 'crawler', 'rate', 'hosting', 'vpn', 'proxy', 'probe', 'spam', 'malware']
         description: 'Kind of abuse'
       cmt:
         type: 'string'

src/riskdb/builder/config.py

@@ -3,7 +3,7 @@
 from riskdb.config import DL_DIR
 
 INFO_CATEGORIES = ['hosting', 'vpn', 'proxy']
-CATEGORIES = ['bot', 'probe', 'rate', 'attack', 'crawler']
+CATEGORIES = ['bot', 'probe', 'rate', 'attack', 'crawler', 'spam', 'malware']
 
 # source: https://github.com/O-X-L/geoip-asn
 ASN_JSON_FILE = DL_DIR / 'asn_full.json'  # https://geoip.oxl.app/file/asn_full.json.zip

visualization/net_tree.html

@@ -61,7 +61,7 @@
             const WIDTH = window.innerWidth;
             const HEIGHT = window.innerHeight - 50;
             const NET_PAD = 5;
-            const CATEGORIES = ['sum', 'bot', 'probe', 'rate', 'attack', 'crawler'];
+            const CATEGORIES = ['sum', 'bot', 'probe', 'rate', 'attack', 'crawler', 'spam', 'malware'];
             const COLORSCHEME = [
                 // red-ish
                 "#B93022", "#FF383D", "#D32669", "#C43F03", "#E70291", "#E211C0", "#6A3D52", "#C75839", "#E7A8B0",

visualization/world_map.py

@@ -11,7 +11,7 @@
 
 SRC_PATH = Path(__file__).resolve().parent
 HIGHLIGHT_TOP_N = 20
-CATEGORIES = ['sum', 'bot', 'probe', 'rate', 'attack', 'crawler']
+CATEGORIES = ['sum', 'bot', 'probe', 'rate', 'attack', 'crawler', 'spam', 'malware']
 
 # todo: add change to last month
 DATA = {
@@ -46,6 +46,14 @@
                 'name': 'Reported crawlers',
                 'format': '{0}',
             },
+            'spam': {
+                'name': 'Reported spam',
+                'format': '{0}',
+            },
+            'malware': {
+                'name': 'Reported malware',
+                'format': '{0}',
+            },
             'ip4': {
                 'name': 'Reports from IPv4',
                 'format': '{0}',