Removed old unsorted doc and updated the taxonomy functions for the s…

…can_exchange report.
certtools · Nov 16, 2023 · ac04471 · ac04471
1 parent 307386d
commit ac04471
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 29 deletions.
diff --git a/docs/unsorted/shadowserver.md b/docs/unsorted/shadowserver.md
diff --git a/intelmq/bots/parsers/shadowserver/_config.py b/intelmq/bots/parsers/shadowserver/_config.py
@@ -263,19 +263,19 @@ def force_base64(value: Optional[str]) -> Optional[str]:
 
 
 def scan_exchange_taxonomy(field):
-    if field == 'exchange;webshell':
+    if 'webshell' in field:
         return 'intrusions'
     return 'vulnerable'
 
 
 def scan_exchange_type(field):
-    if field == 'exchange;webshell':
+    if 'webshell' in field:
         return 'system-compromise'
-    return 'infected-system'
+    return 'vulnerable-system'
 
 
 def scan_exchange_identifier(field):
-    if field == 'exchange;webshell':
+    if 'webshell' in field:
         return 'exchange-server-webshell'
     return 'vulnerable-exchange-server'
 
@@ -321,7 +321,7 @@ def reload():
             return
     else:
         if not __config.test_mode:
-            raise ValueError("The schema file does not exist.")
+            raise ValueError("The schema file does not exist: %r.", __config.schema_file)
 
     if __config.schema_mtime == 0.0 and mtime == 0.0 and __config.auto_update:
         update_schema()