diff --git a/bin/vuln_whisperer b/bin/vuln_whisperer index 09ed142..e9def6c 100644 --- a/bin/vuln_whisperer +++ b/bin/vuln_whisperer @@ -3,13 +3,14 @@ __author__ = 'Austin Taylor' -from vulnwhisp.vulnwhisp import vulnWhisperer +import argparse +import logging +import os +import sys + from vulnwhisp.base.config import vwConfig from vulnwhisp.test.mock import mockAPI -import os -import argparse -import sys -import logging +from vulnwhisp.vulnwhisp import vulnWhisperer def isFileValid(parser, arg): diff --git a/vulnwhisp/frameworks/qualys_web.py b/vulnwhisp/frameworks/qualys_web.py index 98081a6..b52f0ee 100644 --- a/vulnwhisp/frameworks/qualys_web.py +++ b/vulnwhisp/frameworks/qualys_web.py @@ -2,18 +2,19 @@ # -*- coding: utf-8 -*- __author__ = 'Austin Taylor' -from lxml import objectify -from lxml.builder import E +import csv +import logging +import os +import sys import xml.etree.ElementTree as ET + +import dateutil.parser as dp import pandas as pd import qualysapi import qualysapi.config as qcconf import requests -import sys -import os -import csv -import logging -import dateutil.parser as dp +from lxml import objectify +from lxml.builder import E class qualysWhisperAPI(object): diff --git a/vulnwhisp/test/mock.py b/vulnwhisp/test/mock.py index 8af8cbc..95d3f32 100644 --- a/vulnwhisp/test/mock.py +++ b/vulnwhisp/test/mock.py @@ -1,5 +1,6 @@ -import os import logging +import os + import httpretty diff --git a/vulnwhisp/vulnwhisp.py b/vulnwhisp/vulnwhisp.py index 71c38b3..1c06de2 100755 --- a/vulnwhisp/vulnwhisp.py +++ b/vulnwhisp/vulnwhisp.py @@ -2,23 +2,25 @@ # -*- coding: utf-8 -*- __author__ = 'Austin Taylor' -from base.config import vwConfig -from frameworks.nessus import NessusAPI -from frameworks.qualys_web import qualysScanReport -from frameworks.qualys_vuln import qualysVulnScan -from frameworks.openvas import OpenVAS_API -from reporting.jira_api import JiraAPI -import pandas as pd -import numpy as np -from lxml import objectify -import sys -import os import io -import time -import sqlite3 import json import logging +import os import socket +import sqlite3 +import sys +import time + +import numpy as np +import pandas as pd +from lxml import objectify + +from base.config import vwConfig +from frameworks.nessus import NessusAPI +from frameworks.openvas import OpenVAS_API +from frameworks.qualys_vuln import qualysVulnScan +from frameworks.qualys_web import qualysScanReport +from reporting.jira_api import JiraAPI class vulnWhispererBase(object): @@ -846,7 +848,6 @@ class vulnWhispererOpenVAS(vulnWhispererBase): self.record_insert(record_meta) self.logger.info('Scan {} ({}) written to database'.format(scan_name.encode('utf8'), report_id)) - return report def identify_scans_to_process(self):