fixed zap xml parser notification

archerysec · May 7, 2020 · 44788ea · 44788ea
1 parent 015300e
commit 44788ea
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/scanners/scanner_parser/web_scanner/zap_xml_parser.py b/scanners/scanner_parser/web_scanner/zap_xml_parser.py
@@ -18,6 +18,7 @@
 import uuid
 import hashlib
 import ast
+from webscanners.zapscanner.views import email_sch_notify
 
 spider_status = "0"
 scans_status = "0"
@@ -231,4 +232,11 @@ def xml_parser(username, root, project_id, scan_id):
                     medium_vul=total_medium,
                     low_vul=total_low,
                     total_dup=total_duplicate
-                    )
+                    )
+
+    subject = 'Archery Tool Scan Status - ZAP Report Uploaded'
+    message = 'ZAP Scanner has completed the scan ' \
+              '  %s <br> Total: %s <br>High: %s <br>' \
+              'Medium: %s <br>Low %s' % (target_url, total_vul, total_high, total_medium, total_low)
+
+    email_sch_notify(subject=subject, message=message)
diff --git a/scanners/scanner_plugin/web_scanner/zap_plugin.py b/scanners/scanner_plugin/web_scanner/zap_plugin.py
@@ -23,7 +23,10 @@
 import ast
 from archerysettings.models import zap_settings_db, burp_setting_db, openvas_setting_db
 import hashlib
-from scanners.scanner_parser.web_scanner import zap_xml_parser
+try:
+    from scanners.scanner_parser.web_scanner import zap_xml_parser
+except Exception as e:
+    print(e)
 import defusedxml.ElementTree as ET
 import platform
 import subprocess
@@ -583,12 +586,16 @@ def zap_result_save(self, all_vuln, project_id, un_scanid, username):
         en_root_xml = ET.tostring(root_xml, encoding='utf8').decode('ascii', 'ignore')
         root_xml_en = ET.fromstring(en_root_xml)
 
-        zap_xml_parser.xml_parser(username=username,
-                                  project_id=project_id,
-                                  scan_id=un_scanid,
-                                  root=root_xml_en)
+        try:
+
+            zap_xml_parser.xml_parser(username=username,
+                                      project_id=project_id,
+                                      scan_id=un_scanid,
+                                      root=root_xml_en)
 
-        self.zap.core.delete_all_alerts()
+            self.zap.core.delete_all_alerts()
+        except Exception as e:
+            print(e)
 
     def zap_shutdown(self):
         """