From a2e27d816bcac42f458e59249cf37f958cc7709e Mon Sep 17 00:00:00 2001 From: pemontto Date: Thu, 18 Apr 2019 11:33:25 +1000 Subject: [PATCH] Ensure empty fields are output as nulls --- vulnwhisp/vulnwhisp.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vulnwhisp/vulnwhisp.py b/vulnwhisp/vulnwhisp.py index 7fd84cc..7925d5f 100755 --- a/vulnwhisp/vulnwhisp.py +++ b/vulnwhisp/vulnwhisp.py @@ -9,6 +9,7 @@ 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 @@ -282,7 +283,8 @@ class vulnWhispererBase(object): # Map CVSS to severity name df.loc[df['cvss'] == '', 'cvss'] = None df['cvss'] = df['cvss'].astype('float') - df.loc[df['cvss'].isnull(), 'cvss_severity'] = 'info' + # df.loc[df['cvss'].isnull(), 'cvss_severity'] = 'info' + df.loc[df['cvss'] == 0, 'cvss3_severity'] = 'info' df.loc[(df['cvss'] > 0) & (df['cvss'] < 3), 'cvss_severity'] = 'low' df.loc[(df['cvss'] >= 3) & (df['cvss'] < 6), 'cvss_severity'] = 'medium' df.loc[(df['cvss'] >= 6) & (df['cvss'] < 9), 'cvss_severity'] = 'high' @@ -293,13 +295,16 @@ class vulnWhispererBase(object): # Map CVSS to severity name df.loc[df['cvss3'] == '', 'cvss3'] = None df['cvss3'] = df['cvss3'].astype('float') - df.loc[df['cvss3'].isnull(), 'cvss3_severity'] = 'info' + # df.loc[df['cvss3'].isnull(), 'cvss3_severity'] = 'info' + df.loc[df['cvss3'] == 0, 'cvss3_severity'] = 'info' df.loc[(df['cvss3'] > 0) & (df['cvss3'] < 3), 'cvss3_severity'] = 'low' df.loc[(df['cvss3'] >= 3) & (df['cvss3'] < 6), 'cvss3_severity'] = 'medium' df.loc[(df['cvss3'] >= 6) & (df['cvss3'] < 9), 'cvss3_severity'] = 'high' df.loc[(df['cvss3'] > 9) & (df['cvss3'].notnull()), 'cvss3_severity'] = 'critical' - df.fillna('', inplace=True) + # Ensure empty strings are output as nulls + df.replace({'': np.nan}, inplace=True) + return df