From 3ce6065b38741e3e4295371468a8ba0375e83ed1 Mon Sep 17 00:00:00 2001 From: pemontto Date: Thu, 9 May 2019 11:30:45 +0100 Subject: [PATCH] simplify pandas operations --- vulnwhisp/frameworks/nessus.py | 6 +----- vulnwhisp/frameworks/qualys_was.py | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/vulnwhisp/frameworks/nessus.py b/vulnwhisp/frameworks/nessus.py index 66f547b..eb628b8 100755 --- a/vulnwhisp/frameworks/nessus.py +++ b/vulnwhisp/frameworks/nessus.py @@ -220,11 +220,7 @@ class NessusAPI(object): if self.profile == 'nessus': # Set IP from asset field - df.loc[ - df["asset"].str.match("^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$"), "ip" - ] = df.loc[ - df["asset"].str.match("^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$"), "asset" - ] + df["ip"] = df.loc[df["asset"].str.match("^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$"), "asset"] # upper/lowercase fields self.logger.debug('Changing case of fields') diff --git a/vulnwhisp/frameworks/qualys_was.py b/vulnwhisp/frameworks/qualys_was.py index 18c835e..11ccc03 100644 --- a/vulnwhisp/frameworks/qualys_was.py +++ b/vulnwhisp/frameworks/qualys_was.py @@ -524,7 +524,7 @@ class qualysScanReport: # Extract dns field from URL df['dns'] = df['url'].str.extract('https?://([^/]+)', expand=False) - df.loc[df['uri'] != '','dns'] = df.loc[df['uri'] != '','uri'].str.extract('https?://([^/]+)', expand=False) + df['dns'] = df.loc[df['uri'] != '','uri'].str.extract('https?://([^/]+)', expand=False) # Set asset to web_application_name df['asset'] = df['web_application_name']