From 898681ad030658f6397bc5b1f9380d94f0125fad Mon Sep 17 00:00:00 2001 From: Michael Huffman Date: Wed, 17 Jan 2018 08:04:32 -0800 Subject: [PATCH 1/3] Update vuln exceptions to use generally available API version --- lib/nexpose/vuln_exception.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nexpose/vuln_exception.rb b/lib/nexpose/vuln_exception.rb index fe9655ad..f164ee45 100644 --- a/lib/nexpose/vuln_exception.rb +++ b/lib/nexpose/vuln_exception.rb @@ -22,14 +22,14 @@ def list_vuln_exceptions(status = nil) url_size = 500 url_page = 0 - req = Nexpose::AJAX.get(self, "/api/experimental/vulnerability_exceptions?_size=#{url_size}&_page=#{url_page}") + req = Nexpose::AJAX.get(self, "/api/3/vulnerability_exceptions?size=#{url_size}&page=#{url_page}") data = JSON.parse(req, object_class: OpenStruct) ajax_data << data._resources if data._links.count > 1 loop do url_page += 1 - req = Nexpose::AJAX.get(self, "/api/experimental/vulnerability_exceptions?_size=#{url_size}&_page=#{url_page}") + req = Nexpose::AJAX.get(self, "/api/3/vulnerability_exceptions?size=#{url_size}&page=#{url_page}") data = JSON.parse(req, object_class: OpenStruct) ajax_data << data._resources links = data._links.select { |ll| ['self', 'last'].include?(ll.rel) } From d629ca75f64cda00861e64f690b795447d4a3517 Mon Sep 17 00:00:00 2001 From: Michael Huffman Date: Wed, 17 Jan 2018 08:31:32 -0800 Subject: [PATCH 2/3] Fix reference to "links" property --- lib/nexpose/vuln_exception.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nexpose/vuln_exception.rb b/lib/nexpose/vuln_exception.rb index f164ee45..35dbf42b 100644 --- a/lib/nexpose/vuln_exception.rb +++ b/lib/nexpose/vuln_exception.rb @@ -26,13 +26,13 @@ def list_vuln_exceptions(status = nil) data = JSON.parse(req, object_class: OpenStruct) ajax_data << data._resources - if data._links.count > 1 + if data.links.count > 1 loop do url_page += 1 req = Nexpose::AJAX.get(self, "/api/3/vulnerability_exceptions?size=#{url_size}&page=#{url_page}") data = JSON.parse(req, object_class: OpenStruct) ajax_data << data._resources - links = data._links.select { |ll| ['self', 'last'].include?(ll.rel) } + links = data.links.select { |ll| ['self', 'last'].include?(ll.rel) } break if links[0].href == links[1].href end end From 6171d9408b363d6c8290a95c1d977273bc3cf7c8 Mon Sep 17 00:00:00 2001 From: Michael Huffman Date: Wed, 17 Jan 2018 08:41:27 -0800 Subject: [PATCH 3/3] Fix reference to "resources" --- lib/nexpose/vuln_exception.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nexpose/vuln_exception.rb b/lib/nexpose/vuln_exception.rb index 35dbf42b..1cccd1c7 100644 --- a/lib/nexpose/vuln_exception.rb +++ b/lib/nexpose/vuln_exception.rb @@ -24,14 +24,14 @@ def list_vuln_exceptions(status = nil) req = Nexpose::AJAX.get(self, "/api/3/vulnerability_exceptions?size=#{url_size}&page=#{url_page}") data = JSON.parse(req, object_class: OpenStruct) - ajax_data << data._resources + ajax_data << data.resources if data.links.count > 1 loop do url_page += 1 req = Nexpose::AJAX.get(self, "/api/3/vulnerability_exceptions?size=#{url_size}&page=#{url_page}") data = JSON.parse(req, object_class: OpenStruct) - ajax_data << data._resources + ajax_data << data.resources links = data.links.select { |ll| ['self', 'last'].include?(ll.rel) } break if links[0].href == links[1].href end