nexpose 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e41191b7f58c438e2c56beda05a5d86baebd105
-  data.tar.gz: 871cae77aa1c017085941e68885e123b488635ed
+  metadata.gz: 66817396a7b72235d96f4349658d982731f19220
+  data.tar.gz: 8eb90d767993a6dc3232f32ebe41dd78d5643c69
 SHA512:
-  metadata.gz: f92494abb5fc80604ef905d382184e3f73b5131a158360716e34ed03339fd83de2aa6db28e9cbd6ec738fa963fae7f7e4cabeee11a1f151abf62784f38e4e666
-  data.tar.gz: 3b01cc5a60ab8a8f9f064558b36f35367c5a64cd0f0b4f912383dc68b24d617ce2604359c3ed6d82129d0a069be95f45966d298647d2de6d5040ffa2e4ff1b6c
+  metadata.gz: fa0dd9f478eb1226251800645824d13b832e5a39bd90f7d8587883e6b3b579d819fd56021fb16492a837ef7a245865dc82bd6b6ab0640b62aa6d9ad59d041d80
+  data.tar.gz: 8b1029a519ed52d8506bc9c0141c68c375bdea3a5a7fc1c8aaddb3b409a7a6d42ce0c740f252891c4cc5fee9e788141f3b6e6e5e5a795864132f5d1ea2a1e60c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (1.0.0)
+    nexpose (2.0.3)
       rex (~> 2.0, >= 2.0.8)
 
 GEM

data/lib/nexpose/scan_template.rb

@@ -312,13 +312,28 @@ module Nexpose
       checks.attributes['potential'] = enable ? '1' : '0'
     end
 
-    # Get a list of the check categories enabled for this scan template.
+    # Get a list of the check categories disabled for this scan template.
     #
     # @return [Array[String]] List of enabled categories.
     #
+    def disabled_checks_by_category
+      checks = REXML::XPath.first(@xml, '//VulnerabilityChecks/Disabled')
+      checks ? checks.elements.to_a('VulnCategory').map { |c| c.attributes['name'] } : []
+    end
+
+    # @deprecated Use {#enabled_checks_by_category} instead
     def checks_by_category
+      warn "[DEPRECATED] Use #{self.class}#enabled_checks_by_category instead of #{self.class}##{__method__}"
+      enabled_checks_by_category
+    end
+
+    # Get a list of the check categories enabled for this scan template.
+    #
+    # @return [Array[String]] List of enabled categories.
+    #
+    def enabled_checks_by_category
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks/Enabled')
-      checks.elements.to_a('VulnCategory').map { |c| c.attributes['name'] }
+      checks ? checks.elements.to_a('VulnCategory').map { |c| c.attributes['name'] } : []
     end
 
     # Enable checks by category for this template.
@@ -346,13 +361,28 @@ module Nexpose
       _remove_check(category, 'VulnCategory')
     end
 
-    # Get a list of the check types enabled for this scan template.
+    # Get a list of the check types disabled for this scan template.
     #
     # @return [Array[String]] List of enabled check types.
     #
+    def disabled_checks_by_type
+      checks = REXML::XPath.first(@xml, '//VulnerabilityChecks/Disabled')
+      checks ? checks.elements.to_a('CheckType').map { |c| c.attributes['name'] } : []
+    end
+
+    # @deprecated Use {#enabled_checks_by_type} instead
     def checks_by_type
+      warn "[DEPRECATED] Use #{self.class}#enabled_checks_by_type instead of #{self.class}##{__method__}"
+      enabled_checks_by_type
+    end
+
+    # Get a list of the check types enabled for this scan template.
+    #
+    # @return [Array[String]] List of enabled check types.
+    #
+    def enabled_checks_by_type
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks/Enabled')
-      checks.elements.to_a('CheckType').map { |c| c.attributes['name'] }
+      checks ? checks.elements.to_a('CheckType').map { |c| c.attributes['name'] } : []
     end
 
     # Enable checks by type for this template.
@@ -383,13 +413,15 @@ module Nexpose
     def _enable_check(check, elem)
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks')
       checks.elements.delete("Disabled/#{elem}[@name='#{check}']")
-      checks.elements['Enabled'].add_element(elem, { 'name' => check })
+      enabled_checks = checks.elements['Enabled'] || checks.add_element('Enabled')
+      enabled_checks.add_element(elem, { 'name' => check })
     end
 
     def _disable_check(check, elem)
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks')
       checks.elements.delete("Enabled/#{elem}[@name='#{check}']")
-      checks.elements['Disabled'].add_element(elem, { 'name' => check })
+      disabled_checks = checks.elements['Disabled'] || checks.add_element('Disabled')
+      disabled_checks.add_element(elem, { 'name' => check })
     end
 
     def _remove_check(check, elem)
@@ -398,13 +430,28 @@ module Nexpose
       checks.elements.delete("Enabled/#{elem}[@name='#{check}']")
     end
 
+    # @deprecated Use {#enabled_vuln_checks} instead
+    def vuln_checks
+      warn "[DEPRECATED] Use #{self.class}#enabled_vuln_checks instead of #{self.class}##{__method__}"
+      enabled_vuln_checks
+    end
+
     # Get a list of the individual vuln checks enabled for this scan template.
     #
     # @return [Array[String]] List of enabled vulnerability checks.
     #
-    def vuln_checks
+    def enabled_vuln_checks
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks/Enabled')
-      checks.elements.to_a('Check').map { |c| c.attributes['id'] }
+      checks ? checks.elements.to_a('Check').map { |c| c.attributes['id'] } : []
+    end
+
+    # Get a list of the individual vuln checks disabled for this scan template.
+    #
+    # @return [Array[String]] List of enabled vulnerability checks.
+    #
+    def disabled_vuln_checks
+      checks = REXML::XPath.first(@xml, '//VulnerabilityChecks/Disabled')
+      checks ? checks.elements.to_a('Check').map { |c| c.attributes['id'] } : []
     end
 
     # Enable individual check for this template.
@@ -414,7 +461,8 @@ module Nexpose
     def enable_vuln_check(check_id)
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks')
       checks.elements.delete("Disabled/Check[@id='#{check_id}']")
-      checks.elements['Enabled'].add_element('Check', { 'id' => check_id })
+      enabled_checks = checks.elements['Enabled'] || checks.add_element('Enabled')
+      enabled_checks.add_element('Check', { 'id' => check_id })
     end
 
     # Disable individual check for this template.
@@ -424,7 +472,8 @@ module Nexpose
     def disable_vuln_check(check_id)
       checks = REXML::XPath.first(@xml, '//VulnerabilityChecks')
       checks.elements.delete("Enabled/Check[@id='#{check_id}']")
-      checks.elements['Disabled'].add_element('Check', { 'id' => check_id })
+      disabled_checks = checks.elements['Disabled'] || checks.add_element('Disabled')
+      disabled_checks.add_element('Check', { 'id' => check_id })
     end
 
     # Remove individual check for this template. Removes both enabled and
@@ -491,5 +540,42 @@ module Nexpose
     def delete(nsc)
       nsc.delete_scan_template(id)
     end
+
+    # Enable or disable asset configuration scanning for this template. If
+    # the level is not "full", "default" or "none", this is a no-op.
+    #
+    # @param [String] "full" to enable asset configuration logging, and
+    #   "default" or "none" to disable it.
+    def aces_level=(level)
+      return if level.nil?
+      return unless ['full', 'default', 'none'].include? level.downcase
+      logging = REXML::XPath.first(@xml, 'ScanTemplate/Logging')
+      if (logging.nil?)
+        logging = REXML::Element.new('Logging')
+        @xml.add_element(logging)
+      end
+      aces = REXML::XPath.first(logging, 'aces')
+      if (aces.nil?)
+         aces = REXML::Element.new('aces')
+         logging.add_element(aces)
+      end
+      aces.attributes['level'] = level
+    end
+
+    # @return [String] the asset configuration logging value for this
+    #   template.
+    def aces_level
+      logging = REXML::XPath.first(@xml, 'ScanTemplate/Logging')
+      return 'default' if logging.nil?
+      aces = REXML::XPath.first(logging, 'aces')
+      return 'default' if aces.nil?
+      return aces.attributes['level']
+    end
+
+    # @return [Boolean] whether asset configuration scanning is enabled for
+    #   this template.
+    def aces_enabled?
+      return 'full' == aces_level
+    end
   end
 end

data/lib/nexpose/silo_profile.rb

@@ -107,7 +107,7 @@ module Nexpose
       begin
         update(connection)
       rescue APIError => error
-        raise error unless (error.message =~ /A silo profile .* does not exist./)
+        raise error unless (error.message =~ /silo profile(\S*|.*?)does not exist/i)
         create(connection)
       end
     end

data/lib/nexpose/version.rb

@@ -1,4 +1,4 @@
 module Nexpose
   # The latest version of the Nexpose gem
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rex