From 557fb3cfcece8b3832fb00b8707001f7b0ebf067 Mon Sep 17 00:00:00 2001 From: Gavin Schneider Date: Tue, 18 Jul 2017 17:52:42 -0700 Subject: [PATCH] Convert asset filter criteria to double-quoted json The double-quotes are required for Nexpose to be able to parse the criteria correctly, as of some recent version of Nexpose. Resolves #5 --- nexpose/nexpose_assetfilter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nexpose/nexpose_assetfilter.py b/nexpose/nexpose_assetfilter.py index e6bb57c..d512430 100644 --- a/nexpose/nexpose_assetfilter.py +++ b/nexpose/nexpose_assetfilter.py @@ -1,6 +1,7 @@ from json_utils import JSON from nexpose_criteria import Criteria, Criterion from nexpose_asset import AssetBase +import json class FilteredAsset(AssetBase, JSON): @staticmethod @@ -60,5 +61,5 @@ def as_json(self): js['dir'] = 'ASC' js['sort'] = 'assetIP' # why can't we sort on ID? js['table-id'] = 'assetfilter' - js['searchCriteria'] = self.criteria.as_json() + js['searchCriteria'] = json.dumps(self.criteria.as_json(), separators=(',', ':')) return js