Cyberdefense/VulnWhisperer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove redunant logic

Browse Source
This commit is contained in:
pemontto
2019-05-02 11:48:32 +01:00
parent 1597ad13e8
commit 5df4d127ca
1 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
vulnwhisp/vulnwhisp.py
View File

@ -326,46 +326,42 @@ class vulnWhispererNessus(vulnWhispererBase):
self.develop = True self.develop = True
self.purge = purge self.purge = purge
self.access_key = None
self.secret_key = None
if config is not None: try:
self.nessus_port = self.config.get(self.CONFIG_SECTION, 'port')
self.nessus_trash = self.config.getbool(self.CONFIG_SECTION, 'trash')
try: try:
self.nessus_port = self.config.get(self.CONFIG_SECTION, 'port') self.access_key = self.config.get(self.CONFIG_SECTION,'access_key')
self.secret_key = self.config.get(self.CONFIG_SECTION,'secret_key')
except:
self.access_key = None
self.secret_key = None
self.nessus_trash = self.config.getbool(self.CONFIG_SECTION, try:
'trash') self.logger.info('Attempting to connect to {}...'.format(self.CONFIG_SECTION))
self.nessus = \
try: NessusAPI(hostname=self.hostname,
self.access_key = self.config.get(self.CONFIG_SECTION,'access_key') port=self.nessus_port,
self.secret_key = self.config.get(self.CONFIG_SECTION,'secret_key') username=self.username,
except: password=self.password,
pass profile=self.CONFIG_SECTION,
access_key=self.access_key,
try: secret_key=self.secret_key
self.logger.info('Attempting to connect to {}...'.format(self.CONFIG_SECTION)) )
self.nessus = \ self.nessus_connect = True
NessusAPI(hostname=self.hostname, self.logger.info('Connected to {} on {host}:{port}'.format(self.CONFIG_SECTION, host=self.hostname,
port=self.nessus_port, port=str(self.nessus_port)))
username=self.username,
password=self.password,
profile=self.CONFIG_SECTION,
access_key=self.access_key,
secret_key=self.secret_key
)
self.nessus_connect = True
self.logger.info('Connected to {} on {host}:{port}'.format(self.CONFIG_SECTION, host=self.hostname,
port=str(self.nessus_port)))
except Exception as e:
self.logger.error('Exception: {}'.format(str(e)))
raise Exception(
'Could not connect to {} -- Please verify your settings in {config} are correct and try again.\nReason: {e}'.format(
self.CONFIG_SECTION,
config=self.config.config_in,
e=e))
except Exception as e: except Exception as e:
self.logger.error('Could not properly load your config!\nReason: {e}'.format(e=e)) self.logger.error('Exception: {}'.format(str(e)))
sys.exit(1) raise Exception(
'Could not connect to {} -- Please verify your settings in {config} are correct and try again.\nReason: {e}'.format(
self.CONFIG_SECTION,
config=self.config.config_in,
e=e))
except Exception as e:
self.logger.error('Could not properly load your config!\nReason: {e}'.format(e=e))
sys.exit(1)