nexpose 7.0.1 → 7.3.0

data/lib/nexpose/report.rb

@@ -207,6 +207,16 @@ module Nexpose
       filters << Filter.new(type, id)
     end
 
+    # Add the common vulnerability status filters as used by the UI for export
+    # and jasper report templates (the default filters). Recommended for reports
+    # that do not require 'not vulnerable' results to be included. The following
+    # statuses are added: vulnerable-exploted, vulnerable-version, and potential.
+    def add_common_vuln_status_filters
+      ['vulnerable-exploited', 'vulnerable-version', 'potential'].each do |vuln_status|
+        filters << Filter.new('vuln-status', vuln_status)
+      end
+    end
+
     def to_xml
       xml = %(<AdhocReportConfig format="#{@format}" template-id="#{@template_id}")
       xml << %( owner="#{@owner}") if @owner

data/lib/nexpose/role.rb

@@ -24,6 +24,7 @@ module Nexpose
       ADD_USERS_TO_REPORT         = 'AddUsersToReport'
       MANAGE_POLICIES             = 'ManagePolicies'
       MANAGE_TAGS                 = 'ManageTags'
+      MANAGE_ADVPOLICIES          = 'ManageAdvPolicies'
     end
 
     module Site
@@ -157,7 +158,7 @@ module Nexpose
     def self.load(nsc, name, scope = Scope::SILO)
       xml = nsc.make_xml('RoleDetailsRequest')
       xml.add_element('Role', { 'name' => name, 'scope' => scope })
-      response = APIRequest.execute(nsc.url, xml, '1.2')
+      response = APIRequest.execute(nsc.url, xml, '1.2', { timeout: nsc.timeout, open_timeout: nsc.open_timeout })
 
       if response.success
         elem = REXML::XPath.first(response.res, 'RoleDetailsResponse/Role/')
@@ -179,7 +180,7 @@ module Nexpose
       end
       xml.add_element(as_xml)
 
-      response  = APIRequest.execute(nsc.url, xml, '1.2')
+      response  = APIRequest.execute(nsc.url, xml, '1.2', { timeout: nsc.timeout, open_timeout: nsc.open_timeout })
       xml       = REXML::XPath.first(response.res, 'RoleCreateResponse')
       @id       = xml.attributes['id'].to_i unless @existing
       @existing = true

data/lib/nexpose/scan.rb

@@ -196,10 +196,12 @@ module Nexpose
     # Initiate a site scan.
     #
     # @param [Fixnum] site_id Site ID to scan.
+    # @param [Boolean] blackout_override Optional. Given suffencent permissions, force bypass blackout and start scan.
     # @return [Scan] Scan launch information.
     #
-    def scan_site(site_id)
-      xml      = make_xml('SiteScanRequest', 'site-id' => site_id)
+    def scan_site(site_id, blackout_override = false)
+      xml = make_xml('SiteScanRequest', 'site-id' => site_id)
+      xml.add_attributes({ 'force' => true }) if blackout_override
       response = execute(xml)
       Scan.parse(response.res) if response.success
     end

data/lib/nexpose/site.rb

@@ -540,15 +540,17 @@ module Nexpose
     #
     # @param [Connection] connection Connection to console where scan will be launched.
     # @param [String] sync_id Optional synchronization token.
+    # @param [Boolean] blackout_override Optional. Given suffencent permissions, force bypass blackout and start scan.
     # @return [Scan] Scan launch information.
     #
-    def scan(connection, sync_id = nil)
+    def scan(connection, sync_id = nil, blackout_override = false)
       xml = REXML::Element.new('SiteScanRequest')
       xml.add_attributes({ 'session-id' => connection.session_id,
                            'site-id' => @id,
                            'sync-id' => sync_id })
 
-      response = connection.execute(xml, '1.1', timeout: 60)
+      xml.add_attributes({ 'force' => true }) if blackout_override
+      response = connection.execute(xml, '1.1', timeout: connection.timeout)
       Scan.parse(response.res) if response.success
     end
   end

data/lib/nexpose/util.rb

@@ -55,7 +55,8 @@ module Nexpose
       IPAddr.new(ips[1]) if ips[1]
       IPRange.new(ips[0], ips[1])
     rescue ArgumentError => e
-      if e.message == 'invalid address'
+      if e.message =~ /invalid address/
+        # Try to parse the the asset as a hostname if the IP address conversion fails
         HostName.new(asset)
       else
         raise "Unable to parse asset: '#{asset}'. #{e.message}"

data/lib/nexpose/version.rb

@@ -1,4 +1,4 @@
 module Nexpose
   # The latest version of the Nexpose gem
-  VERSION = '7.0.1'.freeze
+  VERSION = '7.3.0'.freeze
 end

data/lib/nexpose/vuln_exception.rb

@@ -22,17 +22,17 @@ module Nexpose
       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
+      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/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) }
+          ajax_data << data.resources
+          links = data.links.select { |ll| ['self', 'last'].include?(ll.rel) }
           break if links[0].href == links[1].href
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.3.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,22 +13,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +176,18 @@ files:
 - README.markdown
 - Rakefile
 - lib/README.md
+- lib/eso.rb
+- lib/eso/conductor.rb
+- lib/eso/configuration/configuration.rb
+- lib/eso/configuration/configuration_manager.rb
+- lib/eso/filter.rb
+- lib/eso/integration_option.rb
+- lib/eso/integration_options_manager.rb
+- lib/eso/nexpose.rb
+- lib/eso/service.rb
+- lib/eso/step.rb
+- lib/eso/step_configuration.rb
+- lib/eso/workflow.rb
 - lib/nexpose.rb
 - lib/nexpose/ajax.rb
 - lib/nexpose/alert.rb
@@ -238,7 +250,7 @@ files:
 - lib/nexpose/web_credentials.rb
 homepage: https://github.com/rapid7/nexpose-client
 licenses:
-- BSD
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -255,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Ruby API for Rapid7 Nexpose