sensu-plugins-http 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88ff01536d3762c191dbaa90aebc957dc204a196cb09426e906f3b3382217e13
-  data.tar.gz: c4dfe411edd79a341a79db744ce95473d82fdb9b831690b165553ec9e0586cf0
+  metadata.gz: 8e03ef72ab14b7f7a93a10c52cb7ead9d2500647488d1bcc6995ce9d93e30821
+  data.tar.gz: 4d34a2e7756ba91bd4e12f827627e71841c4775447414c0c6d9c6945385c4844
 SHA512:
-  metadata.gz: ea9038170f563bf80d25dda0ee53e59a8daf143e73147d523b74f3f64858d1474fdbeea64f8f6a423e5e865d3dc749f8b6b5a382e954c3b29c60d7ae6b8cbe22
-  data.tar.gz: da62f1a6be047b11e8bed39366b649439a99d8152e7b786ec9cd9b512277a1389ae67df552453858eb545f0f1ee15261220c85cd46b01f8239f5a0833a57d26c
+  metadata.gz: b90771c763a8f96302c405538017cf8e0c34dfdf8a0f5f4401700caf9b8907d5f748c2bdf608a0c4eb875a459ba8795122ced7f12d9c69cb6fe5ebe0d23e5af0
+  data.tar.gz: 9c1652f1423ad96a20c36c925a51719e39c96a98df649e3fd4d7fcb70a1cd37df3ff69b16f4c7adcbbfca2b754d9eda28f95555b89600581f91bdc8e2cdeb773

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [2.8.1] 2018-03-07
+### Security
+- updated rubocop dependency to `~> 0.51.0` per: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-8418. (@majormoses)
+
+### Changed
+- appeased the cops, updated cop config, and created TODOs for refactoring (@majormoses)
+
 ## [2.8.0] 2018-02-17
 ### Added
 - Add new options `--dump-json` to dump json response on failure when enable. default: false (@jplindquist)
@@ -163,7 +170,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.8.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.8.1...HEAD
+[2.8.1]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.8.0...2.8.1
 [2.8.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.7.0...2.8.0
 [2.7.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.6.0...2.7.0
 [2.6.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.5.0...2.6.0

data/bin/check-head-redirect.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-head-redirect
 #

data/bin/check-http-cors.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-http-cors
 #
@@ -79,7 +81,7 @@ class CheckCORS < Sensu::Plugin::Check::CLI
       end
     rescue Timeout::Error
       critical 'Connection timed out'
-    rescue => e
+    rescue StandardError => e
       critical "Connection error: #{e.message}"
     end
   end

data/bin/check-http-json.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-http-json
 #
@@ -90,7 +92,7 @@ class CheckJson < Sensu::Plugin::Check::CLI
       end
     rescue Timeout::Error
       critical 'Connection timed out'
-    rescue => e
+    rescue StandardError => e
       critical "Connection error: #{e.message}"
     end
   end
@@ -202,7 +204,7 @@ class CheckJson < Sensu::Plugin::Check::CLI
       end
 
       ok message
-    rescue => e
+    rescue StandardError => e
       if config[:dump_json]
         json_response = config[:pretty] ? JSON.pretty_generate(json) : json
         message = "key check failed: #{e}. Response: #{json_response}"

data/bin/check-http.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-http
 #
@@ -90,7 +92,7 @@ class CheckHttp < Sensu::Plugin::Check::CLI
          short: '-m GET|POST',
          long: '--method GET|POST|PUT',
          description: 'Specify a GET, POST, or PUT operation; defaults to GET',
-         in: %w(GET POST PUT),
+         in: %w[GET POST PUT],
          default: 'GET'
 
   option :header,
@@ -245,7 +247,7 @@ class CheckHttp < Sensu::Plugin::Check::CLI
       end
     rescue Timeout::Error
       critical 'Request timed out'
-    rescue => e
+    rescue StandardError => e
       critical "Request error: #{e.message}"
     end
   end
@@ -393,12 +395,11 @@ class CheckHttp < Sensu::Plugin::Check::CLI
       warning(res.code + body) unless config[:response_code]
     end
 
-    if config[:response_code]
-      if config[:response_code] == res.code
-        ok "#{res.code}, #{size} bytes" + body
-      else
-        critical res.code + body
-      end
+    if config[:response_code] && config[:response_code] == res.code
+      ok "#{res.code}, #{size} bytes" + body
+
+    else
+      critical res.code + body
     end
   end
 end

data/bin/check-https-cert.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-https-cert
 #
@@ -114,7 +116,7 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
         ok "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
       end
     end
-  rescue
+  rescue StandardError
     critical "Could not connect to #{config[:url]}"
   end
 end

data/bin/check-last-modified.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   check-fleet-units
 #

data/bin/metrics-curl.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metrics-curl
 #
@@ -57,7 +59,7 @@ class CurlMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def run
     cmd = "curl --silent --output /dev/null #{config[:curl_args]} "
-    cmd += '-w "%{time_total},%{time_namelookup},%{time_connect},%{time_pretransfer},%{time_redirect},%{time_starttransfer},%{http_code}" '
+    cmd += '-w %{time_total},%{time_namelookup},%{time_connect},%{time_pretransfer},%{time_redirect},%{time_starttransfer},%{http_code}" '
     cmd += config[:url]
 
     output = `#{cmd}`

data/bin/metrics-http-json-deep.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   metrics-http-json-deep
 #
@@ -83,7 +85,7 @@ class JsonDeepMetrics < Sensu::Plugin::Metric::CLI::Graphite
       if value.is_a?(Hash)
         deep_value(value, "#{scheme}.#{ekey}")
       else
-        output "#{scheme}.#{ekey}", value unless config[:numonly] && !value.is_a?(Fixnum)
+        output "#{scheme}.#{ekey}", value unless config[:numonly] && !value.is_a?(Integer)
       end
     end
   end
@@ -113,7 +115,7 @@ class JsonDeepMetrics < Sensu::Plugin::Metric::CLI::Graphite
           connection.request(request)
         end
       end
-    end # until
+    end
 
     metrics = Oj.load(response.body, mode: :compat)
     deep_value(metrics[config[:root]], config[:scheme])

data/bin/metrics-http-json.rb

@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
-#  encoding: UTF-8
+# frozen_string_literal: true
+
 #   metrics-http-json.rb
 #
 # DESCRIPTION:
@@ -70,7 +71,8 @@ class HttpJsonGraphite < Sensu::Plugin::Metric::CLI::Graphite
     if config[:object]
       object = config[:object].to_s
     end
-    url = URI.encode(config[:url].to_s)
+    # TODO: figure out what to do here
+    url = URI.encode(config[:url].to_s) # rubocop:disable Lint/UriEscapeUnescape
     begin
       r = RestClient.get url
       metric_pair_array = metric_pair_input.split(/,/)

data/lib/sensu-plugins-http.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-http/version'
 require 'sensu-plugins-http/common'
 require 'sensu-plugins-http/aws-v4'

data/lib/sensu-plugins-http/aws-v4.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SensuPluginsHttp
   module AwsV4
     # Returns a modified request object with AWS v4 signature headers

data/lib/sensu-plugins-http/common.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Common
   def initialize
@@ -6,9 +7,11 @@ module Common
   end
 
   def aws_config
-    Aws.config.update(
-      credentials: Aws::Credentials.new(config[:aws_access_key_id], config[:aws_secret_access_key])
-    ) if config[:aws_access_key_id] && config[:aws_secret_access_key]
+    if config[:aws_access_key_id] && config[:aws_secret_access_key]
+      Aws.config.update(
+        credentials: Aws::Credentials.new(config[:aws_access_key_id], config[:aws_secret_access_key])
+      )
+    end
 
     Aws.config.update(
       region: config[:aws_region]
@@ -25,7 +28,7 @@ module Common
       resp = s3.get_object(bucket: config[:s3_config_bucket], key: config[:s3_config_key])
       s3_config = JSON.parse(resp.body.read, symbolize_names: true)
       config.merge!(s3_config)
-    rescue
+    rescue StandardError
       critical 'Error getting config file from s3'
     end
   end

data/lib/sensu-plugins-http/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SensuPluginsHttp
   module Version
     MAJOR = 2
     MINOR = 8
-    PATCH = 0
+    PATCH = 1
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-http
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -95,165 +95,165 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: kitchen-localhost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: kitchen-vagrant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: kitchen-vagrant
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.51.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
-  name: kitchen-localhost
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0.8'
 description: |-
   This plugin provides native HTTP instrumentation
                                 for monitoring and metrics collection, including: