Only Cleanup!! v3 #295

sgreen-r7 · 2017-09-06T18:32:14Z

This time for real, only cleanup/formatting fixes.

Link to %Q{ converting to %( info

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/web_credentials.rb

-        @loginURL = loginURL
+        @name           = name
+        @baseURL        = baseURL
+        @loginURL       = loginURL


Use snake_case for variable names.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/web_credentials.rb

-        @baseURL = baseURL
-        @loginURL = loginURL
+        @name           = name
+        @baseURL        = baseURL


Use snake_case for variable names.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/web_credentials.rb

-        @baseURL = baseURL
+        @headers        = {}
+        @name           = name
+        @baseURL        = baseURL


Use snake_case for variable names.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/web_credentials.rb

@@ -4,22 +4,21 @@ module Nexpose
  module WebCredentials

    module WebAppAuthType
-      HTML_FORM = 'htmlform'  # Represent HTML form credentials.
+      HTML_FORM   = 'htmlform' # Represent HTML form credentials.


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/vuln_exception.rb

-      ALL_INSTANCES_IN_A_SPECIFIC_SITE = 'All Instances in a Specific Site'
+      ALL_INSTANCES                       = 'All Instances'
+      ALL_INSTANCES_ON_A_SPECIFIC_ASSET   = 'All Instances on a Specific Asset'
+      ALL_INSTANCES_IN_A_SPECIFIC_SITE    = 'All Instances in a Specific Site'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/vuln_exception.rb

-      DELETED = 'Deleted'
+      APPROVED     = 'Approved'
+      REJECTED     = 'Rejected'
+      DELETED      = 'Deleted'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/vuln_exception.rb

-      REJECTED = 'Rejected'
-      DELETED = 'Deleted'
+      APPROVED     = 'Approved'
+      REJECTED     = 'Rejected'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T18:32:49Z

lib/nexpose/vuln_exception.rb

-      APPROVED = 'Approved'
-      REJECTED = 'Rejected'
-      DELETED = 'Deleted'
+      APPROVED     = 'Approved'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T18:32:50Z

lib/nexpose/vuln_exception.rb

-          Nexpose::VulnException::Status.const_get(name).to_s.downcase==status.downcase || status.to_sym.downcase == name.downcase
-        end
+    def status_string_to_constant(status)
+      Nexpose::VulnException::Status.constants.find do |name|


Prefer detect over find.

houndci-bot · 2017-09-06T18:32:50Z

lib/nexpose/vuln_exception.rb

-        valid_status << Nexpose::VulnException::Status.constants.map(&:to_s).map(&:downcase)
-        valid_status.flatten.map(&:downcase).include?(status.downcase)
-      end
+    def is_valid_vuln_exception_status?(status)


Rename is_valid_vuln_exception_status? to valid_vuln_exception_status?.

houndci-bot · 2017-09-06T21:26:09Z

lib/nexpose/silo_profile.rb

        end
      end

      unless @restricted_report_sections.empty?
        sections = xml.add_element('RestrictedReportSections')
        @restricted_report_sections.each do |section|
-          sections.add_element('RestrictedReportSection', {'name' => section})
+          sections.add_element('RestrictedReportSection', { 'name' => section })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:09Z

lib/nexpose/silo_profile.rb

        end
      end

      unless @restricted_report_formats.empty?
        formats = xml.add_element('RestrictedReportFormats')
        @restricted_report_formats.each do |format|
-          formats.add_element('RestrictedReportFormat', {'name' => format})
+          formats.add_element('RestrictedReportFormat', { 'name' => format })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:09Z

lib/nexpose/silo_profile.rb

        end
      end

      unless @licensed_modules.empty?
        licensed_modules = xml.add_element('LicensedModules')
        @licensed_modules.each do |licensed_module|
-          licensed_modules.add_element('LicensedModule', {'name' => licensed_module})
+          licensed_modules.add_element('LicensedModule', { 'name' => licensed_module })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:09Z

lib/nexpose/silo_profile.rb

        end
      end

      unless @global_scan_templates.empty?
        templates = xml.add_element('GlobalScanTemplates')
        @global_scan_templates.each do |template|
-          templates.add_element('GlobalScanTemplate', {'name' => template})
+          templates.add_element('GlobalScanTemplate', { 'name' => template })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:09Z

lib/nexpose/silo_profile.rb

        end
      end

      unless @global_scan_engines.empty?
        engines = xml.add_element('GlobalScanEngines')
        @global_scan_engines.each do |engine|
-          engines.add_element('GlobalScanEngine', {'name' => engine})
+          engines.add_element('GlobalScanEngine', { 'name' => engine })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:10Z

lib/nexpose/silo.rb

-        xml.add_attributes({'payment-application' => @payment_application, 'payment-version' => @payment_version, 'petroleum' => @petroleum, 'retail' => @retail, 'telecommunication' => @telecommunication, 'travel' => @travel})
+        xml.add_attributes({ 'acquirer-relationship' => @acquirer_relationship, 'agent-relationship' => @agent_relationship,
+                             'ecommerce' => @ecommerce, 'grocery' => @grocery, 'mail-order' => @mail_order })
+        xml.add_attributes({ 'payment-application' => @payment_application, 'payment-version' => @payment_version,


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:10Z

lib/nexpose/silo.rb

@@ -284,20 +283,22 @@ def self.parse(xml)
      def as_xml
        xml = super
        xml.name = 'Merchant'
-        xml.add_attributes({'acquirer-relationship' => @acquirer_relationship, 'agent-relationship' => @agent_relationship, 'ecommerce' => @ecommerce, 'grocery' => @grocery, 'mail-order' => @mail_order})
-        xml.add_attributes({'payment-application' => @payment_application, 'payment-version' => @payment_version, 'petroleum' => @petroleum, 'retail' => @retail, 'telecommunication' => @telecommunication, 'travel' => @travel})
+        xml.add_attributes({ 'acquirer-relationship' => @acquirer_relationship, 'agent-relationship' => @agent_relationship,


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:10Z

lib/nexpose/silo.rb

      end

      def as_xml
        xml = REXML::Element.new('Organization')
-        xml.add_attributes({'company' => @company, 'email-address' => @email, 'first-name' => @first_name, 'last-name' => @last_name, 'phone-number' => @phone, 'title' => @title, 'url' => @url})
+        xml.add_attributes({ 'company' => @company, 'email-address' => @email, 'first-name' => @first_name,


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:10Z

lib/nexpose/silo.rb

          address.country = xml.attributes['country']
        end
      end

      def as_xml
        xml = REXML::Element.new('Address')
-        xml.add_attributes({'city' => @city, 'country' => @country, 'line1' => @line1, 'line2' => @line2, 'state' => @state, 'zip' => @zip})
+        xml.add_attributes({ 'city' => @city, 'country' => @country, 'line1' => @line1, 'line2' => @line2, 'state' => @state, 'zip' => @zip })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T21:26:10Z

lib/nexpose/silo.rb

@@ -118,7 +116,8 @@ def delete(connection)

    def as_xml
      xml = REXML::Element.new('SiloConfig')
-      xml.add_attributes({'description' => @description, 'name' => @name, 'id' => @id, 'silo-profile-id' => @profile_id, 'max-assets' => @max_assets, 'max-users' => @max_users, 'max-hosted-assets' => @max_hosted_assets})
+      xml.add_attributes({ 'description' => @description, 'name' => @name, 'id' => @id, 'silo-profile-id' => @profile_id,


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:33Z

lib/nexpose/engine.rb

@@ -54,8 +53,8 @@ def update_engine(engine_id)
    #   each active scan on the engine.
    #
    def engine_activity(engine_id)
-      xml = make_xml('EngineActivityRequest', {'engine-id' => engine_id})
-      r = execute(xml)
+      xml = make_xml('EngineActivityRequest', { 'engine-id' => engine_id })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:33Z

lib/nexpose/engine.rb

@@ -10,8 +10,7 @@ class Connection
    # @return [Boolean] true if engine successfully deleted.
    #
    def delete_engine(engine_id, scope = 'silo')
-      xml = make_xml('EngineDeleteRequest',
-                     {'engine-id' => engine_id, 'scope' => scope})
+      xml = make_xml('EngineDeleteRequest', { 'engine-id' => engine_id, 'scope' => scope })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:33Z

lib/nexpose/discovery/filter.rb

-        ON = 'poweredOn'
-        OFF = 'poweredOff'
+        ON        = 'poweredOn'
+        OFF       = 'poweredOff'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:33Z

lib/nexpose/discovery/filter.rb

    end

    module Value
      module PowerState
-        ON = 'poweredOn'
-        OFF = 'poweredOff'
+        ON        = 'poweredOn'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:33Z

lib/nexpose/discovery/filter.rb

@@ -45,7 +45,7 @@ module Field
      INSTANCE_TYPE = 'INSTANCE_TYPE'

      # Valid Operators: IN, NOT_IN
-      REGION ='REGION'
+      REGION = 'REGION'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:34Z

lib/nexpose/group.rb

@@ -10,11 +10,11 @@ class Connection
    # @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 }))


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:34Z

lib/nexpose/global_blackout.rb

@@ -18,8 +18,7 @@ def save(nsc)

    def to_h
      {
-          blackouts:
-              (@blackout || []).map { |blackout| blackout.to_h }
+        blackouts: (@blackout || []).map { |blackout| blackout.to_h }


Pass &:to_h as an argument to map instead of a block.

houndci-bot · 2017-09-06T22:10:34Z

lib/nexpose/filter.rb

        # TODO: A problem in Nexpose causes these values to not be constant.
        METASPLOIT = 'type:"exploit_source_type", name:"2"'
-        DATABASE = 'type:"exploit_source_type", name:"1"'
+        DATABASE   = 'type:"exploit_source_type", name:"1"'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:34Z

lib/nexpose/filter.rb

      end

      # Constants for filtering on vulnerability exposure.
      module VulnerabilityExposure
-        MALWARE = 'type:"malware_type", name:"malwarekit"'
+        MALWARE    = 'type:"malware_type", name:"malwarekit"'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:34Z

lib/nexpose/filter.rb

-        UNKNOWN = '0'
-        VIRTUAL = '1'
+        UNKNOWN    = '0'
+        VIRTUAL    = '1'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:34Z

lib/nexpose/engine.rb

@@ -54,8 +53,8 @@ def update_engine(engine_id)
    #   each active scan on the engine.
    #
    def engine_activity(engine_id)
-      xml = make_xml('EngineActivityRequest', {'engine-id' => engine_id})
-      r = execute(xml)
+      xml = make_xml('EngineActivityRequest', { 'engine-id' => engine_id })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/engine.rb

@@ -10,8 +10,7 @@ class Connection
    # @return [Boolean] true if engine successfully deleted.
    #
    def delete_engine(engine_id, scope = 'silo')
-      xml = make_xml('EngineDeleteRequest',
-                     {'engine-id' => engine_id, 'scope' => scope})
+      xml = make_xml('EngineDeleteRequest', { 'engine-id' => engine_id, 'scope' => scope })


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/discovery/filter.rb

-        ON = 'poweredOn'
-        OFF = 'poweredOff'
+        ON        = 'poweredOn'
+        OFF       = 'poweredOff'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/discovery/filter.rb

    end

    module Value
      module PowerState
-        ON = 'poweredOn'
-        OFF = 'poweredOff'
+        ON        = 'poweredOn'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/discovery/filter.rb

@@ -45,7 +45,7 @@ module Field
      INSTANCE_TYPE = 'INSTANCE_TYPE'

      # Valid Operators: IN, NOT_IN
-      REGION ='REGION'
+      REGION = 'REGION'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/group.rb

@@ -10,11 +10,11 @@ class Connection
    # @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 }))


Redundant curly braces around a hash parameter.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/global_blackout.rb

@@ -18,8 +18,7 @@ def save(nsc)

    def to_h
      {
-          blackouts:
-              (@blackout || []).map { |blackout| blackout.to_h }
+        blackouts: (@blackout || []).map { |blackout| blackout.to_h }


Pass &:to_h as an argument to map instead of a block.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/filter.rb

        # TODO: A problem in Nexpose causes these values to not be constant.
        METASPLOIT = 'type:"exploit_source_type", name:"2"'
-        DATABASE = 'type:"exploit_source_type", name:"1"'
+        DATABASE   = 'type:"exploit_source_type", name:"1"'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:35Z

lib/nexpose/filter.rb

      end

      # Constants for filtering on vulnerability exposure.
      module VulnerabilityExposure
-        MALWARE = 'type:"malware_type", name:"malwarekit"'
+        MALWARE    = 'type:"malware_type", name:"malwarekit"'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-06T22:10:36Z

lib/nexpose/filter.rb

-        UNKNOWN = '0'
-        VIRTUAL = '1'
+        UNKNOWN    = '0'
+        VIRTUAL    = '1'


Freeze mutable objects assigned to constants.

houndci-bot · 2017-09-11T20:53:33Z

lib/nexpose/wait.rb

    end

    def integration_status_proc(nexpose_connection:, scan_id:, status:)
-      Proc.new { nexpose_connection.scan_status(scan_id).downcase == status.downcase }
+      proc { nexpose_connection.scan_status(scan_id).downcase == status.downcase }


Use casecmp instead of downcase ==.

houndci-bot · 2017-09-11T20:53:33Z

lib/nexpose/vuln_exception.rb

-        end
+    def status_string_to_constant(status)
+      Nexpose::VulnException::Status.constants.find do |name|
+        Nexpose::VulnException::Status.const_get(name).to_s.downcase == status.downcase || status.to_sym.downcase == name.downcase


Use casecmp instead of downcase ==.

cleanup for only cleanup PRs and branches

6e74751

houndci-bot reviewed Sep 6, 2017

View reviewed changes

convert string into int before .zero? check

f49fdbf

houndci-bot reviewed Sep 6, 2017

View reviewed changes

revert casecmp to downcase ==

3defbda

houndci-bot reviewed Sep 6, 2017

View reviewed changes

map blackout to hash

38e1c61

houndci-bot reviewed Sep 11, 2017

View reviewed changes

sgreen-r7 merged commit 88d1bcd into master Sep 11, 2017

sgreen-r7 deleted the cleanup_v3 branch September 11, 2017 22:07

Only Cleanup!! v3 #295

Only Cleanup!! v3 #295

Conversation

sgreen-r7 commented Sep 6, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sgreen-r7 commented Sep 6, 2017 •

edited

Loading