nexpose 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca766c3f916f94c4d47c1a8455c573d2fa760e0
-  data.tar.gz: 5a56a358b2bd3a46c7cb76424828c9005eb813eb
+  metadata.gz: 89a7f9d4854b3ac3826f56995370a1d38d0514be
+  data.tar.gz: 4b5a6783ca354eae0b694f970963c5eb44cf3de3
 SHA512:
-  metadata.gz: dfd02ba83e4d68e6503747abb684ce1a25137075786317d3a138c5e82379ed069dccb6bb44f42f51fbcb9e827b23431bbf24f1e504c5c8ab3a2eef18e0400df2
-  data.tar.gz: '08d3540ddf9ebc5af5205e986f5226888f26436164e7aae0c511a18765d62142c789f80c9b2c6807523cf39974c6767d7186bae828fb8d48ee7ac683779493a5'
+  metadata.gz: 2faafc134faf7d0cd56ddf94a1119f6093e078c46164066f54ebafe1f13763be044c2c09930bc8adb7ebb93073c32c928fe09fc9c47042939960f8766675bda7
+  data.tar.gz: 30683f228a157c4c5c34ea74c78b991e69cc6d0ef6749299083c9e2b4e2b92df8dbfb3d8dcc535d31d41a9403ae2b31556009697adaa2378201642a2bddc53f6

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Change Log
 
-## [Unreleased](https://github.com/rapid7/nexpose-client/tree/HEAD)
-
-[Full Changelog](https://github.com/rapid7/nexpose-client/compare/v6.1.1...HEAD)
+## [v7.0.0](https://github.com/rapid7/nexpose-client/tree/v7.0.0) (2017-08-31)
+[Full Changelog](https://github.com/rapid7/nexpose-client/compare/v6.1.1...v7.0.0)
 
 **Fixed bugs:**
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (7.0.0)
+    nexpose (7.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/nexpose/ajax.rb

@@ -15,7 +15,7 @@ module Nexpose
     # Content type strings acceptect by Nexpose.
     #
     module CONTENT_TYPE
-      XML = 'text/xml; charset=UTF-8'
+      XML  = 'text/xml; charset=UTF-8'
       JSON = 'application/json; charset-utf-8'
       FORM = 'application/x-www-form-urlencoded; charset=UTF-8'
     end
@@ -192,8 +192,8 @@ module Nexpose
     # Get an error message from the response body if the request url api version
     # is 2.1 or greater otherwise use the request body
     def get_error_message(request, response)
-      version = get_request_api_version(request)
-      data_request = use_response_error_message?(request, response)
+      version         = get_request_api_version(request)
+      data_request    = use_response_error_message?(request, response)
       return_response = (version >= 2.1 || data_request)
       (return_response && response.body) ? "response body: #{response.body}" : "request body: #{request.body}"
     end
@@ -220,12 +220,10 @@ module Nexpose
     # @param [String] pref Preference key value to preserve.
     #
     def preserving_preference(nsc, pref)
-      begin
-        orig = get_rows(nsc, pref)
-        yield
-      ensure
-        set_rows(nsc, pref, orig)
-      end
+      orig = get_rows(nsc, pref)
+      yield
+    ensure
+      set_rows(nsc, pref, orig)
     end
 
     # Get a valid row preference value.
@@ -251,10 +249,10 @@ module Nexpose
     end
 
     def get_rows(nsc, pref)
-      uri = '/data/user/preferences/all'
+      uri      = '/data/user/preferences/all'
       pref_key = "#{pref}.rows"
-      resp = get(nsc, uri)
-      json = JSON.parse(resp)
+      resp     = get(nsc, uri)
+      json     = JSON.parse(resp)
       if json.key?(pref_key)
         rows = json[pref_key].to_i
         rows > 0 ? rows : 10
@@ -264,10 +262,8 @@ module Nexpose
     end
 
     def set_rows(nsc, pref, value)
-      uri = '/data/user/preference'
-      params = { 'name'  => "#{pref}.rows",
-                 'value' => value }
-
+      uri    = '/data/user/preference'
+      params = { 'name' => "#{pref}.rows", 'value' => value }
       form_post(nsc, uri, params)
     end
 

data/lib/nexpose/alert.rb

@@ -76,7 +76,7 @@ module Nexpose
 
     # load a particular site alert
     def self.load(nsc, site_id, alert_id)
-      uri = "/api/2.1/site_configurations/#{site_id}/alerts/#{alert_id}"
+      uri  = "/api/2.1/site_configurations/#{site_id}/alerts/#{alert_id}"
       resp = AJAX.get(nsc, uri, AJAX::CONTENT_TYPE::JSON)
 
       unless resp.to_s == ''
@@ -92,7 +92,7 @@ module Nexpose
 
     # load a list of alerts for a given site
     def self.list_alerts(nsc, site_id)
-      uri = "/api/2.1/site_configurations/#{site_id}/alerts"
+      uri  = "/api/2.1/site_configurations/#{site_id}/alerts"
       resp = AJAX.get(nsc, uri, AJAX::CONTENT_TYPE::JSON)
       data = JSON.parse(resp, symbolize_names: true)
       load_alerts(data) unless data.nil?
@@ -120,7 +120,7 @@ module Nexpose
     def save(nsc, site_id)
       validate
       uri = "/api/2.1/site_configurations/#{site_id}/alerts"
-      id = AJAX.put(nsc, uri, self.to_json, AJAX::CONTENT_TYPE::JSON)
+      id  = AJAX.put(nsc, uri, self.to_json, AJAX::CONTENT_TYPE::JSON)
       @id = id.to_i
     end
 
@@ -130,12 +130,10 @@ module Nexpose
       raise ArgumentError.new('Vuln filter is a required attribute.') unless @vuln_filter
     end
 
-    private
-
     def self.create(hash)
       alert_type = hash[:alert_type]
       raise 'An alert must have an alert type' if alert_type.nil?
-      raise 'Alert name cannot be empty.' if !hash.has_key?(:name) || hash[:name].to_s == ''
+      raise 'Alert name cannot be empty.' if !hash.key?(:name) || hash[:name].to_s == ''
       raise 'SNMP and Syslog alerts must have a server defined' if ['SNMP', 'Syslog'].include?(alert_type) && hash[:server].to_s == ''
 
       case alert_type
@@ -174,22 +172,23 @@ module Nexpose
     attr_accessor :recipients, :sender, :verbose
 
     def initialize(name, sender, server, recipients, enabled = 1, max_alerts = -1, verbose = 0)
-      unless recipients.is_a?(Array) && recipients.length > 0
+      unless recipients.is_a?(Array) && !recipients.empty?
         raise 'An SMTP alert must contain an array of recipient emails with at least 1 recipient'
       end
-      recipients.each do |recipient| 
+
+      recipients.each do |recipient|
         unless recipient =~ /^.+@.+\..+$/
           raise "Recipients must contain valid emails, #{recipient} has an invalid format"
         end
       end
 
       @alert_type = 'SMTP'
-      @name = name
-      @enabled = enabled
+      @name       = name
+      @enabled    = enabled
       @max_alerts = max_alerts
-      @sender = sender
-      @server = server
-      @verbose = verbose
+      @sender     = sender
+      @server     = server
+      @verbose    = verbose
       @recipients = recipients.nil? ? [] : recipients
     end
 
@@ -209,13 +208,12 @@ module Nexpose
 
     def initialize(name, community, server, enabled = 1, max_alerts = -1)
       raise 'SNMP alerts must have a community defined.' if community.nil?
-
       @alert_type = 'SNMP'
-      @name = name
-      @enabled = enabled
+      @name       = name
+      @enabled    = enabled
       @max_alerts = max_alerts
-      @community = community
-      @server = server
+      @community  = community
+      @server     = server
     end
   end
 
@@ -225,10 +223,11 @@ module Nexpose
 
     def initialize(name, server, enabled = 1, max_alerts = -1)
       @alert_type = 'Syslog'
-      @name = name
-      @enabled = enabled
+      @name       = name
+      @enabled    = enabled
       @max_alerts = max_alerts
-      @server = server
+      @server     = server
     end
   end
+
 end

data/lib/nexpose/api.rb

@@ -22,7 +22,7 @@ module Nexpose
     #
     def object_from_hash(nsc, hash)
       hash.each do |k, v|
-        next if k == :url  # Do not store self-referential URL.
+        next if k == :url # Do not store self-referential URL.
         # Store resource URLs separately and create lazy accessors.
         if v.is_a?(Hash) && v.key?(:url)
           self.class.send(:define_method, k, proc { |conn = nsc| load_resource(conn, k, v[:url].gsub(/.*\/api/, '/api')) })
@@ -52,7 +52,7 @@ module Nexpose
     # @return [Array[?]] Collection of "k" marshalled object.
     #
     def load_resource(nsc, k, url)
-      obj = class_from_string(k)
+      obj  = class_from_string(k)
       resp = AJAX.get(nsc, url, AJAX::CONTENT_TYPE::JSON)
       hash = JSON.parse(resp, symbolize_names: true)
       if hash.is_a?(Array)
@@ -85,7 +85,6 @@ module Nexpose
 
   module TypedAccessor
     def typed_accessor(name, type)
-
       # here we dynamically define accessor methods
       define_method(name) do
         instance_variable_get("@#{name}")
@@ -100,4 +99,5 @@ module Nexpose
       end
     end
   end
+
 end

data/lib/nexpose/asset.rb

@@ -42,7 +42,7 @@ module Nexpose
     attr_accessor :unique_identifiers
 
     def initialize
-      @addresses = []
+      @addresses  = []
       @host_names = []
     end
 
@@ -53,7 +53,7 @@ module Nexpose
     # @return [Asset] The requested asset, if found.
     #
     def self.load(nsc, id)
-      uri = "/api/2.1/assets/#{id}"
+      uri  = "/api/2.1/assets/#{id}"
       resp = AJAX.get(nsc, uri, AJAX::CONTENT_TYPE::JSON)
       hash = JSON.parse(resp, symbolize_names: true)
       new.object_from_hash(nsc, hash)
@@ -97,9 +97,9 @@ module Nexpose
 
     def <=>(other)
       c = port <=> other.port
-      return c unless c == 0
+      return c unless c.zero?
       c = protocol <=> other.protocol
-      return c unless c == 0
+      return c unless c.zero?
       name <=> other.name
     end
 
@@ -114,27 +114,27 @@ module Nexpose
     # Valid protocol values for a service endpoint.
     module Protocol
       # Internet Protocol
-      IP = 'IP'
+      IP   = 'IP'
       # Internet Control Message Protocol
       ICMP = 'ICMP'
       # Internet Group Management Protocol
       IGMP = 'IGMP'
       # Gateway-to-Gateway Protocol
-      GGP = 'GGP'
+      GGP  = 'GGP'
       # Transmission Control Protocol
-      TCP = 'TCP'
+      TCP  = 'TCP'
       # PARC Universal Protocol
-      PUP = 'PUP'
+      PUP  = 'PUP'
       # User Datagram Protocol
-      UDP = 'UDP'
+      UDP  = 'UDP'
       # Internet Datagram Protocol
-      IDP = 'IDP'
+      IDP  = 'IDP'
       # Encapsulating Security Payload
-      ESP = 'ESP'
+      ESP  = 'ESP'
       # Network Disk Protocol
-      ND = 'ND'
+      ND   = 'ND'
       # Raw Packet (or unknown)
-      RAW = 'RAW'
+      RAW  = 'RAW'
     end
   end
 
@@ -163,11 +163,11 @@ module Nexpose
 
     def <=>(other)
       c = name <=> other.name
-      return c unless c == 0
+      return c unless c.zero?
       c = id <=> other.id
-      return c unless c == 0
+      return c unless c.zero?
       c = full_name <=> other.full_name
-      return c unless c == 0
+      return c unless c.zero?
       attributes <=> other.attributes
     end
 
@@ -204,9 +204,9 @@ module Nexpose
 
     def <=>(other)
       c = name <=> other.name
-      return c unless c == 0
+      return c unless c.zero?
       c = id <=> other.id
-      return c unless c == 0
+      return c unless c.zero?
       attributes <=> other.attributes
     end
 
@@ -248,11 +248,11 @@ module Nexpose
 
     def <=>(other)
       c = name <=> other.name
-      return c unless c == 0
+      return c unless c.zero?
       c = size <=> other.size
-      return c unless c == 0
+      return c unless c.zero?
       c = directory <=> other.directory
-      return c unless c == 0
+      return c unless c.zero?
       attributes <=> other.attributes
     end
 
@@ -274,7 +274,7 @@ module Nexpose
     attr_reader :id
 
     def initialize(source = nil, id = nil)
-      @id = id
+      @id     = id
       @source = source
     end
 
@@ -285,7 +285,7 @@ module Nexpose
 
     def <=>(other)
       c = source <=> other.source
-      return c unless c == 0
+      return c unless c.zero?
       id <=> other.id
     end
 

data/lib/nexpose/blackout.rb

@@ -1,6 +1,6 @@
 module Nexpose
-# Constants useful across the Nexpose module.
-# Configuration structure for blackouts.
+  # Constants useful across the Nexpose module.
+  # Configuration structure for blackouts.
   class Blackout < APIObject
     # Whether or not this blackout is enabled.
     attr_accessor :enabled
@@ -14,7 +14,7 @@ module Nexpose
     # The amount of time, in minutes, a blackout period should last.
     attr_accessor :blackout_duration
 
-    def initialize(start, enabled=true, duration, type, interval)
+    def initialize(start, enabled = true, duration, type, interval)
       @blackout_start    = start
       @enabled           = enabled
       @blackout_duration = duration.to_i
@@ -24,7 +24,6 @@ module Nexpose
 
     def self.from_hash(hash)
       repeat_blackout_hash = hash[:repeat_blackout]
-
       if repeat_blackout_hash.nil?
         type     = 'daily'
         interval = 0
@@ -32,22 +31,15 @@ module Nexpose
         type     = repeat_blackout_hash[:type]
         interval = repeat_blackout_hash[:interval]
       end
-
       new(hash[:start_date], hash[:enabled], hash[:blackout_duration], type, interval)
     end
 
     def to_h
-      blackout_hash = {
-          start_date: @blackout_start,
-          enabled: @enabled,
-          blackout_duration: @blackout_duration,
-      }
-      repeat_hash= {
-          type: @blackout_type,
-          interval: @blackout_interval
-      }
+      blackout_hash = { start_date: @blackout_start, enabled: @enabled, blackout_duration: @blackout_duration }
+      repeat_hash   = { type: @blackout_type, interval: @blackout_interval }
       blackout_hash[:repeat_blackout] = repeat_hash
       blackout_hash
     end
   end
+
 end

data/lib/nexpose/common.rb

@@ -2,7 +2,7 @@ module Nexpose
   # Constants useful across the Nexpose module.
   module Scope
     GLOBAL = 'global'
-    SILO = 'silo'
+    SILO   = 'silo'
   end
 
   # Configuration structure for e-mail notification.
@@ -49,11 +49,10 @@ module Nexpose
 
     def initialize(to_all_authorized, send_to_owner_as, send_to_acl_as, send_as)
       @to_all_authorized = to_all_authorized
-      @send_to_owner_as = send_to_owner_as
-      @send_to_acl_as = send_to_acl_as
-      @send_as = send_as
-
-      @recipients = []
+      @send_to_owner_as  = send_to_owner_as
+      @send_to_acl_as    = send_to_acl_as
+      @send_as           = send_as
+      @recipients        = []
     end
 
     def to_xml
@@ -116,9 +115,9 @@ module Nexpose
 
     def as_xml
       xml = REXML::Element.new('AdHocSchedule')
-      xml.attributes['start'] = @start
+      xml.attributes['start']       = @start
       xml.attributes['maxDuration'] = @max_duration if @max_duration
-      xml.attributes['template'] = @scan_template_id
+      xml.attributes['template']    = @scan_template_id
       xml
     end
 
@@ -170,10 +169,10 @@ module Nexpose
 
     # @param [Time] start
     def initialize(type, interval, start, enabled = true, scan_template_id = nil)
-      @type = type
-      @interval = interval
-      @start = start
-      @enabled = enabled
+      @type             = type
+      @interval         = interval
+      @start            = start
+      @enabled          = enabled
       @scan_template_id = scan_template_id
     end
 
@@ -186,29 +185,28 @@ module Nexpose
       else
         schedule = new(repeat_scan_hash[:type], repeat_scan_hash[:interval], start)
       end
-      schedule.enabled = hash[:enabled].nil? ? true : hash[:enabled]
+      schedule.enabled          = hash[:enabled].nil? ? true : hash[:enabled]
       schedule.scan_template_id = hash[:scan_template_id]
-      schedule.start = Nexpose::ISO8601.to_time(hash[:start_date]) if hash[:start_date]
-      schedule.max_duration = hash[:maximum_scan_duration] if hash[:maximum_scan_duration]
-      schedule.not_valid_after = Nexpose::ISO8601.to_time(hash[:not_valid_after_date]) if hash[:not_valid_after_date]
-      schedule.timezone = hash[:time_zone] if hash[:time_zone]
-      schedule.next_run_time = hash[:next_run_time] if hash[:next_run_time]
-      schedule.console_start = Nexpose::ISO8601.to_time(hash[:console_start_date]) if hash[:console_start_date]
+      schedule.start            = Nexpose::ISO8601.to_time(hash[:start_date]) if hash[:start_date]
+      schedule.max_duration     = hash[:maximum_scan_duration] if hash[:maximum_scan_duration]
+      schedule.not_valid_after  = Nexpose::ISO8601.to_time(hash[:not_valid_after_date]) if hash[:not_valid_after_date]
+      schedule.timezone         = hash[:time_zone] if hash[:time_zone]
+      schedule.next_run_time    = hash[:next_run_time] if hash[:next_run_time]
+      schedule.console_start    = Nexpose::ISO8601.to_time(hash[:console_start_date]) if hash[:console_start_date]
       schedule.console_timezone = hash[:console_time_zone] if hash[:console_time_zone]
 
       unless repeat_scan_hash.nil?
-        schedule.type = repeat_scan_hash[:type]
-        schedule.interval = repeat_scan_hash[:interval]
+        schedule.type          = repeat_scan_hash[:type]
+        schedule.interval      = repeat_scan_hash[:interval]
         schedule.repeater_type = 'restart' if repeat_scan_hash[:on_repeat] == 'restart-scan'
         schedule.repeater_type = 'continue' if repeat_scan_hash[:on_repeat] == 'resume-scan'
-
-        schedule.is_extended = repeat_scan_hash[:is_extended] if repeat_scan_hash[:is_extended]
-        schedule.hour = repeat_scan_hash[:hour] if repeat_scan_hash[:hour]
-        schedule.minute = repeat_scan_hash[:minute] if repeat_scan_hash[:minute]
-        schedule.date = repeat_scan_hash[:date] if repeat_scan_hash[:date]
-        schedule.day = repeat_scan_hash[:day] if repeat_scan_hash[:day]
-        schedule.occurrence = repeat_scan_hash[:occurrence] if repeat_scan_hash[:occurrence]
-        schedule.start_month = repeat_scan_hash[:start_month] if repeat_scan_hash[:start_month]
+        schedule.is_extended   = repeat_scan_hash[:is_extended] if repeat_scan_hash[:is_extended]
+        schedule.hour          = repeat_scan_hash[:hour] if repeat_scan_hash[:hour]
+        schedule.minute        = repeat_scan_hash[:minute] if repeat_scan_hash[:minute]
+        schedule.date          = repeat_scan_hash[:date] if repeat_scan_hash[:date]
+        schedule.day           = repeat_scan_hash[:day] if repeat_scan_hash[:day]
+        schedule.occurrence    = repeat_scan_hash[:occurrence] if repeat_scan_hash[:occurrence]
+        schedule.start_month   = repeat_scan_hash[:start_month] if repeat_scan_hash[:start_month]
       end
 
       schedule
@@ -220,28 +218,26 @@ module Nexpose
         scan_template_id: @scan_template_id,
         maximum_scan_duration: @max_duration
       }
-      schedule_hash[:start_date] = Nexpose::ISO8601.to_string(@start) if @start
+      schedule_hash[:start_date]           = Nexpose::ISO8601.to_string(@start) if @start
       schedule_hash[:not_valid_after_date] = Nexpose::ISO8601.to_string(@not_valid_after) if @not_valid_after
-      schedule_hash[:time_zone] = @timezone if @timezone
+      schedule_hash[:time_zone]            = @timezone if @timezone
 
-      unless (@type.nil? || @interval == 0) && !@is_extended
+      unless (@type.nil? || @interval.to_i.zero?) && !@is_extended
         repeat_scan_hash = {
           type: @type,
           interval: @interval
         }
         repeat_scan_hash[:on_repeat] = 'restart-scan' if @repeater_type == 'restart'
         repeat_scan_hash[:on_repeat] = 'resume-scan' if @repeater_type == 'continue'
-
         if @is_extended
           repeat_scan_hash[:is_extended] = @is_extended
-          repeat_scan_hash[:hour] = @hour if @hour
-          repeat_scan_hash[:minute] = @minute if @minute
-          repeat_scan_hash[:date] = @date if @date
-          repeat_scan_hash[:day] = @day if @day
-          repeat_scan_hash[:occurrence] = @occurrence if @occurrence
+          repeat_scan_hash[:hour]        = @hour if @hour
+          repeat_scan_hash[:minute]      = @minute if @minute
+          repeat_scan_hash[:date]        = @date if @date
+          repeat_scan_hash[:day]         = @day if @day
+          repeat_scan_hash[:occurrence]  = @occurrence if @occurrence
           repeat_scan_hash[:start_month] = @start_month if @start_month
         end
-
         schedule_hash[:repeat_scan] = repeat_scan_hash
       end
 
@@ -250,22 +246,22 @@ module Nexpose
 
     def as_xml
       xml = REXML::Element.new('Schedule')
-      xml.attributes['enabled'] = @enabled ? 1 : 0
-      xml.attributes['type'] = @type
-      xml.attributes['interval'] = @interval
-      xml.attributes['start'] = @start if @start
-      xml.attributes['maxDuration'] = @max_duration if @max_duration
+      xml.attributes['enabled']       = @enabled ? 1 : 0
+      xml.attributes['type']          = @type
+      xml.attributes['interval']      = @interval
+      xml.attributes['start']         = @start if @start
+      xml.attributes['maxDuration']   = @max_duration if @max_duration
       xml.attributes['notValidAfter'] = @not_valid_after if @not_valid_after
-      xml.attributes['repeaterType'] = @repeater_type if @repeater_type
-      xml.attributes['is_extended'] = @is_extended if @is_extended
-      xml.attributes['hour'] = @hour if @hour
-      xml.attributes['minute'] = @minute if @minute
-      xml.attributes['date'] = @date if @date
-      xml.attributes['day'] = @day if @day
-      xml.attributes['occurrence'] = @occurrence if @occurrence
-      xml.attributes['start_month'] = @start_month if @start_month
-      xml.attributes['timezone'] = @timezone if @timezone
-      xml.attributes['template'] = @scan_template_id if @scan_template_id
+      xml.attributes['repeaterType']  = @repeater_type if @repeater_type
+      xml.attributes['is_extended']   = @is_extended if @is_extended
+      xml.attributes['hour']          = @hour if @hour
+      xml.attributes['minute']        = @minute if @minute
+      xml.attributes['date']          = @date if @date
+      xml.attributes['day']           = @day if @day
+      xml.attributes['occurrence']    = @occurrence if @occurrence
+      xml.attributes['start_month']   = @start_month if @start_month
+      xml.attributes['timezone']      = @timezone if @timezone
+      xml.attributes['template']      = @scan_template_id if @scan_template_id
       xml
     end
 
@@ -280,18 +276,18 @@ module Nexpose
                               xml.attributes['enabled'] != '0')
 
       # Optional parameters.
-      schedule.max_duration = xml.attributes['maxDuration'].to_i if xml.attributes['maxDuration']
-      schedule.not_valid_after = xml.attributes['notValidAfter'] if xml.attributes['notValidAfter']
-      schedule.repeater_type = xml.attributes['repeaterType'] if xml.attributes['repeaterType']
-      schedule.is_extended = xml.attributes['is_extended'] if xml.attributes['is_extended']
-      schedule.hour = xml.attributes['hour'] if xml.attributes['hour']
-      schedule.minute = xml.attributes['minute'] if xml.attributes['minute']
-      schedule.date = xml.attributes['date'] if xml.attributes['date']
-      schedule.day = xml.attributes['day'] if xml.attributes['day']
-      schedule.occurrence = xml.attributes['occurrence'] if xml.attributes['occurrence']
-      schedule.start_month = xml.attributes['start_month'] if xml.attributes['start_month']
-      schedule.timezone = xml.attributes['timezone'] if xml.attributes['timezone']
-      schedule.next_run_time = xml.attributes['next_run_time'] if xml.attributes['next_run_time']
+      schedule.max_duration     = xml.attributes['maxDuration'].to_i if xml.attributes['maxDuration']
+      schedule.not_valid_after  = xml.attributes['notValidAfter'] if xml.attributes['notValidAfter']
+      schedule.repeater_type    = xml.attributes['repeaterType'] if xml.attributes['repeaterType']
+      schedule.is_extended      = xml.attributes['is_extended'] if xml.attributes['is_extended']
+      schedule.hour             = xml.attributes['hour'] if xml.attributes['hour']
+      schedule.minute           = xml.attributes['minute'] if xml.attributes['minute']
+      schedule.date             = xml.attributes['date'] if xml.attributes['date']
+      schedule.day              = xml.attributes['day'] if xml.attributes['day']
+      schedule.occurrence       = xml.attributes['occurrence'] if xml.attributes['occurrence']
+      schedule.start_month      = xml.attributes['start_month'] if xml.attributes['start_month']
+      schedule.timezone         = xml.attributes['timezone'] if xml.attributes['timezone']
+      schedule.next_run_time    = xml.attributes['next_run_time'] if xml.attributes['next_run_time']
       schedule.scan_template_id = xml.attributes['template'] if xml.attributes['template']
       schedule
     end
@@ -300,11 +296,11 @@ module Nexpose
     # may be used to create a Schedule.
     #
     module Type
-      DAILY = 'daily'
-      HOURLY = 'hourly'
-      WEEKLY = 'weekly'
+      DAILY        = 'daily'
+      HOURLY       = 'hourly'
+      WEEKLY       = 'weekly'
       MONTHLY_DATE = 'monthly-date'
-      MONTHLY_DAY = 'monthly-day'
+      MONTHLY_DAY  = 'monthly-day'
     end
   end
 
@@ -337,40 +333,39 @@ module Nexpose
         state: state,
         city: city,
         zip: zip,
-        country: country
-      }
+        country: country }
     end
 
     # Create organization object from hash
     def self.create(hash)
       new do |org|
-        org.name = hash[:name]
-        org.url = hash[:url]
+        org.name            = hash[:name]
+        org.url             = hash[:url]
         org.primary_contact = hash[:primary_contact]
-        org.job_title = hash[:job_title]
-        org.email = hash[:email]
-        org.telephone = hash[:telephone]
-        org.address = hash[:address]
-        org.state = hash[:state]
-        org.city = hash[:city]
-        org.zip = hash[:zip]
-        org.country = hash[:country]
+        org.job_title       = hash[:job_title]
+        org.email           = hash[:email]
+        org.telephone       = hash[:telephone]
+        org.address         = hash[:address]
+        org.state           = hash[:state]
+        org.city            = hash[:city]
+        org.zip             = hash[:zip]
+        org.country         = hash[:country]
       end
     end
 
     def self.parse(xml)
       new do |org|
-        org.name = xml.attributes['name']
-        org.url = xml.attributes['url']
+        org.name            = xml.attributes['name']
+        org.url             = xml.attributes['url']
         org.primary_contact = xml.attributes['primaryContact']
-        org.job_title = xml.attributes['jobTitle']
-        org.email = xml.attributes['email']
-        org.telephone = xml.attributes['telephone']
-        org.address = xml.attributes['businessAddress']
-        org.state = xml.attributes['state']
-        org.city = xml.attributes['city']
-        org.zip = xml.attributes['zip']
-        org.country = xml.attributes['country']
+        org.job_title       = xml.attributes['jobTitle']
+        org.email           = xml.attributes['email']
+        org.telephone       = xml.attributes['telephone']
+        org.address         = xml.attributes['businessAddress']
+        org.state           = xml.attributes['state']
+        org.city            = xml.attributes['city']
+        org.zip             = xml.attributes['zip']
+        org.country         = xml.attributes['country']
       end
     end