Merge branch 'release/1.5.2'

Author: fedelemantuano

conf/templates/spamscope.json

@@ -39,7 +39,6 @@
         {
           "hashes": {
             "mapping": {
-              "index": "not_analyzed",
               "type": "keyword",
               "eager_global_ordinals": true
             },
@@ -59,8 +58,7 @@
         {
           "headers": {
             "mapping": {
-              "index": "analyzed",
-              "type": "string",
+              "type": "text",
               "analyzer": "header"
             },
             "match_pattern": "regex",
@@ -70,8 +68,7 @@
         {
           "body": {
             "mapping": {
-              "index": "analyzed",
-              "type": "string",
+              "type": "text",
               "analyzer": "html_body"
             },
             "match": "body"
@@ -80,8 +77,7 @@
         {
           "path_mail": {
             "mapping": {
-              "index": "analyzed",
-              "type": "string",
+              "type": "text",
               "analyzer": "path_pattern"
             },
             "match": "path_mail"
@@ -99,7 +95,6 @@
         {
           "all_not_analyzed": {
             "mapping": {
-              "index": "not_analyzed",
               "type": "keyword",
               "eager_global_ordinals": true
             },
@@ -110,18 +105,16 @@
         {
           "all_string": {
             "mapping": {
-              "index": "analyzed",
-              "type": "string",
+              "type": "text",
               "fields": {
                 "raw": {
                   "ignore_above": 256,
-                  "index": "not_analyzed",
                   "type": "keyword",
                   "eager_global_ordinals": true
                 }
               }
             },
-            "match_mapping_type": "string"
+            "match_mapping_type": "text"
           }
         }
       ],

project.clj

@@ -1,4 +1,4 @@
-(defproject spamscope "1.5.1-SNAPSHOT"
+(defproject spamscope "1.5.2-SNAPSHOT"
   :resource-paths ["_resources"]
   :target-path "_build"
   :min-lein-version "2.0.0"

src/modules/attachments/post_processing.py

@@ -18,6 +18,7 @@
 """
 
 from __future__ import absolute_import, print_function, unicode_literals
+import logging
 
 try:
     from modules import register
@@ -28,6 +29,9 @@
 processors = set()
 
 
+log = logging.getLogger(__name__)
+
+
 """
 This module contains all post processors for mail attachments
 (i.e.: VirusTotal, Thug, etc.).
@@ -168,20 +172,32 @@ def zemana(conf, attachments):
             raise ImportError("Zemana library not found. You should be Zemana "
                               "customer (https://www.zemana.com/)")
 
+        from requests.exceptions import HTTPError
+
         z = Zemana(int(conf["PartnerId"]), conf["UserId"],
                    conf["ApiKey"], conf["useragent"])
 
         for a in attachments:
             if not a.get("is_filtered", False):
-                result = z.query(a["md5"])
+                try:
+                    result = z.query(a["md5"])
+                except HTTPError:
+                    log.exception(
+                        "HTTPError in Zemana query for md5 {!r}".format(
+                            a["md5"]))
 
-                if result.json:
+                if result:
                     a["zemana"] = result.json
                     a["zemana"]["type"] = result.type
 
                 for i in a.get("files", []):
-                    i_result = z.query(i["md5"])
+                    try:
+                        i_result = z.query(i["md5"])
+                    except HTTPError:
+                        log.exception(
+                            "HTTPError in Zemana query for md5 {!r}".format(
+                                i["md5"]))
 
-                    if i_result.json:
+                    if i_result:
                         i["zemana"] = i_result.json
                         i["zemana"]["type"] = i_result.type

src/options.py

@@ -19,7 +19,7 @@
 
 from os.path import join
 
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 __configuration_path__ = "/etc/spamscope"
 
 __defaults__ = {