nexpose 0.1.14 → 0.2.0

data/lib/nexpose/common.rb

@@ -1,5 +1,13 @@
 module Nexpose
 
+  # Constants
+
+  module Scope
+
+    GLOBAL = 'global'
+    SILO = 'silo'
+  end
+
   # Configuration structure for e-mail notification.
   #
   # The send_as and send_to_acl_as attributes are optional, but one of them is

data/lib/nexpose/group.rb

@@ -25,7 +25,7 @@ module Nexpose
 
       res = []
       if r.success
-        r.res.elements.each('//AssetGroupSummary') do |group|
+        r.res.elements.each('AssetGroupListingResponse/AssetGroupSummary') do |group|
           res << AssetGroupSummary.new(group.attributes['id'].to_i,
                                        group.attributes['name'].to_s,
                                        group.attributes['description'].to_s,
@@ -36,6 +36,7 @@ module Nexpose
     end
 
     alias_method :asset_groups_listing, :asset_groups
+    alias_method :groups, :asset_groups
   end
 
   # Summary value object for asset group information.
@@ -127,23 +128,23 @@ module Nexpose
 
     alias_method :get, :load
 
-    def self.parse(rexml)
-      return nil unless rexml
-
-      rexml.elements.each('//AssetGroup') do |group|
-        asset_group = new(group.attributes['name'].to_s,
-                          group.attributes['description'].to_s,
-                          group.attributes['id'].to_i,
-                          group.attributes['riskscore'].to_f)
-        rexml.elements.each('//Devices/device') do |dev|
-          asset_group.devices << Device.new(dev.attributes['id'].to_i,
-                                            dev.attributes['address'].to_s,
-                                            dev.attributes['site-id'].to_i,
-                                            dev.attributes['riskfactor'].to_f,
-                                            dev.attributes['riskscore'].to_f)
-        end
-        return asset_group
+    def self.parse(xml)
+      puts xml
+      return nil unless xml
+
+      group = REXML::XPath.first(xml, 'AssetGroupConfigResponse/AssetGroup')
+      asset_group = new(group.attributes['name'].to_s,
+                        group.attributes['description'].to_s,
+                        group.attributes['id'].to_i,
+                        group.attributes['riskscore'].to_f)
+      group.elements.each('Devices/device') do |dev|
+        asset_group.devices << Device.new(dev.attributes['id'].to_i,
+                                          dev.attributes['address'].to_s,
+                                          dev.attributes['site-id'].to_i,
+                                          dev.attributes['riskfactor'].to_f,
+                                          dev.attributes['riskscore'].to_f)
       end
+      asset_group
     end
   end
 end

data/lib/nexpose/role.rb

@@ -1,27 +1,259 @@
 module Nexpose
 
+  # Constants
+  module Privilege
+
+    module Global
+      CREATE_REPORTS = 'CreateReports'
+      CONFIGURE_GLOBAL_SETTINGS = 'ConfigureGlobalSettings'
+      MANAGE_SITES = 'ManageSites'
+      MANAGE_ASSET_GROUPS = 'ManageAssetGroups'
+      MANAGE_DYNAMIC_ASSET_GROUPS = 'ManageDynamicAssetGroups'
+      MANAGE_SCAN_TEMPLATES = 'ManageScanTemplates'
+      MANAGE_REPORT_TEMPLATES = 'ManageReportTemplates'
+      GENERATE_RESTRICTED_REPORTS = 'GenerateRestrictedReports'
+      MANAGE_SCAN_ENGINES = 'ManageScanEngines'
+      SUBMIT_VULN_EXCEPTIONS = 'SubmitVulnExceptions'
+      APPROVE_VULN_EXCEPTIONS = 'ApproveVulnExceptions'
+      DELETE_VULN_EXCEPTIONS = 'DeleteVulnExceptions'
+      CREATE_TICKETS = 'CreateTickets'
+      CLOSE_TICKETS = 'CloseTickets'
+      TICKET_ASSIGNEE = 'TicketAssignee'
+      ADD_USERS_TO_SITE = 'AddUsersToSite'
+      ADD_USERS_TO_GROUP = 'AddUsersToGroup'
+      ADD_USERS_TO_REPORT = 'AddUsersToReport'
+      MANAGE_POLICIES = 'ManagePolicies'
+    end
+
+    module Site
+      VIEW_ASSET_DATA = 'ViewAssetData'  # NOTE Duplicated between Site and AssetGroup
+      CONFIGURE_ALERTS = 'ConfigureAlerts'
+      CONFIGURE_CREDENTIALS = 'ConfigureCredentials'
+      CONFIGURE_ENGINES = 'ConfigureEngines'
+      CONFIGURE_SCAN_TEMPLATES = 'ConfigureScanTemplates' 
+      CONFIGURE_SCHEDULE_SCANS = 'ConfigureScheduleScans' 
+      CONFIGURE_SITE_SETTINGS = 'ConfigureSiteSettings'
+      CONFIGURE_TARGETS = 'ConfigureTargets'
+      MANUAL_SCANS = 'ManualScans'
+      PURGE_DATA = 'PurgeData'
+    end
+
+    module AssetGroup
+      CONFIGURE_ASSETS = 'ConfigureAssets'
+      VIEW_ASSET_DATA = 'ViewAssetData'  # NOTE Duplicated between Site and AssetGroup
+    end
+  end
+
   module NexposeAPI
     include XMLUtils
 
     # Returns a summary list of all roles.
+    #
     def role_listing
       xml = make_xml('RoleListingRequest')
       r = execute(xml, '1.2')
+      roles = []
       if r.success
-        res = []
         r.res.elements.each('RoleListingResponse/RoleSummary') do |summary|
-          res << {
-            :id => summary.attributes['id'],
-            :name => summary.attributes['name'],
-            :full_name => summary.attributes['full-name'],
-            :description => summary.attributes['description'],
-            :enabled => summary.attributes['enabled'],
-            :scope => summary.attributes['scope']
-          }
+          roles << RoleSummary::parse(summary)
         end
-        res
       end
+      roles
     end
+
+    alias_method :roles, :role_listing
+
+    def role_delete(role, scope = Scope::SILO)
+      xml = %Q(<RoleDeleteRequest session-id="#{@session_id}">)
+      xml << %Q(<Role name="#{role}" scope="#{scope}"/>)
+      xml << '</RoleDeleteRequest>' 
+      response = execute(xml, '1.2')
+      response.success
+    end
+
+    alias_method :delete_role, :role_delete
   end
 
+  # Role summary object encapsulating information about a role.
+  #
+  class RoleSummary
+
+    # The short name of the role. Must be unique.
+    attr_accessor :name
+
+    # The full name of the role. Must be unique.
+    attr_accessor :full_name
+
+    # The unique identifier of the role.
+    attr_accessor :id
+
+    # A description of the role.
+    attr_accessor :description
+
+    # Whether or not the role is enabled.
+    attr_accessor :enabled
+
+    # Specifies if the role has global or silo scope.
+    # @see Nexpose::Scope
+    attr_accessor :scope
+
+    def initialize(name, full_name, id, description, enabled = true, scope = Scope::SILO)
+      @name, @full_name, @id, @description, @enabled, @scope = name, full_name, id, description, enabled, scope
+    end
+
+    def self.parse(xml)
+      new(xml.attributes['name'],
+          xml.attributes['full-name'],
+          xml.attributes['id'].to_i,
+          xml.attributes['description'],
+          xml.attributes['enabled'] == 'true',
+          xml.attributes['scope'])
+    end
+  end
+
+  class Role < RoleSummary
+
+    # Array of all privileges which are enabled for this role.
+    # Note: Although the underlying XML has different requirements, this only checks for presence.
+    # @see Nexpose::Privilege
+    attr_accessor :privileges
+
+    # Flag to track whether this role exists already on the Nexpose console.
+    # Flag determines behavior of #save method.
+    attr_accessor :existing
+
+    def initialize(name, full_name, id, enabled = true, scope = Scope::SILO)
+      @name, @full_name, @id, @enabled, @scope = name, full_name, id, enabled, scope
+      @privileges = []
+    end
+
+    # Retrieve a detailed description of a single role.
+    #
+    # @param [Connection] nsc Nexpose connection.
+    # @param [String] name The short name of the role.
+    # @param [String] scope Whether the role has global or silo scope. @see Nexpose::Scope
+    #   Scope doesn't appear to be required when requesting installed roles.
+    # @return [Role] requested role.
+    #
+    def self.load(nsc, name, scope = Scope::SILO)
+      xml = %Q(<RoleDetailsRequest session-id="#{nsc.session_id}">)
+      xml << %Q(<Role name="#{name}" scope="#{scope}"/>)
+      xml << '</RoleDetailsRequest>'
+
+      response = APIRequest.execute(nsc.url, xml, '1.2')
+      if response.success
+        elem = REXML::XPath.first(response.res, 'RoleDetailsResponse/Role/')
+        parse(elem)
+      end
+    end
+
+    alias_method :get, :load
+
+    # Create or save a Role to the Nexpose console.
+    #
+    # @param [Connection] nsc Nexpose connection.
+    #
+    def save(nsc)
+      if @existing
+        xml = %Q(<RoleUpdateRequest session-id="#{nsc.session_id}">)
+        xml << to_xml
+        xml << '</RoleUpdateRequest>'
+      else
+        xml = %Q(<RoleCreateRequest session-id="#{nsc.session_id}">)
+        xml << to_xml
+        xml << '</RoleCreateRequest>'
+      end
+
+      response = APIRequest.execute(nsc.url, xml, '1.2')
+      xml = REXML::XPath.first(response.res, 'RoleCreateResponse')
+      @id = xml.attributes['id'].to_i
+      @existing = true
+      response.success
+    end
+
+    # Copy an existing Role to build a new role off of it.
+    # Role will not have a valid name or full_name, so they will need to be provided before saving.
+    #
+    # @param [Connection] nsc Nexpose connection.
+    # @param [String] name The short name of the role which you wish to copy.
+    # @param [String] scope Whether the role has global or silo scope. @see Nexpose::Scope
+    # @return [Role] requested role.
+    #
+    def self.copy(nsc, name, scope = Scope::SILO)
+      role = load(nsc, name, scope)
+      role.name = role.full_name = nil
+      role.id = -1
+      role.existing = false
+      role
+    end
+
+    # Remove this role from the Nexpose console.
+    #
+    # @param [Connection] nsc Nexpose connection.
+    #
+    def delete(nsc)
+      xml = %Q(<RoleDeleteRequest session-id="#{nsc.session_id}">)
+      xml << %Q(<Role name="#{@name}" scope="#{@scope}"/>)
+      xml << '</RoleDeleteRequest>' 
+      response = APIRequest.execute(nsc.url, xml, '1.2')
+      response.success
+    end
+
+    def self.parse(xml)
+      role = new(xml.attributes['name'],
+                 xml.attributes['full-name'],
+                 xml.attributes['id'].to_i,
+                 xml.attributes['enabled'] == 'true',
+                 xml.attributes['scope'])
+
+      role.description = REXML::XPath.first(xml, 'Description').text
+      role.existing = true
+
+      # Only grab enabled privileges.
+      xml.elements.each("GlobalPrivileges/child::*[@enabled='true']") do |privilege|
+        role.privileges << privilege.name
+      end
+      xml.elements.each("SitePrivileges/child::*[@enabled='true']") do |privilege|
+        role.privileges << privilege.name
+      end
+      xml.elements.each("AssetGroupPrivileges/child::*[@enabled='true']") do |privilege|
+        role.privileges << privilege.name
+      end
+      role
+    end
+
+    def to_xml
+      xml = %Q(<Role name="#{@name}" full-name="#{@full_name}")
+      xml << %Q( enabled="#{(enabled ? 'true' : 'false')}")
+      xml << %Q( scope="#{@scope}">)
+      xml << %Q(<Description>#{@description}</Description>)
+
+      xml << '<SitePrivileges>'
+      Privilege::Site::constants.each do |field|
+        as_s = Privilege::Site.const_get(field)
+        enabled = (privileges.member? as_s) ? 'true' : 'false'
+        xml << %Q(<#{as_s} enabled="#{enabled}"/>)
+      end
+      xml << '</SitePrivileges>'
+
+      xml << '<AssetGroupPrivileges>'
+      Privilege::AssetGroup::constants.each do |field|
+        as_s = Privilege::AssetGroup.const_get(field)
+        enabled = (privileges.member? as_s) ? 'true' : 'false'
+        xml << %Q(<#{as_s} enabled="#{enabled}"/>)
+      end
+      xml << '</AssetGroupPrivileges>'
+
+      xml << '<GlobalPrivileges>'
+      Privilege::Global::constants.each do |field|
+        as_s = Privilege::Global.const_get(field)
+        enabled = (privileges.member? as_s) ? 'true' : 'false'
+        xml << %Q(<#{as_s} enabled="#{enabled}"/>)
+      end
+      xml << '</GlobalPrivileges>'
+
+      xml << '</Role>'
+      xml
+    end
+  end
 end

data/lib/nexpose/scan.rb

@@ -119,27 +119,27 @@ module Nexpose
     # @param [REXML::Document] rexml XML document to parse.
     # @return [ScanSummary] Scan summary represented by the XML.
     #
-    def self.parse(rexml)
-      tasks = Tasks.parse(rexml.elements['tasks'])
-      nodes = Nodes.parse(rexml.elements['nodes'])
-      vulns = Vulnerabilities.parse(rexml.attributes['scan-id'], rexml)
-      msg = rexml.elements['message'] ?  rexml.elements['message'].text : nil
+    def self.parse(xml)
+      tasks = Tasks.parse(xml.elements['tasks'])
+      nodes = Nodes.parse(xml.elements['nodes'])
+      vulns = Vulnerabilities.parse(xml.attributes['scan-id'], xml)
+      msg = xml.elements['message'] ?  xml.elements['message'].text : nil
 
       # Start time can be empty in some error conditions.
       start_time = nil
-      unless rexml.attributes['startTime'] == ''
-        start_time = DateTime.parse(rexml.attributes['startTime'].to_s).to_time
+      unless xml.attributes['startTime'] == ''
+        start_time = DateTime.parse(xml.attributes['startTime'].to_s).to_time
       end
 
       # End time is often not present, since reporting on running scans.
       end_time = nil
-      if rexml.attributes['endTime']
-        end_time = DateTime.parse(rexml.attributes['endTime'].to_s).to_time
+      if xml.attributes['endTime']
+        end_time = DateTime.parse(xml.attributes['endTime'].to_s).to_time
       end
-      return ScanSummary.new(rexml.attributes['scan-id'].to_i,
-                             rexml.attributes['site-id'].to_i,
-                             rexml.attributes['engine-id'].to_i,
-                             rexml.attributes['status'],
+      return ScanSummary.new(xml.attributes['scan-id'].to_i,
+                             xml.attributes['site-id'].to_i,
+                             xml.attributes['engine-id'].to_i,
+                             xml.attributes['status'],
                              start_time,
                              end_time,
                              msg,

data/lib/nexpose/site.rb

@@ -14,12 +14,12 @@ module Nexpose
     def site_device_listing(site_id = nil)
       r = execute(make_xml('SiteDeviceListingRequest', {'site-id' => site_id}))
 
-      arr = []
+      devices = []
       if r.success
-        r.res.elements.each('//SiteDevices') do |site|
+        r.res.elements.each('SiteDeviceListingResponse/SiteDevices') do |site|
           site_id = site.attributes['site-id'].to_i
-          site.elements.each("//SiteDevices[contains(@site-id,'#{site_id}')]/device") do |device|
-            arr << Device.new(device.attributes['id'].to_i,
+          site.elements.each('device') do |device|
+            devices << Device.new(device.attributes['id'].to_i,
                               device.attributes['address'],
                               site_id,
                               device.attributes['riskfactor'].to_f,
@@ -27,7 +27,7 @@ module Nexpose
           end
         end
       end
-      arr
+      devices
     end
 
     alias_method :assets, :site_device_listing
@@ -51,7 +51,7 @@ module Nexpose
       r = execute(make_xml('SiteListingRequest'))
       arr = []
       if (r.success)
-        r.res.elements.each("//SiteSummary") do |site|
+        r.res.elements.each("SiteListingResponse/SiteSummary") do |site|
           arr << SiteSummary.new(site.attributes['id'].to_i,
                                  site.attributes['name'],
                                  site.attributes['description'],
@@ -73,13 +73,13 @@ module Nexpose
     #
     def site_scan_history(site_id)
       r = execute(make_xml('SiteScanHistoryRequest', {'site-id' => site_id}))
-      res = []
+      scans = []
       if r.success
-        r.res.elements.each("//ScanSummary") do |scan_event|
-          res << ScanSummary.parse(scan_event)
+        r.res.elements.each('SiteScanHistoryResponse/ScanSummary') do |scan_event|
+          scans << ScanSummary.parse(scan_event)
         end
       end
-      res
+      scans
     end
 
     # Retrieve the scan summary statistics for the latest completed scan

data/lib/nexpose/ticket.rb

@@ -1,7 +1,72 @@
 module Nexpose
+
+  module Ticket
+
+    module State
+      OPEN = 'O'
+      ASSIGNED = 'A'
+      MODIFIED = 'M'
+      FIXED = 'X'
+      PARTIAL = 'P'
+      REJECTED_FIX = 'R'
+      PRIORITIZED = 'Z'
+      NOT_REPRODUCIBLE = 'F'
+      NOT_ISSUE = 'I'
+      CLOSED = 'C'
+      UNKNOWN = 'U'
+    end
+
+    module Priority
+      LOW = 'low'
+      MODERATE = 'moderate'
+      NORMAL = 'normal'
+      HIGH = 'high'
+      CRITICAL = 'critical'
+    end
+  end
+
   module NexposeAPI
     include XMLUtils
 
+    def ticket_listing
+      xml = make_xml('TicketListingRequest')
+      r = execute(xml, '1.2')
+      tickets = []
+      if r.success
+        r.res.elements.each('TicketListingResponse/TicketSummary') do |summary|
+          tickets << TicketSummary::parse(summary)
+        end
+      end
+      tickets
+    end
+
+    alias_method :tickets, :ticket_listing
+
+    # Deletes a Nexpose ticket.
+    #
+    # @param [Fixnum] ticket Unique ID of the ticket to delete.
+    # @return [Boolean] Whether or not the ticket deletion succeeded.
+    #
+    def delete_ticket(ticket)
+      delete_tickets([ticket])
+    end
+
+    # Deletes a Nexpose ticket.
+    #
+    # @param [Array[Fixnum]] tickets Array of unique IDs of tickets to delete.
+    # @return [Boolean] Whether or not the ticket deletions succeeded.
+    #
+    def delete_tickets(tickets)
+      xml = make_xml('TicketDeleteRequest')
+      tickets.each do |id|
+        xml.add_element('Ticket', {'id' => id})
+      end
+
+      (execute xml, '1.2').success
+    end
+
+    alias_method :ticket_delete, :delete_tickets
+
     #
     # Create a Nexpose ticket
     #
@@ -84,25 +149,54 @@ module Nexpose
         false
       end
     end
+  end
 
-    #
-    # Deletes a Nexpose ticket.
-    #
-    # ticket_ids: An array of ticket IDs to be deleted.
-    #
-    # @returns {@code true} iff the call was successfull. {@code false} otherwise.
-    #
-    def delete_ticket ticket_ids
-      if not ticket_ids or ticket_ids.count < 1
-        raise ArgumentError.new 'The tickets to delete should not be null or empty'
-      end
+  # Summary of ticket information returned from a ticket listing request.
+  # For more details, issue a ticket detail request.
+  #
+  class TicketSummary
 
-      base_xml = make_xml 'TicketDeleteRequest'
-      ticket_ids.each do |id|
-        base_xml.add_element 'Ticket', {'id' => id}
-      end
+    # The ID number of the ticket.
+    attr_accessor :id
+
+    # Ticket name.
+    attr_accessor :name
+
+    # The asset the ticket is created for.
+    attr_accessor :device_id
+
+    # The login name of person to whom the ticket is assigned.
+    # The user must have view asset privilege on the asset specified in the device-id attribute.
+    attr_accessor :assigned_to
+
+    # The relative priority of the ticket, assigned by the creator of the ticket.
+    # @see Nexpose::Ticket::Priority
+    attr_accessor :priority
+
+    # The login name of the person who created the ticket.
+    attr_accessor :author
+
+    # Date and time of ticket creation.
+    attr_accessor :created_on
+
+    # The current status of the ticket.
+    attr_accessor :state
+
+    def initialize(id, name)
+      @id, @name = id, name
+    end
 
-      (execute base_xml, '1.2').success
+    def self.parse(xml)
+      ticket = new(xml.attributes['id'].to_i,
+                   xml.attributes['name'])
+      ticket.device_id = xml.attributes['device-id'].to_i
+      ticket.assigned_to = xml.attributes['assigned-to']
+      ticket.priority = xml.attributes['priority']
+      ticket.author = xml.attributes['author']
+      ticket.created_on = DateTime::parse(xml.attributes['created-on'])
+      lookup = Ticket::State.constants.reduce({}) { |a, e| a[Ticket::State.const_get(e)] = e; a }
+      ticket.state = lookup[xml.attributes['state']]
+      ticket
     end
   end
 end

data/lib/nexpose/vuln.rb

@@ -1,4 +1,169 @@
 module Nexpose
+  module NexposeAPI
+    include XMLUtils
+
+    # Retrieve summary details of all vulnerabilities.
+    #
+    # @param [Boolean] full Whether or not to gather the full summary.
+    #   Without the flag, only id, title, and severity are returned.
+    #   It can take twice a long to retrieve full summary information.
+    # @return [Array[Vulnerability|VulnerabilitySummary]] Collection of all known vulnerabilities.
+    #
+    def vuln_listing(full = false)
+      xml = make_xml('VulnerabilityListingRequest')
+      # TODO Add a flag to do stream parsing of the XML to improve performance.
+      response = execute(xml, '1.2')
+      vulns = []
+      if response.success
+        response.res.elements.each('VulnerabilityListingResponse/VulnerabilitySummary') do |vuln|
+          if full
+            vulns << VulnerabilitySummary::parse(vuln)
+          else
+            vulns << Vulnerability.new(vuln.attributes['id'],
+                                       vuln.attributes['title'],
+                                       vuln.attributes['severity'].to_i)
+          end
+        end
+      end
+      vulns
+    end
+
+    alias_method :vulns, :vuln_listing
+
+    # Retrieve details for a vulnerability.
+    #
+    # @param [String] vuln_id Nexpose vulnerability ID, such as 'windows-duqu-cve-2011-3402'.
+    # @return [VulnerabilityDetail] Details of the requested vulnerability.
+    #
+    def vuln_details(vuln_id)
+      xml = make_xml('VulnerabilityDetailsRequest', {'vuln-id' => vuln_id})
+      response = execute(xml, '1.2')
+      if response.success
+        response.res.elements.each('VulnerabilityDetailsResponse/Vulnerability') do |vuln|
+          return VulnerabilityDetail::parse(vuln)
+        end
+      end
+    end
+  end
+
+  # Basic vulnerability information. Only includes id, title, and severity.
+  #
+  class Vulnerability
+
+    # The unique ID string for this vulnerability
+    attr_reader :id
+
+    # The title of this vulnerability
+    attr_reader :title
+
+    # How critical the vulnerability is on a scale of 1 to 10.
+    attr_reader :severity
+
+    def initialize(id, title, severity)
+      @id, @title, @severity = id, title, severity
+    end
+  end
+
+  # Summary of a vulnerability.
+  #
+  class VulnerabilitySummary < Vulnerability
+
+    # PCI severity value for the vulnerability on a scale of 1 to 5. 
+    attr_accessor :pci_severity
+
+    # Whether all checks for the vulnerability are safe.
+    # Unsafe checks may cause denial of service or otherwise disrupt system performance.
+    attr_accessor :safe
+
+    # A vulnerability is considered “credentialed” when all of its checks
+    # require credentials or if the check depends on previous authentication
+    # during a scan.
+    attr_accessor :credentials
+
+    # When this vulnerability was first included in the application.
+    attr_accessor :added
+
+    # The last date the vulnerability was modified.
+    attr_accessor :modified
+
+    # The date when the information about the vulnerability was first released.
+    attr_accessor :published
+
+    # How the vulnerability is exploited according to PCI standards.
+    attr_accessor :cvss_vector
+
+    # The computation of the Common Vulnerability Scoring System indicating
+    # compliance with PCI standards on a scale from 0 to 10.0.
+    attr_accessor :cvss_score
+
+    def self.parse_attributes(xml)
+      vuln = new(xml.attributes['id'],
+                 xml.attributes['title'],
+                 xml.attributes['severity'].to_i)
+
+      vuln.pci_severity = xml.attributes['pciSeverity'].to_i
+      vuln.safe = xml.attributes['safe'] == 'true'  # or xml.attributes['safe'] == '1'
+      vuln.added = Date::parse(xml.attributes['added'])
+      vuln.modified = Date::parse(xml.attributes['modified'])
+      vuln.credentials = xml.attributes['requiresCredentials'] == 'true'
+
+      # These three fields are optional in the XSD.
+      vuln.published = Date::parse(xml.attributes['published']) if xml.attributes['published']
+      vuln.cvss_vector = xml.attributes['cvssVector'] if xml.attributes['cvssVector']
+      vuln.cvss_score = xml.attributes['cvssScore'].to_f if xml.attributes['cvssScore']
+      vuln
+    end
+
+    def self.parse(xml)
+      parse_attributes(xml)
+    end
+  end
+
+  # Details for a vulnerability.
+  #
+  class VulnerabilityDetail < VulnerabilitySummary
+
+    # The HTML Description of this vulnerability.
+    attr_accessor :description
+
+    # External References for this vulnerability.
+    # Array containing (Reference)
+    attr_accessor :references
+
+    # The HTML Solution for this vulnerability.
+    attr_accessor :solution
+
+    def initialize(id, title, severity)
+      @id, @title, @severity = id, title, severity
+      @references = []
+    end
+
+    def self.parse(xml)
+      vuln = parse_attributes(xml)
+
+      vuln.description = REXML::XPath.first(xml, 'description').text
+      vuln.solution = REXML::XPath.first(xml, 'solution').text
+
+      xml.elements.each('references/reference') do |ref|
+        vuln.references << Reference.new(ref.attributes['source'], ref.text)
+      end
+      vuln
+    end
+  end
+
+  # Reference information for a Vulnerability.
+  #
+  class Reference
+
+    attr_reader :source
+    attr_reader :reference
+
+    def initialize(source, reference)
+      @source = source
+      @reference = reference
+    end
+  end
+
   module NexposeAPI
     include XMLUtils
 
@@ -13,7 +178,7 @@ module Nexpose
     # @param status - (optional) The status of the vulnerability exception:
     # "Under Review", "Approved", "Rejected"
     #-----------------------------------------------------------------------
-    def vuln_listing(status = nil)
+    def vuln_exception_listing(status = nil)
       option = {}
 
       if status && !status.empty?
@@ -328,182 +493,4 @@ module Nexpose
       r.success
     end
   end
-
-  # === Description
-  # Object that represents a listing of all of the vulnerabilities in the vulnerability database
-  #
-  class VulnerabilityListing
-    # true if an error condition exists; false otherwise
-    attr_reader :error
-    # Error message string
-    attr_reader :error_msg
-    # The NSC Connection associated with this object
-    attr_reader :connection
-    # Array containing (VulnerabilitySummary*)
-    attr_reader :vulnerability_summaries
-    # The number of vulnerability definitions
-    attr_reader :vulnerability_count
-
-    # Constructor
-    # VulnerabilityListing(connection)
-    def initialize(connection)
-      @error = false
-      @vulnerability_summaries = []
-      @connection = connection
-
-      r = @connection.execute('<VulnerabilityListingRequest session-id="' + @connection.session_id + '"/>')
-
-      if r.success
-        r.res.elements.each('VulnerabilityListingResponse/VulnerabilitySummary') do |v|
-          @vulnerability_summaries.push(VulnerabilitySummary.new(v.attributes['id'], v.attributes['title'], v.attributes['severity']))
-        end
-      else
-        @error = true
-        @error_msg = 'VulnerabilitySummary Parse Error'
-      end
-      @vulnerability_count = @vulnerability_summaries.length
-    end
-  end
-
-  # === Description
-  # Object that represents the summary of an entry in the vulnerability database
-  #
-  class VulnerabilitySummary
-
-    # The unique ID string for this vulnerability
-    attr_reader :id
-    # The title of this vulnerability
-    attr_reader :title
-    # The severity of this vulnerability (1 – 10)
-    attr_reader :severity
-
-    # Constructor
-    # VulnerabilitySummary(id, title, severity)
-    def initialize(id, title, severity)
-      @id = id
-      @title = title
-      @severity = severity
-
-    end
-
-  end
-
-  # === Description
-  # Object that represents the details for an entry in the vulnerability database
-  #
-  class VulnerabilityDetail
-    # true if an error condition exists; false otherwise
-    attr_reader :error
-    # Error message string
-    attr_reader :error_msg
-    # The NSC Connection associated with this object
-    attr_reader :connection
-    # The unique ID string for this vulnerability
-    attr_reader :id
-    # The title of this vulnerability
-    attr_reader :title
-    # The severity of this vulnerability (1 – 10)
-    attr_reader :severity
-    # The pciSeverity of this vulnerability
-    attr_reader :pciSeverity
-    # The CVSS score of this vulnerability
-    attr_reader :cvssScore
-    # The CVSS vector of this vulnerability
-    attr_reader :cvssVector
-    # The date this vulnerability was published
-    attr_reader :published
-    # The date this vulnerability was added to Nexpose
-    attr_reader :added
-    # The last date this vulnerability was modified
-    attr_reader :modified
-    # The HTML Description of this vulnerability
-    attr_reader :description
-    # External References for this vulnerability
-    # Array containing (Reference)
-    attr_reader :references
-    # The HTML Solution for this vulnerability
-    attr_reader :solution
-
-    # Constructor
-    # VulnerabilityListing(connection,id)
-    def initialize(connection, id)
-
-      @error = false
-      @connection = connection
-      @id = id
-      @references = []
-
-      r = @connection.execute('<VulnerabilityDetailsRequest session-id="' + @connection.session_id + '" vuln-id="' + @id + '"/>')
-
-      if r.success
-        r.res.elements.each('VulnerabilityDetailsResponse/Vulnerability') do |v|
-          @id = v.attributes['id']
-          @title = v.attributes['title']
-          @severity = v.attributes['severity']
-          @pciSeverity = v.attributes['pciSeverity']
-          @cvssScore = v.attributes['cvssScore']
-          @cvssVector = v.attributes['cvssVector']
-          @published = v.attributes['published']
-          @added = v.attributes['added']
-          @modified = v.attributes['modified']
-
-          v.elements.each('description') do |desc|
-            @description = desc.to_s.gsub(/\<\/?description\>/i, '')
-          end
-
-          v.elements.each('solution') do |sol|
-            @solution = sol.to_s.gsub(/\<\/?solution\>/i, '')
-          end
-
-          v.elements.each('references/reference') do |ref|
-            @references.push(Reference.new(ref.attributes['source'], ref.text))
-          end
-        end
-      else
-        @error = true
-        @error_msg = 'VulnerabilitySummary Parse Error'
-      end
-
-    end
-  end
-
-  # === Description
-  #
-  class Reference
-
-    attr_reader :source
-    attr_reader :reference
-
-    def initialize(source, reference)
-      @source = source
-      @reference = reference
-    end
-  end
-
-  # TODO: review
-  # === Description
-  #
-  class VulnFilter
-
-    attr_reader :typeMask
-    attr_reader :maxAlerts
-    attr_reader :severityThreshold
-
-    def initialize(type_mask, severity_threshold, max_alerts = -1)
-      @typeMask = type_mask
-      @maxAlerts = max_alerts
-      @severityThreshold = severity_threshold
-    end
-
-    include Sanitize
-
-    def to_xml
-      xml = '<vuln_filter '
-      xml << %Q{ type_mask="#{replace_entities(typeMask)}"}
-      xml << %Q{ maxAlerts="#{replace_entities(maxAlerts)}"}
-      xml << %Q{ severity_threshold="#{replace_entities(severityThreshold)}"}
-      xml << '/>'
-      xml
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.32
+        version: 0.0.68
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.32
+        version: 0.0.68
 - !ruby/object:Gem::Dependency
   name: rex
   requirement: !ruby/object:Gem::Requirement