[CVE-2017-8418] - updating rubocop dependency.

Breaking Changes:
- removed ruby `< 2.1` support

Misc:
- appeased the cops

Signed-off-by: Ben Abrams <[email protected]>

Author: majormoses

.rubocop.yml

@@ -28,3 +28,12 @@ RegexpLiteral:
 
 Style/Documentation:
   Enabled: false
+
+# .match?() was added in ruby 2.4
+Performance/RegexpMatch:
+  Enabled: false
+
+## slow testing is oK
+Metrics/BlockLength:
+  Exclude:
+    - 'test/**/*'

.travis.yml

@@ -4,7 +4,6 @@ cache:
 install:
 - bundle install
 rvm:
-- 2.0
 - 2.1
 - 2.2
 - 2.3.0
@@ -28,7 +27,6 @@ deploy:
   on:
     tags: true
     all_branches: true
-    rvm: 2.0
     rvm: 2.1
     rvm: 2.2
     rvm: 2.3.0

CHANGELOG.md

@@ -5,6 +5,15 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+### Security
+- updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Breaking Changes
+- removed ruby `< 2.1` support (@majormoses)
+
+### Changed
+- appeased the cops (@majormoses)
+
 ## [3.6.0] - 2017-10-04
 ### Added
 - check-rabbitmq-queues-synchronised.rb: added new check if all mirrored queues are synchronised (@cyrilgdn)

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sensu-plugins-rabbitmq.gemspec

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'github/markup'
 require 'redcarpet'
@@ -7,9 +9,9 @@ require 'yard'
 require 'yard/rake/yardoc_task'
 
 YARD::Rake::YardocTask.new do |t|
-  OTHER_PATHS = %w().freeze
+  OTHER_PATHS = %w[].freeze
   t.files = ['lib/**/*.rb', 'bin/**/*.rb', OTHER_PATHS]
-  t.options = %w(--markup-provider=redcarpet --markup=markdown --main=README.md --files CHANGELOG.md)
+  t.options = %w[--markup-provider=redcarpet --markup=markdown --main=README.md --files CHANGELOG.md]
 end
 
 RuboCop::RakeTask.new
@@ -35,4 +37,4 @@ task :check_binstubs do
   end
 end
 
-task default: [:spec, :make_bin_executable, :yard, :rubocop, :check_binstubs]
+task default: %i[spec make_bin_executable yard rubocop check_binstubs]

bin/check-rabbitmq-alive.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ check alive plugin
 # ===
@@ -115,7 +116,7 @@ def vhost_alive?
       { 'status' => 'ok', 'message' => 'RabbitMQ server is alive' }
     rescue Errno::ECONNREFUSED => e
       { 'status' => 'critical', 'message' => e.message }
-    rescue => e
+    rescue StandardError => e
       { 'status' => 'unknown', 'message' => e.message }
     end
   end

bin/check-rabbitmq-amqp-alive.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ check amqp alive plugin
 # ===
@@ -142,7 +143,7 @@ def vhost_alive?
       { 'status' => 'critical', 'message' => 'Possible authentication failure' }
     rescue Bunny::TCPConnectionFailed
       { 'status' => 'critical', 'message' => 'TCP connection refused' }
-    rescue => e
+    rescue StandardError => e
       { 'status' => 'unknown', 'message' => e.message }
     end
   end

bin/check-rabbitmq-cluster-health.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ check cluster nodes health plugin
 # ===
@@ -161,7 +162,7 @@ def cluster_healthy?
       { 'status' => status, 'message' => message }
     rescue Errno::ECONNREFUSED => e
       { 'status' => 'critical', 'message' => e.message }
-    rescue => e
+    rescue StandardError => e
       { 'status' => 'unknown', 'message' => e.message }
     end
   end

bin/check-rabbitmq-consumers.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
 
 # Check RabbitMQ consumers
 # ===
@@ -109,19 +109,19 @@ def rabbit
         password: password,
         ssl: config[:ssl]
       )
-    rescue
+    rescue StandardError
       warning 'could not connect to rabbitmq'
     end
     connection
   end
 
   def return_condition(missing, critical, warning)
-    if critical.count > 0 || missing.count > 0
+    if critical.count.positive? || missing.count.positive?
       message = ''
-      message << "Queues in critical state: #{critical.join(', ')}. " if critical.count > 0
-      message << "Queues missing: #{missing.join(', ')}" if missing.count > 0
+      message << "Queues in critical state: #{critical.join(', ')}. " if critical.count.positive?
+      message << "Queues missing: #{missing.join(', ')}" if missing.count.positive?
       critical(message)
-    elsif warning.count > 0
+    elsif warning.count.positive?
       warning("Queues in warning state: #{warning.join(', ')}")
     else
       ok
@@ -154,7 +154,7 @@ def run
         critical.push(queue['name']) if consumers <= config[:critical]
         warn.push(queue['name']) if consumers <= config[:warn]
       end
-    rescue
+    rescue StandardError
       critical 'Could not find any queue, check rabbitmq server'
     end
     return_condition(missing, critical, warn)

bin/check-rabbitmq-messages.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # Check RabbitMQ Messages
 # ===
@@ -112,7 +113,7 @@ def acquire_rabbitmq_info
         password: password,
         ssl: config[:ssl]
       )
-    rescue
+    rescue StandardError
       warning 'Could not connect to rabbitmq'
     end
     rabbitmq_info

bin/check-rabbitmq-network-partitions.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ Network Partitions Check
 # ===
@@ -68,7 +69,7 @@ def run
     ok 'no network partition detected'
   rescue Errno::ECONNREFUSED => e
     critical e.message
-  rescue => e
+  rescue StandardError => e
     unknown e.message
   end
 

bin/check-rabbitmq-node-health.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ check node health plugin
 # ===
@@ -215,7 +216,7 @@ def node_healthy?
       { 'status' => status, 'message' => message }
     rescue Errno::ECONNREFUSED => e
       { 'status' => 'critical', 'message' => e.message }
-    rescue => e
+    rescue StandardError => e
       { 'status' => 'unknown', 'message' => e.message }
     end
   end

bin/check-rabbitmq-node-usage.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby -W0
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ check node health plugin
 # ===
@@ -72,7 +73,7 @@ class CheckRabbitMQNodeUsage < Sensu::Plugin::Check::CLI
          description: 'Resource type',
          required: true,
          long: '--type TYPE',
-         in: %w(mem socket fd proc disk)
+         in: %w[mem socket fd proc disk]
 
   option :memwarn,
          description: 'Warning % of mem usage vs high watermark',
@@ -179,7 +180,7 @@ def node_healthy?
     end
 
     { 'status' => output[:status], 'message' => output[:message] }
-  rescue => e
+  rescue StandardError => e
     { 'status' => 'unknown', 'message' => e.message }
   end
 

bin/check-rabbitmq-queue-drain-time.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ Queue Drain Time
 # ===
@@ -106,7 +107,7 @@ def acquire_rabbitmq_queues
         password: password,
         ssl: config[:ssl]
       )
-    rescue
+    rescue StandardError
       warning 'could not get rabbitmq queue info'
     end
 
@@ -125,10 +126,10 @@ def run
 
     acquire_rabbitmq_queues.each do |queue|
       # we don't care about empty queues and they'll have an infinite drain time so skip them
-      next if queue['messages'] == 0 || queue['messages'].nil?
+      next if queue['messages'].zero? || queue['messages'].nil?
 
       # handle rate of zero which is an infinite time until empty
-      if queue['backing_queue_status']['avg_egress_rate'].to_f == 0
+      if queue['backing_queue_status']['avg_egress_rate'].to_f.zero?
         crit_queues[queue['name']] = 'Infinite (drain rate = 0)'
         next
       end

bin/check-rabbitmq-queue.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: false
+
 #
 # Check RabbitMQ Queue Messages
 # ===
@@ -22,13 +23,15 @@
 # for details.
 
 require 'sensu-plugins-rabbitmq'
+require 'sensu-plugin/check/cli'
 
 # main plugin class
-class CheckRabbitMQMessages < Sensu::Plugin::RabbitMQ::Check
+class CheckRabbitMQQueue < Sensu::Plugin::Check::CLI
   option :queue,
          description: 'RabbitMQ queue to monitor',
          long: '--queue queue_names',
          required: true,
+         # not sure if there is a better way to handle frozen strings
          proc: proc { |a| a.split(',') }
 
   option :warn,

bin/check-rabbitmq-queues-synchronised.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # Check RabbitMQ Queues Synchronised
 # ===
@@ -55,7 +56,7 @@ def run
     end
   rescue Errno::ECONNREFUSED => e
     critical e.message
-  rescue => e
+  rescue StandardError => e
     unknown e.message
   end
 

bin/check-rabbitmq-stomp-alive.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ check alive plugin
 # ===
@@ -118,7 +119,7 @@ def vhost_alive?
       { 'status' => 'critical', 'message' => 'TCP connection refused' }
     rescue Stomp::Error::BrokerException => e
       { 'status' => 'critical', 'message' => "Error from broker. Check auth details? #{e.message}" }
-    rescue => e
+    rescue StandardError => e
       { 'status' => 'unknown', 'message' => "#{e.class}: #{e.message}" }
     end
   end

bin/metrics-rabbitmq-exchange.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ Exchange Metrics
 # ===

bin/metrics-rabbitmq-overview.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ Overview Metrics
 # ===
@@ -99,7 +100,7 @@ def acquire_rabbitmq_info
         password: password,
         ssl: config[:ssl]
       )
-    rescue
+    rescue StandardError
       warning 'could not get rabbitmq info'
     end
     rabbitmq_info

bin/metrics-rabbitmq-queue.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #
 # RabbitMQ Queue Metrics
 # ===

lib/sensu-plugins-rabbitmq.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby_dig'
 
 require 'sensu-plugins-rabbitmq/version'

lib/sensu-plugins-rabbitmq/check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'sensu-plugin/check/cli'
 require 'sensu-plugins-rabbitmq/rabbitmq'
 

lib/sensu-plugins-rabbitmq/metrics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sensu-plugin/metric/cli'
 require 'socket'
 require 'sensu-plugins-rabbitmq/rabbitmq'

lib/sensu-plugins-rabbitmq/rabbitmq.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'carrot-top'
 require 'inifile'
 
@@ -66,7 +68,7 @@ def acquire_rabbitmq_info(property = nil)
               password: password,
               ssl: config[:ssl]
             )
-          rescue
+          rescue StandardError
             warning 'could not get rabbitmq info'
           end