nexpose 7.0.0 → 7.0.1

data/lib/nexpose/global_settings.rb

@@ -19,9 +19,8 @@ module Nexpose
     # Private constructor. See #load method for retrieving a settings object.
     #
     def initialize(xml)
-      @xml = xml
-
-      @asset_linking = parse_asset_linking_from_xml(xml)
+      @xml              = xml
+      @asset_linking    = parse_asset_linking_from_xml(xml)
       @asset_exclusions = HostOrIP.parse(xml)
       @control_scanning = parse_control_scanning_from_xml(xml)
     end

data/lib/nexpose/group.rb

@@ -10,11 +10,11 @@ module Nexpose
     # @return [Boolean] Whether group deletion succeeded.
     #
     def delete_asset_group(id)
-      r = execute(make_xml('AssetGroupDeleteRequest', {'group-id' => id}))
+      r = execute(make_xml('AssetGroupDeleteRequest', { 'group-id' => id }))
       r.success
     end
 
-    alias_method :delete_group, :delete_asset_group
+    alias delete_group delete_asset_group
 
     # Retrieve an array of all asset groups the user is authorized to view or
     # manage.
@@ -23,7 +23,6 @@ module Nexpose
     #
     def list_asset_groups
       r = execute(make_xml('AssetGroupListingRequest'))
-
       groups = []
       if r.success
         r.res.elements.each('AssetGroupListingResponse/AssetGroupSummary') do |group|
@@ -37,8 +36,8 @@ module Nexpose
       groups
     end
 
-    alias_method :groups, :list_asset_groups
-    alias_method :asset_groups, :list_asset_groups
+    alias groups list_asset_groups
+    alias asset_groups list_asset_groups
   end
 
   # Summary value object for asset group information.
@@ -47,7 +46,11 @@ module Nexpose
     attr_reader :id, :name, :description, :risk_score, :dynamic
 
     def initialize(id, name, desc, risk, dynamic)
-      @id, @name, @description, @risk_score, @dynamic = id, name, desc, risk, dynamic
+      @id          = id
+      @name        = name
+      @description = desc
+      @risk_score  = risk
+      @dynamic     = dynamic
     end
 
     def dynamic?
@@ -68,17 +71,20 @@ module Nexpose
   class AssetGroup < AssetGroupSummary
     include Sanitize
 
-    attr_accessor :name, :description, :id , :tags
+    attr_accessor :name, :description, :id, :tags
 
     # Array[Device] of devices associated with this asset group.
     attr_accessor :assets
-    alias :devices :assets
-    alias :devices= :assets=
+    alias devices assets
+    alias devices= assets=
 
     def initialize(name, desc, id = -1, risk = 0.0)
-      @name, @description, @id, @risk_score = name, desc, id, risk
-      @assets = []
-      @tags = []
+      @name        = name
+      @description = desc
+      @id          = id
+      @risk_score  = risk
+      @assets      = []
+      @tags        = []
     end
 
     def save(connection)
@@ -86,7 +92,7 @@ module Nexpose
       xml << to_xml
       xml << '</AssetGroupSaveRequest>'
       res = connection.execute(xml)
-      @id = res.attributes['group-id'].to_i if res.success and @id < 1
+      @id = res.attributes['group-id'].to_i if res.success && @id < 1
     end
 
     # Generate an XML representation of this group configuration
@@ -95,8 +101,8 @@ module Nexpose
     #
     def as_xml
       xml = REXML::Element.new('AssetGroup')
-      xml.attributes['id'] = @id
-      xml.attributes['name'] = @name
+      xml.attributes['id']          = @id
+      xml.attributes['name']        = @name
       xml.attributes['description'] = @description
 
       if @description && !@description.empty?
@@ -106,7 +112,7 @@ module Nexpose
       end
 
       elem = REXML::Element.new('Devices')
-      @assets.each { |a| elem.add_element('device', {'id' => a.id}) }
+      @assets.each { |a| elem.add_element('device', { 'id' => a.id }) }
       xml.add_element(elem)
 
       unless tags.empty?
@@ -134,8 +140,8 @@ module Nexpose
     # @return [Hash] Hash of site ID to Scan launch information for each scan.
     #
     def rescan_assets(connection)
-      sites_ids = @assets.map { |d| d.site_id }.uniq
-      scans = {}
+      scans     = {}
+      sites_ids = @assets.map(&:site_id).uniq
       sites_ids.each do |site_id|
         to_scan = @assets.select { |d| d.site_id == site_id }
         scans[site_id] = connection.scan_devices(to_scan)
@@ -153,7 +159,7 @@ module Nexpose
     #
     def self.load(connection, id)
       xml = %(<AssetGroupConfigRequest session-id="#{connection.session_id}" group-id="#{id}"/>)
-      r = APIRequest.execute(connection.url, xml)
+      r   = APIRequest.execute(connection.url, xml)
       parse(r.res)
     end
 

data/lib/nexpose/json_serializer.rb

@@ -6,13 +6,11 @@ module Nexpose
       data.each do |key, value|
         if respond_to?(key)
           property = value
-
           if value.respond_to? :each
             obj = resolve_type(key)
-
             unless obj.nil?
               if value.is_a?(Array)
-                property = value.map { |dv|  ((dv.respond_to? :each) ? create_object(obj, dv).deserialize(dv): dv) }
+                property = value.map { |dv| ((dv.respond_to? :each) ? create_object(obj, dv).deserialize(dv) : dv) }
               else
                 property = create_object(obj, value).deserialize(value)
               end
@@ -20,20 +18,15 @@ module Nexpose
           elsif value.is_a?(String) && value.match(/^\d{8}T\d{6}\.\d{3}/)
             property = ISO8601.to_time(value)
           end
-
           instance_variable_set("@#{key}", property)
         end
       end
-
       self
     end
 
-    def serialize()
+    def serialize
       hash = to_hash(Hash.new)
-
-      unless hash.nil?
-        JSON.generate(hash)
-      end
+      JSON.generate(hash) unless hash.nil?
     end
 
     def to_hash(hash)
@@ -41,7 +34,6 @@ module Nexpose
         value = self.instance_variable_get(m)
         hash[m.to_s.delete('@')] = do_hash(value)
       end
-
       hash
     end
 
@@ -51,12 +43,10 @@ module Nexpose
       if obj.is_a?(Array)
         obj = obj.map do |el|
           do_hash(el)
-
         end
       elsif obj.class.included_modules.include? JsonSerializer
         obj = obj.to_hash(Hash.new)
       end
-
       obj
     end
 
@@ -89,4 +79,4 @@ module Nexpose
       class_name
     end
   end
-end
+end

data/lib/nexpose/maint.rb

@@ -46,11 +46,10 @@ module Nexpose
     #
     def db_maintenance(clean_up = false, compress = false, reindex = false)
       return unless compress || clean_up || reindex
-      parameters = { 'cmd' => 'startMaintenance',
-                     'targetTask' => 'dbMaintenance' }
-      parameters['cleanup'] = 1 if clean_up
+      parameters = { 'cmd' => 'startMaintenance', 'targetTask' => 'dbMaintenance' }
+      parameters['cleanup']  = 1 if clean_up
       parameters['compress'] = 1 if compress
-      parameters['reindex'] = 1 if reindex
+      parameters['reindex']  = 1 if reindex
       xml = AJAX.form_post(self, '/admin/global/maintenance/maintCmd.txml', parameters)
       if !!(xml =~ /succeded="true"/)
         _maintenance_restart
@@ -85,12 +84,12 @@ module Nexpose
     attr_reader :size
 
     def initialize(name, date, description, version, independent, size)
-      @name = name
-      @date = date
-      @description = description
-      @version = version
+      @name                 = name
+      @date                 = date
+      @description          = description
+      @version              = version
       @platform_independent = independent
-      @size = size
+      @size                 = size
     end
 
     # Restore this backup to the Nexpose console.

data/lib/nexpose/manage.rb

@@ -47,9 +47,9 @@ module Nexpose
     # Includes Product, Content, and Java versions.
     #
     def engine_versions
-      info = console_command('version engines')
+      info     = console_command('version engines')
       versions = []
-      engines = info.sub('VERSION INFORMATION\n', '').split(/\n\n/)
+      engines  = info.sub('VERSION INFORMATION\n', '').split(/\n\n/)
       engines.each do |eng|
         engdata = {}
         eng.split(/\n/).each do |kv|

data/lib/nexpose/multi_tenant_user.rb

@@ -17,14 +17,14 @@ module Nexpose
       end
       arr
     end
-    alias_method :silo_users, :list_silo_users
+    alias silo_users list_silo_users
 
     # Delete the specified silo user
     #
     # @return Whether or not the delete request succeeded.
     #
     def delete_silo_user(user_id)
-      r = execute(make_xml('MultiTenantUserDeleteRequest', {'user-id' => user_id}), '1.2')
+      r = execute(make_xml('MultiTenantUserDeleteRequest', { 'user-id' => user_id }), '1.2')
       r.success
     end
   end
@@ -42,21 +42,21 @@ module Nexpose
     attr_reader :locked
 
     def initialize(&block)
-      instance_eval &block if block_given?
+      instance_eval(&block) if block_given?
     end
 
     def self.parse(xml)
       new do
-        @id = xml.attributes['id'].to_i
-        @full_name = xml.attributes['full-name']
-        @user_name = xml.attributes['user-name']
-        @email = xml.attributes['email']
-        @superuser = xml.attributes['superuser'].to_s.chomp.eql?('true')
-        @enabled = xml.attributes['enabled'].to_s.chomp.eql?('true')
+        @id          = xml.attributes['id'].to_i
+        @full_name   = xml.attributes['full-name']
+        @user_name   = xml.attributes['user-name']
+        @email       = xml.attributes['email']
+        @superuser   = xml.attributes['superuser'].to_s.chomp.eql?('true')
+        @enabled     = xml.attributes['enabled'].to_s.chomp.eql?('true')
         @auth_module = xml.attributes['auth-module']
         @auth_source = xml.attributes['auth-source']
-        @silo_count = xml.attributes['silo-count'].to_i
-        @locked = xml.attributes['locked'].to_s.chomp.eql?('true')
+        @silo_count  = xml.attributes['silo-count'].to_i
+        @locked      = xml.attributes['locked'].to_s.chomp.eql?('true')
       end
     end
   end
@@ -73,13 +73,13 @@ module Nexpose
     attr_accessor :silo_access
 
     def initialize(&block)
-      instance_eval &block if block_given?
+      instance_eval(&block) if block_given?
 
       @silo_access = Array(@silo_access)
     end
 
     def save(connection)
-      if (@id)
+      if @id
         update(connection)
       else
         create(connection)
@@ -112,14 +112,14 @@ module Nexpose
 
     def as_xml
       xml = REXML::Element.new('MultiTenantUserConfig')
-      xml.add_attributes({'id' => @id,
-                          'full-name' => @full_name,
-                          'user-name' => @user_name,
-                          'authsrcid' => @auth_source_id,
-                          'email' => @email,
-                          'password' => @password,
-                          'superuser' => @superuser,
-                          'enabled' => @enabled})
+      xml.add_attributes({ 'id'        => @id,
+                           'full-name' => @full_name,
+                           'user-name' => @user_name,
+                           'authsrcid' => @auth_source_id,
+                           'email'     => @email,
+                           'password'  => @password,
+                           'superuser' => @superuser,
+                           'enabled'   => @enabled })
       siloaccesses = xml.add_element('SiloAccesses')
       @silo_access.each { |silo_access| siloaccesses.add_element(silo_access.as_xml) }
       xml
@@ -135,20 +135,20 @@ module Nexpose
 
     def self.parse(xml)
       new do |user|
-        user.id = xml.attributes['id'].to_i
-        user.full_name = xml.attributes['full-name']
-        user.user_name = xml.attributes['user-name']
-        user.email = xml.attributes['email']
-        user.superuser = xml.attributes['superuser'].to_s.chomp.eql?('true')
-        user.enabled = xml.attributes['enabled'].to_s.chomp.eql?('true')
+        user.id             = xml.attributes['id'].to_i
+        user.full_name      = xml.attributes['full-name']
+        user.user_name      = xml.attributes['user-name']
+        user.email          = xml.attributes['email']
+        user.superuser      = xml.attributes['superuser'].to_s.chomp.eql?('true')
+        user.enabled        = xml.attributes['enabled'].to_s.chomp.eql?('true')
         user.auth_source_id = xml.attributes['authsrcid'].to_i
-        user.silo_access = []
+        user.silo_access    = []
         xml.elements.each('SiloAccesses/SiloAccess') { |access| user.silo_access << SiloAccess.parse(access) }
       end
     end
 
     def self.load(connection, user_id)
-      r = connection.execute(connection.make_xml('MultiTenantUserConfigRequest', {'user-id' => user_id}), '1.2')
+      r = connection.execute(connection.make_xml('MultiTenantUserConfigRequest', { 'user-id' => user_id }), '1.2')
 
       if r.success
         r.res.elements.each('MultiTenantUserConfigResponse/MultiTenantUserConfig') do |config|
@@ -169,30 +169,30 @@ module Nexpose
     attr_accessor :groups
 
     def initialize(&block)
-      instance_eval &block if block_given?
+      instance_eval(&block) if block_given?
       @sites = Array(@sites)
       @groups = Array(@groups)
     end
 
     def as_xml
       xml = REXML::Element.new('SiloAccess')
-      xml.add_attributes({'all-groups' => @all_groups,
-                          'all-sites' => @all_sites,
-                          'role-name' => @role_name,
-                          'silo-id' => @silo_id,
-                          'default-silo' => @default})
+      xml.add_attributes({ 'all-groups'   => @all_groups,
+                           'all-sites'    => @all_sites,
+                           'role-name'    => @role_name,
+                           'silo-id'      => @silo_id,
+                           'default-silo' => @default })
 
       unless @groups.empty?
         groups = xml.add_element('AllowedGroups')
         @groups.each do |group|
-          groups.add_element('AllowedGroup', {'id' => group})
+          groups.add_element('AllowedGroup', { 'id' => group })
         end
       end
 
       unless @sites.empty?
         sites = xml.add_element('AllowedSites')
         @sites.each do |site|
-          sites.add_element('AllowedSite', {'id' => site})
+          sites.add_element('AllowedSite', { 'id' => site })
         end
       end
 
@@ -206,11 +206,11 @@ module Nexpose
     def self.parse(xml)
       new do |access|
         access.all_groups = xml.attributes['all-groups'].to_s.chomp.eql?('true')
-        access.all_sites = xml.attributes['all-sites'].to_s.chomp.eql?('true')
-        access.role_name = xml.attributes['role-name']
-        access.silo_id = xml.attributes['silo-id']
-        access.default = xml.attributes['default-silo'].to_s.chomp.eql?('true')
-        access.sites = []
+        access.all_sites  = xml.attributes['all-sites'].to_s.chomp.eql?('true')
+        access.role_name  = xml.attributes['role-name']
+        access.silo_id    = xml.attributes['silo-id']
+        access.default    = xml.attributes['default-silo'].to_s.chomp.eql?('true')
+        access.sites      = []
         xml.elements.each('AllowedSites/AllowedSite') { |site| access.sites << site.attributes['id'].to_i }
         access.groups = []
         xml.elements.each('AllowedGroups/AllowedGroup') { |group| access.groups << group.attributes['id'].to_i }

data/lib/nexpose/password_policy.rb

@@ -11,12 +11,12 @@ module Nexpose
     attr_accessor :expiration_days
 
     def initialize(policy_name:, min_length:, max_length:, special_chars:, capitals:, digits:, expiration_days: 0)
-      @policy_name = policy_name.to_s
-      @min_length = min_length.to_i
-      @max_length = max_length.to_i
-      @special_chars = special_chars.to_i
-      @capitals = capitals.to_i
-      @digits = digits.to_i
+      @policy_name     = policy_name.to_s
+      @min_length      = min_length.to_i
+      @max_length      = max_length.to_i
+      @special_chars   = special_chars.to_i
+      @capitals        = capitals.to_i
+      @digits          = digits.to_i
       @expiration_days = expiration_days.to_i
     end
 
@@ -32,13 +32,13 @@ module Nexpose
 
     def to_h
       {
-          policyName: @policy_name,
-          minLength: @min_length,
-          maxLength: @max_length,
-          specialChars: @special_chars,
-          capitals: @capitals,
-          digits: @digits,
-          expirationDays: @expiration_days
+        policyName: @policy_name,
+        minLength: @min_length,
+        maxLength: @max_length,
+        specialChars: @special_chars,
+        capitals: @capitals,
+        digits: @digits,
+        expirationDays: @expiration_days
       }
     end
 
@@ -52,7 +52,7 @@ module Nexpose
     end
 
     def self.load(nsc)
-      uri = '/api/2.1/password_policy/'
+      uri  = '/api/2.1/password_policy/'
       resp = AJAX.get(nsc, uri, AJAX::CONTENT_TYPE::JSON)
       hash = JSON.parse(resp, symbolize_names: true)
       self.from_hash(hash)