Revert "Only Cleanup!" #293
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Sep 6, 2017
| 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| |
| @@ -172,23 +174,22 @@ class SMTPAlert | |||
| attr_accessor :recipients, :sender, :verbose | |||
|
|
|||
| def initialize(name, sender, server, recipients, enabled = 1, max_alerts = -1, verbose = 0) | |||
| unless recipients.is_a?(Array) && !recipients.empty? | |||
| unless recipients.is_a?(Array) && recipients.length > 0 | |||
There was a problem hiding this comment.
Use recipients.length.positive? instead of recipients.length > 0.
Use !empty? instead of length > 0.
| 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.key?(:name) || hash[:name].to_s == '' | ||
| raise 'Alert name cannot be empty.' if !hash.has_key?(:name) || hash[:name].to_s == '' |
There was a problem hiding this comment.
Use Hash#key? instead of Hash#has_key?.
| @@ -130,10 +130,12 @@ def validate | |||
| raise ArgumentError.new('Vuln filter is a required attribute.') unless @vuln_filter | |||
| end | |||
|
|
|||
| private | |||
| yield | ||
| ensure | ||
| set_rows(nsc, pref, orig) | ||
| begin |
| @@ -15,7 +15,7 @@ module AJAX | |||
| # Content type strings acceptect by Nexpose. | |||
| # | |||
| module CONTENT_TYPE | |||
| XML = 'text/xml; charset=UTF-8' | |||
| XML = 'text/xml; charset=UTF-8' | |||
There was a problem hiding this comment.
Freeze mutable objects assigned to constants.
|
It wasn't only cleanup.... |
houndci-bot
reviewed
Sep 6, 2017
| @@ -53,8 +54,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}) | |||
There was a problem hiding this comment.
Space inside { missing.
Redundant curly braces around a hash parameter.
Space inside } missing.
| response = AJAX.put(self, uri) | ||
| response.eql?('true') | ||
| response.eql?("true") |
There was a problem hiding this comment.
Prefer single-quoted strings when you don't need string interpolation or special symbols.
| @@ -10,7 +10,8 @@ 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}) | |||
There was a problem hiding this comment.
Space inside { missing.
Redundant curly braces around a hash parameter.
Space inside } missing.
| ON = 'poweredOn' | ||
| OFF = 'poweredOff' | ||
| ON = 'poweredOn' | ||
| OFF = 'poweredOff' |
There was a problem hiding this comment.
Freeze mutable objects assigned to constants.
| end | ||
|
|
||
| module Value | ||
| module PowerState | ||
| ON = 'poweredOn' | ||
| OFF = 'poweredOff' | ||
| ON = 'poweredOn' |
There was a problem hiding this comment.
Freeze mutable objects assigned to constants.
| @name, @address, @user, @password = name, address, user, password | ||
| @protocol = Protocol::HTTPS | ||
| @exchange_hostname = '' # nexpose will set to office365 server | ||
| @exchange_username, @exchange_password = exchange_username, exchange_password |
| @type = Type::ACTIVESYNC_OFFICE365 | ||
| @id = -1 | ||
| @port = 443 # Port not used for mobile connection | ||
| @name, @address, @user, @password = name, address, user, password |
| @port = 443 # Port not used for mobile connection | ||
| @name, @address, @user, @password = name, address, user, password | ||
| @protocol = Protocol::HTTPS | ||
| @exchange_hostname, @exchange_username, @exchange_password = exchange_hostname, exchange_username, exchange_password |
| @type = Type::ACTIVESYNC_POWERSHELL | ||
| @id = -1 | ||
| @port = 443 # Port not used for mobile connection | ||
| @name, @address, @user, @password = name, address, user, password |
| end | ||
| end | ||
|
|
||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #292