nexpose 7.0.0 → 7.0.1

data/lib/nexpose/site.rb

@@ -22,7 +22,7 @@ module Nexpose
       arr
     end
 
-    alias_method :sites, :list_sites
+    alias sites list_sites
 
     # Delete the specified site and all associated scan data.
     #
@@ -69,7 +69,7 @@ module Nexpose
     #
     def completed_scans(site_id)
       table = { 'table-id' => 'site-completed-scans' }
-      data = DataTable._get_json_table(self, "/data/scan/site/#{site_id}", table)
+      data  = DataTable._get_json_table(self, "/data/scan/site/#{site_id}", table)
       data.map(&CompletedScan.method(:parse_json))
     end
   end
@@ -158,21 +158,21 @@ module Nexpose
     # @param [String] name Unique name of the site.
     # @param [String] scan_template_id ID of the scan template to use.
     def initialize(name = nil, scan_template_id = 'full-audit-without-web-spider')
-      @name = name
-      @scan_template_id = scan_template_id
-      @id = -1
-      @risk_factor = 1.0
-      @config_version = 3
-      @schedules = []
-      @blackouts = []
+      @name                  = name
+      @scan_template_id      = scan_template_id
+      @id                    = -1
+      @risk_factor           = 1.0
+      @config_version        = 3
+      @schedules             = []
+      @blackouts             = []
       @included_scan_targets = { addresses: [], asset_groups: [] }
       @excluded_scan_targets = { addresses: [], asset_groups: [] }
-      @site_credentials = []
-      @shared_credentials = []
-      @web_credentials = []
-      @alerts = []
-      @users = []
-      @tags = []
+      @site_credentials      = []
+      @shared_credentials    = []
+      @web_credentials       = []
+      @alerts                = []
+      @users                 = []
+      @tags                  = []
     end
 
     # Returns the array of included scan target addresses.
@@ -231,23 +231,20 @@ module Nexpose
     def is_dynamic?
       !@discovery_config.nil?
     end
+    alias dynamic? is_dynamic?
 
     # Adds assets to this site by IP address range.
     #
     # @param [String] from Beginning IP address of a range.
     # @param [String] to Ending IP address of a range.
     def include_ip_range(from, to)
-      begin
-        from_ip = IPAddr.new(from)
-        to_ip = IPAddr.new(to)
-        (from_ip..to_ip)
-        if (from_ip..to_ip).to_a.size == 0
-          raise 'Invalid IP range specified'
-        end
-        @included_scan_targets[:addresses] << IPRange.new(from, to)
-      rescue ArgumentError => e
-        raise "#{e.message} in given IP range"
-      end
+      from_ip = IPAddr.new(from)
+      to_ip   = IPAddr.new(to)
+      (from_ip..to_ip)
+      raise 'Invalid IP range specified' if (from_ip..to_ip).to_a.size.zero?
+      @included_scan_targets[:addresses] << IPRange.new(from, to)
+    rescue ArgumentError => e
+      raise "#{e.message} in given IP range"
     end
 
     # Remove assets to this site by IP address range.
@@ -255,17 +252,13 @@ module Nexpose
     # @param [String] from Beginning IP address of a range.
     # @param [String] to Ending IP address of a range.
     def remove_included_ip_range(from, to)
-      begin
-        from_ip = IPAddr.new(from)
-        to_ip = IPAddr.new(to)
-        (from_ip..to_ip)
-        if (from_ip..to_ip).to_a.size == 0
-          raise 'Invalid IP range specified'
-        end
-        @included_scan_targets[:addresses].reject! { |t| t.eql? IPRange.new(from, to) }
-      rescue ArgumentError => e
-        raise "#{e.message} in given IP range"
-      end
+      from_ip = IPAddr.new(from)
+      to_ip   = IPAddr.new(to)
+      (from_ip..to_ip)
+      raise 'Invalid IP range specified' if (from_ip..to_ip).to_a.size.zero?
+      @included_scan_targets[:addresses].reject! { |t| t.eql? IPRange.new(from, to) }
+    rescue ArgumentError => e
+      raise "#{e.message} in given IP range"
     end
 
     # Adds an asset to this site included scan targets, resolving whether an IP or hostname is
@@ -291,17 +284,13 @@ module Nexpose
     # @param [String] from Beginning IP address of a range.
     # @param [String] to Ending IP address of a range.
     def exclude_ip_range(from, to)
-      begin
-        from_ip = IPAddr.new(from)
-        to_ip = IPAddr.new(to)
-        (from_ip..to_ip)
-        if (from_ip..to_ip).to_a.size == 0
-          raise 'Invalid IP range specified'
-        end
-        @excluded_scan_targets[:addresses] << IPRange.new(from, to)
-      rescue ArgumentError => e
-        raise "#{e.message} in given IP range"
-      end
+      from_ip = IPAddr.new(from)
+      to_ip   = IPAddr.new(to)
+      (from_ip..to_ip)
+      raise 'Invalid IP range specified' if (from_ip..to_ip).to_a.size.zero?
+      @excluded_scan_targets[:addresses] << IPRange.new(from, to)
+    rescue ArgumentError => e
+      raise "#{e.message} in given IP range"
     end
 
     # Remove assets from this site excluded scan targets by IP address range.
@@ -309,17 +298,13 @@ module Nexpose
     # @param [String] from Beginning IP address of a range.
     # @param [String] to Ending IP address of a range.
     def remove_excluded_ip_range(from, to)
-      begin
-        from_ip = IPAddr.new(from)
-        to_ip = IPAddr.new(to)
-        (from_ip..to_ip)
-        if (from_ip..to_ip).to_a.size == 0
-          raise 'Invalid IP range specified'
-        end
-        @excluded_scan_targets[:addresses].reject! { |t| t.eql? IPRange.new(from, to) }
-      rescue ArgumentError => e
-        raise "#{e.message} in given IP range"
-      end
+      from_ip = IPAddr.new(from)
+      to_ip   = IPAddr.new(to)
+      (from_ip..to_ip)
+      raise 'Invalid IP range specified' if (from_ip..to_ip).to_a.size.zero?
+      @excluded_scan_targets[:addresses].reject! { |t| t.eql? IPRange.new(from, to) }
+    rescue ArgumentError => e
+      raise "#{e.message} in given IP range"
     end
 
     # Adds an asset to this site excluded scan targets, resolving whether an IP or hostname is
@@ -391,7 +376,7 @@ module Nexpose
         raise 'Invalid user id. A user id must be a positive number and refer to an existing system user.'
       end
 
-      @users << { id: user_id}
+      @users << { id: user_id }
     end
 
     def remove_user(user_id)
@@ -427,36 +412,29 @@ module Nexpose
     end
 
     def to_h
-      included_scan_targets = {
-          addresses: @included_scan_targets[:addresses].compact,
-          asset_groups: @included_scan_targets[:asset_groups].compact
-      }
-      excluded_scan_targets = {
-          addresses: @excluded_scan_targets[:addresses].compact,
-          asset_groups: @excluded_scan_targets[:asset_groups].compact
-      }
-
-      hash = {
-          id: @id,
-          name: @name,
-          description: @description,
-          auto_engine_selection_enabled: @auto_engine_selection_enabled,
-          included_scan_targets: included_scan_targets,
-          excluded_scan_targets: excluded_scan_targets,
-          engine_id: @engine_id,
-          scan_template_id: @scan_template_id,
-          risk_factor: @risk_factor,
-          schedules: (@schedules || []).map {|schedule| schedule.to_h},
-          shared_credentials: (@shared_credentials || []).map {|cred| cred.to_h},
-          site_credentials: (@site_credentials || []).map {|cred| cred.to_h},
-          web_credentials: (@web_credentials || []).map {|webCred| webCred.to_h},
-          discovery_config: @discovery_config.to_h,
-          search_criteria: @search_criteria.to_h,
-          tags: (@tags || []).map{|tag| tag.to_h},
-          alerts: (@alerts || []).map {|alert| alert.to_h },
-          organization: @organization.to_h,
-          users: users
-      }
+      included_scan_targets = { addresses: @included_scan_targets[:addresses].compact,
+                                asset_groups: @included_scan_targets[:asset_groups].compact }
+      excluded_scan_targets = { addresses: @excluded_scan_targets[:addresses].compact,
+                                asset_groups: @excluded_scan_targets[:asset_groups].compact }
+      hash = { id: @id,
+               name: @name,
+               description: @description,
+               auto_engine_selection_enabled: @auto_engine_selection_enabled,
+               included_scan_targets: included_scan_targets,
+               excluded_scan_targets: excluded_scan_targets,
+               engine_id: @engine_id,
+               scan_template_id: @scan_template_id,
+               risk_factor: @risk_factor,
+               schedules: (@schedules || []).map(&:to_h),
+               shared_credentials: (@shared_credentials || []).map(&:to_h),
+               site_credentials: (@site_credentials || []).map(&:to_h),
+               web_credentials: (@web_credentials || []).map(&:to_h),
+               discovery_config: @discovery_config.to_h,
+               search_criteria: @search_criteria.to_h,
+               tags: (@tags || []).map(&:to_h),
+               alerts: (@alerts || []).map(&:to_h),
+               organization: @organization.to_h,
+               users: users }
       # @TODO: Revisit this for 2.0.0 update
       # Only pass in blackouts if they were actually specified (for backwards compatibility)
       hash[:blackouts] = @blackouts.map(&:to_h) if @blackouts && @blackouts.any?
@@ -472,7 +450,7 @@ module Nexpose
     # @return [Site] The requested site, if found.
     #
     def self.load(nsc, id)
-      uri = "/api/2.1/site_configurations/#{id}"
+      uri  = "/api/2.1/site_configurations/#{id}"
       resp = AJAX.get(nsc, uri, AJAX::CONTENT_TYPE::JSON)
       hash = JSON.parse(resp, symbolize_names: true)
       site = self.json_initializer(hash).deserialize(hash)
@@ -486,19 +464,19 @@ module Nexpose
       site.excluded_scan_targets[:addresses] = []
       excluded_addresses.each { |asset| site.exclude_asset(asset) }
 
-      site.organization = Organization.create(site.organization)
-      site.schedules = (hash[:schedules] || []).map {|schedule| Nexpose::Schedule.from_hash(schedule) }
-      site.blackouts = (hash[:blackouts] || []).map {|blackout| Nexpose::Blackout.from_hash(blackout) }
-      site.site_credentials = hash[:site_credentials].map {|cred| Nexpose::SiteCredentials.new.object_from_hash(nsc,cred)}
-      site.shared_credentials = hash[:shared_credentials].map {|cred| Nexpose::SiteCredentials.new.object_from_hash(nsc,cred)}
-      site.discovery_config = Nexpose::DiscoveryConnection.new.object_from_hash(nsc, hash[:discovery_config]) unless hash[:discovery_config].nil?
-      site.search_criteria = Nexpose::DiscoveryConnection::Criteria.parseHash(hash[:search_criteria]) unless hash[:search_criteria].nil?
-      site.alerts = Alert.load_alerts(hash[:alerts])
-      site.tags = Tag.load_tags(hash[:tags])
-      site.web_credentials = hash[:web_credentials].map {|webCred| (
-      webCred[:service] == Nexpose::WebCredentials::WebAppAuthType::HTTP_HEADER ?
-          Nexpose::WebCredentials::Headers.new(webCred[:name], webCred[:baseURL], webCred[:soft403Pattern], webCred[:id]).object_from_hash(nsc,webCred) :
-          Nexpose::WebCredentials::HTMLForms.new(webCred[:name], webCred[:baseURL], webCred[:loginURL], webCred[:soft403Pattern], webCred[:id]).object_from_hash(nsc,webCred))}
+      site.organization       = Organization.create(site.organization)
+      site.schedules          = (hash[:schedules] || []).map { |schedule| Nexpose::Schedule.from_hash(schedule) }
+      site.blackouts          = (hash[:blackouts] || []).map { |blackout| Nexpose::Blackout.from_hash(blackout) }
+      site.site_credentials   = hash[:site_credentials].map { |cred| Nexpose::SiteCredentials.new.object_from_hash(nsc, cred) }
+      site.shared_credentials = hash[:shared_credentials].map { |cred| Nexpose::SiteCredentials.new.object_from_hash(nsc, cred) }
+      site.discovery_config   = Nexpose::DiscoveryConnection.new.object_from_hash(nsc, hash[:discovery_config]) unless hash[:discovery_config].nil?
+      site.search_criteria    = Nexpose::DiscoveryConnection::Criteria.parseHash(hash[:search_criteria]) unless hash[:search_criteria].nil?
+      site.alerts             = Alert.load_alerts(hash[:alerts])
+      site.tags               = Tag.load_tags(hash[:tags])
+      site.web_credentials = hash[:web_credentials].map { |web_cred| (
+      web_cred[:service] == Nexpose::WebCredentials::WebAppAuthType::HTTP_HEADER ?
+          Nexpose::WebCredentials::Headers.new(web_cred[:name], web_cred[:baseURL], web_cred[:soft403Pattern], web_cred[:id]).object_from_hash(nsc, web_cred) :
+          Nexpose::WebCredentials::HTMLForms.new(web_cred[:name], web_cred[:baseURL], web_cred[:loginURL], web_cred[:soft403Pattern], web_cred[:id]).object_from_hash(nsc, web_cred)) }
 
       site
     end
@@ -516,8 +494,8 @@ module Nexpose
     # @return [Site] Site configuration loaded from a Nexpose console.
     #
     def self.copy(connection, id)
-      site = self.load(connection, id)
-      site.id = -1
+      site      = self.load(connection, id)
+      site.id   = -1
       site.name = "#{site.name} Copy"
       site
     end
@@ -536,14 +514,14 @@ module Nexpose
         resp = AJAX.post(connection, '/api/2.1/site_configurations/', to_json, AJAX::CONTENT_TYPE::JSON)
         @id = resp.to_i
       else
-        resp = AJAX.put(connection, "/api/2.1/site_configurations/#{@id}", to_json, AJAX::CONTENT_TYPE::JSON)
+        AJAX.put(connection, "/api/2.1/site_configurations/#{@id}", to_json, AJAX::CONTENT_TYPE::JSON)
       end
 
       # Retrieve the scan engine and shared credentials and add them to the site configuration
-      site_config = Site.load(connection, @id)
-      @engine_id = site_config.engine_id
+      site_config         = Site.load(connection, @id)
+      @engine_id          = site_config.engine_id
       @shared_credentials = site_config.shared_credentials
-      @alerts = site_config.alerts
+      @alerts             = site_config.alerts
 
       @id
     end
@@ -592,11 +570,11 @@ module Nexpose
     # Constructor
     # SiteSummary(id, name, description, riskfactor = 1)
     def initialize(id, name, description = nil, risk_factor = 1.0, risk_score = 0.0)
-      @id = id
-      @name = name
+      @id          = id
+      @name        = name
       @description = description
       @risk_factor = risk_factor
-      @risk_score = risk_score
+      @risk_score  = risk_score
     end
   end
 
@@ -629,7 +607,7 @@ module Nexpose
       xml.text = @host
       xml
     end
-    alias_method :to_xml_elem, :as_xml
+    alias to_xml_elem as_xml
 
     def to_xml
       to_xml_elem.to_s
@@ -670,14 +648,14 @@ module Nexpose
     # @return [IPRange] an IP address range of one or more addresses.
     def initialize(from, to = nil)
       @from = from
-      @to = to unless from == to
+      @to   = to unless from == to
 
       return unless @to.nil?
 
       range = IPAddr.new(@from.to_s).to_range
       unless range.one?
         @from = range.first.to_s
-        @to = range.last.to_s
+        @to   = range.last.to_s
       end
     end
 
@@ -689,7 +667,7 @@ module Nexpose
     def size
       return 1 if @to.nil?
       from = IPAddr.new(@from)
-      to = IPAddr.new(@to)
+      to   = IPAddr.new(@to)
       (from..to).to_a.size
     end
 
@@ -697,10 +675,10 @@ module Nexpose
 
     def <=>(other)
       return 1 unless other.respond_to? :from
-      from = IPAddr.new(@from)
-      to = @to.nil? ? from : IPAddr.new(@to)
+      from    = IPAddr.new(@from)
+      to      = @to.nil? ? from : IPAddr.new(@to)
       cf_from = IPAddr.new(other.from)
-      cf_to = IPAddr.new(other.to.nil? ? other.from : other.to)
+      cf_to   = IPAddr.new(other.to.nil? ? other.from : other.to)
       if cf_to < from
         1
       elsif to < cf_from
@@ -721,8 +699,8 @@ module Nexpose
 
     def include?(single_ip)
       return false unless single_ip.respond_to? :from
-      from = IPAddr.new(@from)
-      to = @to.nil? ? from : IPAddr.new(@to)
+      from  = IPAddr.new(@from)
+      to    = @to.nil? ? from : IPAddr.new(@to)
       other = IPAddr.new(single_ip)
 
       if other < from
@@ -743,7 +721,7 @@ module Nexpose
       xml.add_attributes({ 'from' => @from, 'to' => @to })
       xml
     end
-    alias_method :to_xml_elem, :as_xml
+    alias to_xml_elem as_xml
 
     def to_xml
       as_xml.to_s

data/lib/nexpose/site_credentials.rb

@@ -49,7 +49,7 @@ module Nexpose
     attr_accessor :use_windows_auth
     # sid for oracle
     attr_accessor :sid
-    #for ssh public key require pem format private key
+    # for ssh public key require pem format private key
     attr_accessor :pem_format_private_key
     # for snmp v1/v2
     attr_accessor :community_name
@@ -71,14 +71,13 @@ module Nexpose
       unless engine_id
         engine_id = nsc.engines.detect { |e| e.name == 'Local scan engine' }.id
       end
-      @port = Credential::DEFAULT_PORTS[@service] if @port.nil?
+      @port      = Credential::DEFAULT_PORTS[@service] if @port.nil?
       parameters = _to_param(target, engine_id, @port, siteid)
       parameters = JSON.generate(parameters)
-      resp = JSON.parse(Nexpose::AJAX.post(nsc, '/data/credential/test', parameters, Nexpose::AJAX::CONTENT_TYPE::JSON))
+      resp       = JSON.parse(Nexpose::AJAX.post(nsc, '/data/credential/test', parameters, Nexpose::AJAX::CONTENT_TYPE::JSON))
       resp['success'] == 'true'
     end
 
-
     def _to_param(target, engine_id, port, siteid)
       {
         dev: target,
@@ -100,17 +99,17 @@ module Nexpose
       }
     end
 
-    #Create a credential object using name, id, description, host and port
+    # Create a credential object using name, id, description, host and port
     def self.for_service(name, id = -1, desc = nil, host = nil, port = nil, service = Credential::Service::CIFS)
-      cred = new
-      cred.name = name
-      cred.id = id.to_i
-      cred.enabled = true
-      cred.description = desc
-      cred.host_restriction = host
-      cred.port_restriction = port
-      cred.service = service
-      cred.scope = Credential::Scope::SITE_SPECIFIC
+      cred                           = new
+      cred.name                      = name
+      cred.id                        = id.to_i
+      cred.enabled                   = true
+      cred.description               = desc
+      cred.host_restriction          = host
+      cred.port_restriction          = port
+      cred.service                   = service
+      cred.scope                     = Credential::Scope::SITE_SPECIFIC
       cred.permission_elevation_type = Credential::ElevationType::NONE
       cred
     end
@@ -123,7 +122,7 @@ module Nexpose
     # @return [SiteCredential] The requested credential of site, if found.
     #
     def self.load(nsc, site_id, credential_id)
-      uri = "/api/2.1/sites/#{site_id}/credentials/#{credential_id}"
+      uri  = "/api/2.1/sites/#{site_id}/credentials/#{credential_id}"
       resp = AJAX.get(nsc, uri, AJAX::CONTENT_TYPE::JSON)
       hash = JSON.parse(resp, symbolize_names: true)
       new.object_from_hash(nsc, hash)
@@ -187,8 +186,7 @@ module Nexpose
         sid: sid,
         pem_format_private_key: pem_format_private_key,
         community_name: community_name,
-        scope: scope
-      }
+        scope: scope }
     end
 
     def ==(other)

data/lib/nexpose/tag.rb

@@ -8,13 +8,13 @@ module Nexpose
     #
     def tags
       tag_summary = []
-      tags = JSON.parse(AJAX.get(self, '/api/2.0/tags', AJAX::CONTENT_TYPE::JSON, { per_page: 2_147_483_647 }))
+      tags        = JSON.parse(AJAX.get(self, '/api/2.0/tags', AJAX::CONTENT_TYPE::JSON, { per_page: 2_147_483_647 }))
       tags['resources'].each do |json|
         tag_summary << TagSummary.parse(json)
       end
       tag_summary
     end
-    alias_method :list_tags, :tags
+    alias list_tags tags
 
     # Deletes a tag by ID
     #
@@ -31,13 +31,13 @@ module Nexpose
     #
     def asset_tags(asset_id)
       tag_summary = []
-      asset_tag = JSON.parse(AJAX.get(self, "/api/2.0/assets/#{asset_id}/tags", AJAX::CONTENT_TYPE::JSON, { per_page: 2_147_483_647 }))
+      asset_tag   = JSON.parse(AJAX.get(self, "/api/2.0/assets/#{asset_id}/tags", AJAX::CONTENT_TYPE::JSON, { per_page: 2_147_483_647 }))
       asset_tag['resources'].select { |r| r['asset_ids'].find { |i| i == asset_id } }.each do |json|
         tag_summary << TagSummary.parse(json)
       end
       tag_summary
     end
-    alias_method :list_asset_tags, :asset_tags
+    alias list_asset_tags asset_tags
 
     # Removes a tag from an asset
     #
@@ -61,7 +61,7 @@ module Nexpose
       end
       tag_summary
     end
-    alias_method :list_site_tags, :site_tags
+    alias list_site_tags site_tags
 
     # Removes a tag from a site
     #
@@ -85,8 +85,8 @@ module Nexpose
       end
       tag_summary
     end
-    alias_method :group_tags, :asset_group_tags
-    alias_method :list_asset_group_tags, :asset_group_tags
+    alias group_tags asset_group_tags
+    alias list_asset_group_tags asset_group_tags
 
     # Removes a tag from an asset_group
     #
@@ -96,7 +96,7 @@ module Nexpose
     def remove_tag_from_asset_group(asset_group_id, tag_id)
       AJAX.delete(self, "/api/2.0/asset_groups/#{asset_group_id}/tags/#{tag_id}")
     end
-    alias_method :remove_tag_from_group, :remove_tag_from_asset_group
+    alias remove_tag_from_group remove_tag_from_asset_group
 
     # Returns the criticality value which takes precedent for an asset
     #
@@ -123,7 +123,9 @@ module Nexpose
     attr_accessor :type
 
     def initialize(name, type, id)
-      @name, @type, @id = name, type, id
+      @name = name
+      @type = type
+      @id   = id
     end
 
     def self.parse(json)
@@ -154,27 +156,27 @@ module Nexpose
       # Criticality tag types
       module Level
         VERY_HIGH = 'Very High'
-        HIGH = 'High'
-        MEDIUM = 'Medium'
-        LOW = 'Low'
-        VERY_LOW = 'Very Low'
+        HIGH      = 'High'
+        MEDIUM    = 'Medium'
+        LOW       = 'Low'
+        VERY_LOW  = 'Very Low'
       end
 
       # Tag types
       module Generic
-        CUSTOM = 'CUSTOM'
-        OWNER = 'OWNER'
-        LOCATION = 'LOCATION'
+        CUSTOM      = 'CUSTOM'
+        OWNER       = 'OWNER'
+        LOCATION    = 'LOCATION'
         CRITICALITY = 'CRITICALITY'
       end
 
       module Color
-        BLUE = "#496a77"
-        DEFAULT = "#f6f6f6"
-        GREEN = "#7d8a58"
-        ORANGE = "#de7200"
-        PURPLE = "#844f7d"
-        RED = "#a0392e"
+        BLUE    = '#496a77'
+        DEFAULT = '#f6f6f6'
+        GREEN   = '#7d8a58'
+        ORANGE  = '#de7200'
+        PURPLE  = '#844f7d'
+        RED     = '#a0392e'
       end
     end
 
@@ -198,26 +200,28 @@ module Nexpose
 
     # Array containing Asset Group IDs to be associated with tag
     attr_accessor :asset_group_ids
-    alias_method :group_ids, :asset_group_ids
-    alias_method :group_ids=, :asset_group_ids=
+    alias group_ids asset_group_ids
+    alias group_ids= asset_group_ids=
 
     # A TagCriteria
     attr_accessor :search_criteria
 
     def initialize(name, type, id = -1)
-      @name, @type, @id = name, type, id
+      @name   = name
+      @type   = type
+      @id     = id
       @source = 'nexpose-client'
-      @color = @type == Type::Generic::CUSTOM ? Type::Color::DEFAULT : nil
+      @color  = @type == Type::Generic::CUSTOM ? Type::Color::DEFAULT : nil
     end
 
     # Set the color but validate it
     def color=(hex)
-      valid_colors = Type::Color::constants.map { |c| Type::Color.const_get(c) }
+      valid_colors = Type::Color.constants.map { |c| Type::Color.const_get(c) }
       unless hex.nil? || valid_colors.include?(hex.to_s.downcase)
         raise ArgumentError, "Unable to set color to an invalid color.\nUse one of #{valid_colors}"
-      end 
+      end
 
-      @color = hex 
+      @color = hex
     end
 
     # Create list of tag objects from hash
@@ -233,12 +237,12 @@ module Nexpose
     # Create tag object from hash
     def self.create(hash)
       attributes = hash[:attributes]
-      color = attributes.find { |attr| attr[:tag_attribute_name] == 'COLOR' }
-      color = color[:tag_attribute_value] if color
-      source = attributes.find { |attr| attr[:tag_attribute_name] == 'SOURCE' }
-      source = source[:tag_attribute_value] if source
-      tag = Tag.new(hash[:tag_name], hash[:tag_type], hash[:tag_id])
-      tag.color = color
+      color      = attributes.find { |attr| attr[:tag_attribute_name] == 'COLOR' }
+      color      = color[:tag_attribute_value] if color
+      source     = attributes.find { |attr| attr[:tag_attribute_name] == 'SOURCE' }
+      source     = source[:tag_attribute_value] if source
+      tag        = Tag.new(hash[:tag_name], hash[:tag_type], hash[:tag_id])
+      tag.color  = color
       tag.source = source
       tag
     end
@@ -248,15 +252,9 @@ module Nexpose
         tag_id: id,
         tag_name: name,
         tag_type: type,
-        attributes:[
-          {
-            tag_attribute_name: "COLOR",
-            tag_attribute_value: color
-          },
-          {
-            tag_attribute_name: "SOURCE",
-            tag_attribute_value: source
-          }
+        attributes: [
+          { tag_attribute_name: 'COLOR', tag_attribute_value: color },
+          { tag_attribute_name: 'SOURCE', tag_attribute_value: source }
         ]
       }
     end
@@ -289,18 +287,15 @@ module Nexpose
     end
 
     def to_json
-      json = {
-          'tag_name' => @name,
-          'tag_type' => @type,
-          'tag_id' => @id,
-          'attributes' => [{ 'tag_attribute_name' => 'SOURCE',
-                             'tag_attribute_value' => @source }],
-          'tag_config' => { 'site_ids' => @site_ids,
-                            'tag_associated_asset_ids' => @associated_asset_ids,
-                            'asset_group_ids' => @asset_group_ids,
-                            'search_criteria' => @search_criteria ? @search_criteria.to_h : nil
-          }
-      }
+      json = { 'tag_name' => @name,
+               'tag_type' => @type,
+               'tag_id' => @id,
+               'attributes' => [{ 'tag_attribute_name' => 'SOURCE',
+                                  'tag_attribute_value' => @source }],
+               'tag_config' => { 'site_ids' => @site_ids,
+                                 'tag_associated_asset_ids' => @associated_asset_ids,
+                                 'asset_group_ids' => @asset_group_ids,
+                                 'search_criteria' => @search_criteria ? @search_criteria.to_h : nil } }
       if @type == Type::Generic::CUSTOM
         json['attributes'] << { 'tag_attribute_name' => 'COLOR', 'tag_attribute_value' => @color }
       end
@@ -316,25 +311,23 @@ module Nexpose
     end
 
     def self.parse(json)
-      color = json['attributes'].find { |attr| attr['tag_attribute_name'] == 'COLOR' }
-      color = color['tag_attribute_value'] if color
-      source = json['attributes'].find { |attr| attr['tag_attribute_name'] == 'SOURCE' }
-      source = source['tag_attribute_value'] if source
-      tag = Tag.new(json['tag_name'], json['tag_type'], json['tag_id'])
-      tag.color = color
-      tag.source = source
+      color         = json['attributes'].find { |attr| attr['tag_attribute_name'] == 'COLOR' }
+      color         = color['tag_attribute_value'] if color
+      source        = json['attributes'].find { |attr| attr['tag_attribute_name'] == 'SOURCE' }
+      source        = source['tag_attribute_value'] if source
+      tag           = Tag.new(json['tag_name'], json['tag_type'], json['tag_id'])
+      tag.color     = color
+      tag.source    = source
       tag.asset_ids = json['asset_ids']
       if json['tag_config']
-        tag.site_ids = json['tag_config']['site_ids']
+        tag.site_ids             = json['tag_config']['site_ids']
         tag.associated_asset_ids = json['tag_config']['tag_associated_asset_ids']
-        tag.asset_group_ids = json['tag_config']['asset_group_ids']
-        criteria = json['tag_config']['search_criteria']
-        tag.search_criteria =  criteria ? Criteria.parse(criteria) : nil
+        tag.asset_group_ids      = json['tag_config']['asset_group_ids']
+        criteria                 = json['tag_config']['search_criteria']
+        tag.search_criteria      = criteria ? Criteria.parse(criteria) : nil
       end
       modifier = json['attributes'].find { |attr| attr['tag_attribute_name'] == 'RISK_MODIFIER' }
-      if modifier
-        tag.risk_modifier = modifier['tag_attribute_value'].to_i
-      end
+      tag.risk_modifier = modifier['tag_attribute_value'].to_i if modifier
       tag
     end
 
@@ -346,9 +339,9 @@ module Nexpose
     #
     def add_to_asset(connection, asset_id)
       params = to_json_for_add
-      url = "/api/2.0/assets/#{asset_id}/tags"
-      uri = AJAX.post(connection, url, params, AJAX::CONTENT_TYPE::JSON)
-      @id = uri.split('/').last.to_i
+      url    = "/api/2.0/assets/#{asset_id}/tags"
+      uri    = AJAX.post(connection, url, params, AJAX::CONTENT_TYPE::JSON)
+      @id    = uri.split('/').last.to_i
     end
 
     # Adds a tag to a site
@@ -359,9 +352,9 @@ module Nexpose
     #
     def add_to_site(connection, site_id)
       params = to_json_for_add
-      url = "/api/2.0/sites/#{site_id}/tags"
-      uri = AJAX.post(connection, url, params, AJAX::CONTENT_TYPE::JSON)
-      @id = uri.split('/').last.to_i
+      url    = "/api/2.0/sites/#{site_id}/tags"
+      uri    = AJAX.post(connection, url, params, AJAX::CONTENT_TYPE::JSON)
+      @id    = uri.split('/').last.to_i
     end
 
     # Adds a tag to an asset group
@@ -372,11 +365,11 @@ module Nexpose
     #
     def add_to_group(connection, group_id)
       params = to_json_for_add
-      url = "/api/2.0/asset_groups/#{group_id}/tags"
-      uri = AJAX.post(connection, url, params, AJAX::CONTENT_TYPE::JSON)
-      @id = uri.split('/').last.to_i
+      url    = "/api/2.0/asset_groups/#{group_id}/tags"
+      uri    = AJAX.post(connection, url, params, AJAX::CONTENT_TYPE::JSON)
+      @id    = uri.split('/').last.to_i
     end
-    alias_method :add_to_asset_group, :add_to_group
+    alias add_to_asset_group add_to_group
 
     private