nexpose 4.0.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb24477fcce2011e0280d8fe44a89b69650d519
-  data.tar.gz: 71184beb0d88f81a577b55b42494d39fc336668f
+  metadata.gz: 4b36711705abe08891f4b9a2a91e2661b660f589
+  data.tar.gz: b23983acf0e13451dd48f2028decf89b5363c439
 SHA512:
-  metadata.gz: 10f6fc4cf712638978d5bb37a79175598a016d3292d9c94c3071c4ea4456c5c1a82f3cb28f9a34e30f608a9be3f79e4c3d3a0167f0e527dab8d29787f1543878
-  data.tar.gz: 8c451a39c54f5633298b2c3a087f0a5bd305bf161e5bc95f14c596a093ed56c7e070cb7e62b520826af42c0434ff385421f26a7bc4755224e1189df7ee45ff25
+  metadata.gz: 6918bea23f955aa033e9e61cd9249da0257daf89a422dbd714d63906e595a89ed60607067ab074b66a500946e3b3b73d6410186bc4570e5140c910b2941c14f5
+  data.tar.gz: a47dca8c883ae9a5319f6d54d59ab3179e7d94562e7f962c07f33050f872b5c0dfa2ff5c041d411301e6ac199053ac43ed5d2d881cc7d12948937fe71297bb64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (3.3.1)
+    nexpose (5.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    multi_json (1.11.0)
+    multi_json (1.10.1)
     parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.0)
@@ -25,7 +25,7 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.1)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -64,3 +64,6 @@ DEPENDENCIES
   simplecov (~> 0.9.1)
   vcr (~> 2.9.3)
   webmock (~> 1.20.4)
+
+BUNDLED WITH
+   1.12.2

data/lib/nexpose/blackout.rb

@@ -8,7 +8,8 @@ module Nexpose
     attr_accessor :blackout_type
     # The repeat interval based upon type.
     attr_accessor :blackout_interval
-    # The earliest date to generate the report on (in ISO 8601 format).
+    # Starting time of the blackout (in unix epoch with milliseconds. Example: 1464956590000)
+    # The timezone is the timezone of the console. If the console timezone is not supported it defaults to utc.
     attr_accessor :blackout_start
     # The amount of time, in minutes, a blackout period should last.
     attr_accessor :blackout_duration

data/lib/nexpose/common.rb

@@ -25,20 +25,26 @@ module Nexpose
   # non-members.
   class Email
     # Send as file attachment or zipped file to individuals who are not members
-    # of the report access list. One of: file|zip
+    # of the report access list.
+    # [String] Attachment format, 'file' | 'zip'.
     attr_accessor :send_as
     # Send to all the authorized users of sites, groups, and assets.
+    # [Fixnum] 1 | 0
     attr_accessor :to_all_authorized
     # Send to users on the report access list.
+    # [String] Attachment format 'file' | 'zip'
     attr_accessor :send_to_acl_as
-    # Format to send to users on the report access list. One of: file|zip|url
+    # Format to send to users on the report access list.
+    # [String] Attachment format 'file' | 'zip' | 'url'
     attr_accessor :send_to_owner_as
-
     # Sender that e-mail will be attributed to.
+    # [String] an email address
     attr_accessor :sender
     # SMTP relay server.
+    # [String] the IP address, host name or FQDN of the SMTP server.
     attr_accessor :smtp_relay_server
-    # Array of report recipients (i.e., not already on the report access list).
+    # Recipients will be in form of email address.
+    # [Array<String>] E-mail addresses of additional report recipients (i.e., not already on the report access list).
     attr_accessor :recipients
 
     def initialize(to_all_authorized, send_to_owner_as, send_to_acl_as, send_as)
@@ -135,17 +141,12 @@ module Nexpose
     attr_accessor :type
     # The repeat interval based upon type.
     attr_accessor :interval
-    # The earliest date to generate the report on (in ISO 8601 format).
+    # Starting time of the scheduled scan (in ISO 8601 format).
     attr_accessor :start
-
     # The amount of time, in minutes, to allow execution before stopping.
     attr_accessor :max_duration
     # The date after which the schedule is disabled, in ISO 8601 format.
     attr_accessor :not_valid_after
-
-    # TODO: Remove this unused attribute
-    attr_accessor :incremental
-
     # Extended attributes added with the new scheduler implementation
     attr_accessor :is_extended
     attr_accessor :hour
@@ -154,12 +155,18 @@ module Nexpose
     attr_accessor :day
     attr_accessor :occurrence
     attr_accessor :start_month
+    # Timezone in which start time run. If not set will default to console timezone.
+    # If console timezone is not supported it defaults to utc.
     attr_accessor :timezone
     attr_accessor :next_run_time
-
     # scan-schedule attributes
     attr_accessor :repeater_type
+    # Scan template to use when starting a scan job.
     attr_accessor :scan_template_id
+    # Starting time of the scheduled scan (in ISO 8601 format). Relative to the console timezone
+    attr_accessor :console_start
+    # The timezone of the console.
+    attr_accessor :console_timezone
 
     # @param [Time] start
     def initialize(type, interval, start, enabled = true, scan_template_id = nil)
@@ -186,6 +193,8 @@ module Nexpose
       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]
@@ -247,7 +256,6 @@ module Nexpose
       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['incremental'] = @incremental ? 1 : 0 if @incremental
       xml.attributes['repeaterType'] = @repeater_type if @repeater_type
       xml.attributes['is_extended'] = @is_extended if @is_extended
       xml.attributes['hour'] = @hour if @hour
@@ -274,7 +282,6 @@ module Nexpose
       # 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.incremental = (xml.attributes['incremental'] && xml.attributes['incremental'] == '1')
       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']

data/lib/nexpose/maint.rb

@@ -26,7 +26,7 @@ module Nexpose
                      'cmd' => 'backup',
                      'platform_independent' => platform_independent,
                      'targetTask' => 'backupRestore' }
-      xml = AJAX.form_post(self, '/data/maintenance/command', parameters)
+      xml = AJAX.form_post(self, '/admin/global/maintenance/maintCmd.txml', parameters)
       if !!(xml =~ /succeded="true"/)
         _maintenance_restart
       end
@@ -51,7 +51,7 @@ module Nexpose
       parameters['cleanup'] = 1 if clean_up
       parameters['compress'] = 1 if compress
       parameters['reindex'] = 1 if reindex
-      xml = AJAX.form_post(self, '/data/maintenance/command', parameters)
+      xml = AJAX.form_post(self, '/admin/global/maintenance/maintCmd.txml', parameters)
       if !!(xml =~ /succeded="true"/)
         _maintenance_restart
       end
@@ -61,7 +61,7 @@ module Nexpose
       parameters = { 'cancelAllTasks' => false,
                      'cmd' => 'restartServer',
                      'targetTask' => 'maintModeHandler' }
-      xml = AJAX.form_post(self, '/data/maintenanceMode/command', parameters)
+      xml = AJAX.form_post(self, '/admin/global/maintenance/maintCmd.txml', parameters)
       !!(xml =~ /succeded="true"/)
     end
   end
@@ -103,7 +103,7 @@ module Nexpose
       parameters = { 'backupid' => @name,
                      'cmd' => 'restore',
                      'targetTask' => 'backupRestore' }
-      xml = AJAX.form_post(nsc, '/data/maintenance/command', parameters)
+      xml = AJAX.form_post(nsc, '/admin/global/maintenance/maintCmd.txml', parameters)
       if !!(xml =~ /succeded="true"/)
         nsc._maintenance_restart
       end
@@ -118,7 +118,7 @@ module Nexpose
       parameters = { 'backupid' => @name,
                      'cmd' => 'deleteBackup',
                      'targetTask' => 'backupRestore' }
-      xml = AJAX.form_post(nsc, '/data/maintenance/command', parameters)
+      xml = AJAX.form_post(nsc, '/admin/global/maintenance/maintCmd.txml', parameters)
       !!(xml =~ /succeded="true"/)
     end
 

data/lib/nexpose/scheduled_backup.rb

@@ -10,7 +10,7 @@ module Nexpose
     attr_accessor :schedule_type
     # The repeat interval based upon type.
     attr_accessor :schedule_interval
-    # The earliest date to generate the report on (in ISO 8601 format).
+    # Starting time of the backup task (in unix epoch with milliseconds. Example: 1464956590000)
     attr_accessor :schedule_start
     # The description of the backup. Defaults to nil if not set
     attr_accessor :description

data/lib/nexpose/scheduled_maintenance.rb

@@ -10,7 +10,7 @@ module Nexpose
     attr_accessor :schedule_type
     # The repeat interval based upon type.
     attr_accessor :schedule_interval
-    # The earliest date to generate the report on (in ISO 8601 format).
+    # Starting time of the maintenance task (in unix epoch with milliseconds. Example: 1464956590000)
     attr_accessor :schedule_start
     # Whether the reindex task should run. Defaults to true if not set
     attr_accessor :reindex

data/lib/nexpose/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 5.0.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,9 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby API for Rapid7 Nexpose
 test_files: []
-has_rdoc: