nexpose 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad58d40aec93d09eac8e17c8a33d62681029ac8
-  data.tar.gz: a7c12f0b5569a78bdbec3913ffb1899e60a48cc6
+  metadata.gz: 76877d89513e91bd92e4d7bc09ab16be5afe194d
+  data.tar.gz: a7549665718107444363121e17a38437b9113909
 SHA512:
-  metadata.gz: 8a52b22b5d5fb956240aede68ee4b5bdb65c8fb6dbae5aa566e4983d57bccdce41b7e27b56c36d6edaa6138f0befc6a9b4b6455f69e14be6d91b58f0665217a4
-  data.tar.gz: 984fb2416a427610052639cbe1f0590882a6abaef35bb6613b672a7a7b049ed33fe8826fec90cf515c1683040e26aefa2bece67a54ea211fc8275b7ce745453a
+  metadata.gz: 3888ad225335ef937c16697b12bc5d496cd6f7aff2f98a73461bfea2cf1932ee390532650bf40dd215198b16157a2f6e48164c5ac695ec95c703ada1959f9714
+  data.tar.gz: 3bfb038b351745655d45c19b7700d116ff9ca4f0c05624c581e121ba0af52baced607e225dd1dae3b4386bd549240a771d25798144a0a501772511c63775b2bd

data/lib/nexpose/creds.rb

@@ -32,9 +32,9 @@ module Nexpose
 
     # Security blob for an existing set of credentials
     attr_accessor :blob
-    # The service for these credentials. Can be All.
+    # The service for these credentials.
     attr_accessor :service
-    # The host for these credentials. Can be Any.
+    # The host for these credentials.
     attr_accessor :host
     # The port on which to use these credentials.
     attr_accessor :port
@@ -60,7 +60,7 @@ module Nexpose
     attr_accessor :auth_type
     # The privacy/encryption type to use with SNMP v3 credentials
     attr_accessor :privacy_type
-    # The privacy/encryption passphrase to use with SNMP v3 credentials
+    # The privacy/encryption pass phrase to use with SNMP v3 credentials
     attr_accessor :privacy_password
 
     def self.for_service(service, user, password, realm = nil, host = nil, port = nil)
@@ -231,7 +231,7 @@ module Nexpose
     attr_reader :soft403
     # Base URL of the application for which the form authentication applies.
     attr_reader :webapproot
-    # When using httpheaders, this represents the set of headers to pass with the authentication request.
+    # When using HTTP headers, this represents the set of headers to pass with the authentication request.
     attr_reader :headers
 
     def initialize(webapproot, soft403)
@@ -259,7 +259,7 @@ module Nexpose
 
   end
 
-  # When using htmlform, this represents the login form information.
+  # When using HTML form, this represents the login form information.
   #
   class Field
     include XMLUtils
@@ -299,7 +299,7 @@ module Nexpose
     alias_method :to_xml_elem, :as_xml
   end
 
-  # When using htmlform, this represents the login form information.
+  # When using HTML form, this represents the login form information.
   #
   class HTMLForm
     include XMLUtils
@@ -344,7 +344,7 @@ module Nexpose
     alias_method :to_xml_elem, :as_xml
   end
 
-  # When using htmlform, this represents the login form information.
+  # When using HTML form, this represents the login form information.
   #
   class HTMLForms
     include XMLUtils
@@ -386,7 +386,7 @@ module Nexpose
     alias_method :to_xml_elem, :as_xml
   end
 
-  # When using ssh-key, this represents the PEM-format keypair information.
+  # When using ssh-key, this represents the PEM-format key-pair information.
   class PEMKey
     # TODO
   end

data/lib/nexpose/engine.rb

@@ -47,7 +47,8 @@ module Nexpose
                                    engine.attributes['name'],
                                    engine.attributes['address'],
                                    engine.attributes['port'].to_i,
-                                   engine.attributes['status'])
+                                   engine.attributes['status'],
+                                   engine.attributes['scope'])
         end
       end
       arr

data/lib/nexpose/group.rb

@@ -47,7 +47,7 @@ module Nexpose
     attr_reader :id, :name, :description, :risk_score, :dynamic
 
     def initialize(id, name, desc, risk, dynamic)
-      @id, @name, @description, @risk_score, @dyanmic = id, name, desc, risk, dynamic
+      @id, @name, @description, @risk_score, @dynamic = id, name, desc, risk, dynamic
     end
 
     def dynamic?
@@ -89,6 +89,34 @@ module Nexpose
       @id = res.attributes['group-id'].to_i if res.success and @id < 1
     end
 
+    # Generate an XML representation of this group configuration
+    #
+    # @return [String] XML valid for submission as part of other requests.
+    #
+    def as_xml
+      xml = REXML::Element.new('AssetGroup')
+      xml.attributes['id'] = @id
+      xml.attributes['name'] = @name
+      xml.attributes['description'] = @description
+
+      if @description && !@description.empty?
+        elem = REXML::Element.new('Description')
+        elem.add_text(@description)
+        xml.add_element(elem)
+      end
+
+      elem = REXML::Element.new('Devices')
+      @assets.each { |a| elem.add_element('device', {'id' => a.id}) }
+      xml.add_element(elem)
+
+      unless tags.empty?
+        tag_xml = xml.add_element(REXML::Element.new('Tags'))
+        @tags.each { |tag| tag_xml.add_element(tag.as_xml) }
+      end
+
+      xml
+    end
+
     # Get an XML representation of the group that is valid for a save request.
     # Note that only name, description, and asset ID information is accepted
     # by a save request.
@@ -96,20 +124,7 @@ module Nexpose
     # @return [String] XML representation of the asset group.
     #
     def to_xml
-      xml = %(<AssetGroup id="#{@id}" name="#{replace_entities(@name)}")
-      xml << %( description="#{replace_entities(@description)}") if @description
-      xml << '>'
-      xml << '<Devices>'
-      @assets.each do |asset|
-        xml << %(<device id="#{asset.id}"/>)
-      end
-      xml << '</Devices>'
-      xml << '<Tags>'
-      @tags.each do |tag|
-        xml << tag.as_xml.to_s
-      end
-      xml << '</Tags>'
-      xml << '</AssetGroup>'
+      as_xml.to_s
     end
 
     # Launch ad hoc scans against each group of assets per site.
@@ -149,6 +164,11 @@ module Nexpose
                         group.attributes['description'],
                         group.attributes['id'].to_i,
                         group.attributes['riskscore'].to_f)
+
+      group.elements.each('Description') do |desc|
+        asset_group.description = desc.text
+      end
+
       group.elements.each('Devices/device') do |dev|
         asset_group.assets << Device.new(dev.attributes['id'].to_i,
                                          dev.attributes['address'],

data/lib/nexpose/shared_cred.rb

@@ -50,8 +50,6 @@ module Nexpose
       cred.privilege_username = json['privilegeElevationUsername']
       cred.all_sites = json['scope'] == 'ALL_SITES_ENABLED_DEFAULT'
       cred.last_modified = Time.at(json['lastModified']['time'] / 1000)
-      cred.auth_type = json['snmpv3authtype']
-      cred.privacy_type = json['snmpv3privtype']
       cred
     end
 
@@ -81,13 +79,12 @@ module Nexpose
     attr_accessor :privilege_password
     # Permission elevation type. See Nexpose::Credential::ElevationType.
     attr_accessor :privilege_type
+    # Privacty password of SNMP v3 credential
+    attr_accessor :privacy_password
     # Authentication type of SNMP v3 credential
     attr_accessor :auth_type
     # Privacy type of SNMP v3 credential
     attr_accessor :privacy_type
-    # Privacty password of SNMP v3 credential
-    attr_accessor :privacy_password
-
     # IP address or host name to restrict this credential to.
     attr_accessor :host
     # Single port to restrict this credential to.

data/lib/nexpose/site.rb

@@ -337,6 +337,12 @@ module Nexpose
       xml.attributes['riskfactor'] = @risk_factor
       xml.attributes['isDynamic'] == '1' if dynamic?
 
+      if @description && !@description.empty?
+        elem = REXML::Element.new('Description')
+        elem.add_text(@description)
+        xml.add_element(elem)
+      end
+
       unless @users.empty?
         elem = REXML::Element.new('Users')
         @users.each { |user| elem.add_element('user', { 'id' => user }) }
@@ -415,6 +421,10 @@ module Nexpose
         site.risk_factor = s.attributes['riskfactor'] || 1.0
         site.is_dynamic = true if s.attributes['isDynamic'] == '1'
 
+        s.elements.each('Description') do |desc|
+          site.description = desc.text
+        end
+
         s.elements.each('Users/user') do |user|
           site.users << user.attributes['id'].to_i
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - HD Moore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex