sensu-plugins-http 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92905de82a44c0638bb189e1212f248ccb9d321b
-  data.tar.gz: 3527f6eb5297442a8e5d3bab82bedb80f3c86f1c
+  metadata.gz: ca57c0e31d8ed570c39220d5e53e58f0f0ab1653
+  data.tar.gz: 4bb90f34c4cbe01c73620dc70d0cee45049f0a9d
 SHA512:
-  metadata.gz: c5f558b70bf011ec045756b0099649590ca48404682943a656cfa13e87e8239f3a360b93cfbb5f766c8dc783db3b61fa6ab0077018b098c11ec3ba9e8a47d1ab
-  data.tar.gz: 881cc591aadf86025f7d3281c7c6c39d8bab2a7eaceabc19914f17f594a7a8a3915702383625b203464b213fb9f0c70bb4499962596a46a53c05a5b76ad5eda5
+  metadata.gz: 05165b0c233127001b007ca723bd3dec67e911b3f8eb3fa98c65d45421a64c6b69b18c411c5944914a1da0492f2252143297f88df118d0cafc8794b6c381d81b
+  data.tar.gz: b216a8da06a548df33a1a64a8faf70db40524e95928663d40a05624ba7034bf6ebad2529e5b4fe1ad2e0fb5ffd585c6ff5fe56015573db07d5ec4acffa54d726

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.4.0] - 2017-06-19
+### Added
+- Initial set of tests for `check-https-cert.rb` (@pgporada)
+- `check-https-cert.rb`: Allow checking for a successfully expired certificate (@pgporada)
+
 ## [2.3.0] - 2017-06-01
 ### Added
 - check-http.rb: support PUT requests (@majormoses)
@@ -134,7 +139,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.4.0...HEAD
+[2.4.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.3.0...2.4.0
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.2.0...2.3.0
 [2.2.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-http/compare/2.0.2...2.1.0

data/README.md

@@ -21,10 +21,12 @@
 
 ## Usage
 
-check-head-redirect.rb and check-last-modified.rb can be used in conjunction with AWS to pull configuration from a specific bucket and file.
+`check-head-redirect.rb` and `check-last-modified.rb` can be used in conjunction with AWS to pull configuration from a specific bucket and file.
 
 This is helpful if you do not want to configure connection information as an argument to the sensu checks. If a bucket and key are specified that the environment the sensu check executes in has access to, or you provide an AWS key and token, the checks will pull the specified JSON file from S3 and merge the JSON config in to the current check configuration.
 
+`check-https-cert.rb` can be used to test for valid and successfully expired certs, amongst other things.
+
 ## Installation
 
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
@@ -32,4 +34,4 @@ This is helpful if you do not want to configure connection information as an arg
 ## Notes
 
 ### check-http.rb and check-https-cert.rb
-This check is not really geared to check all of the complexities of ssl which is why there is a separate repo and set of checks for that: https://github.com/sensu-plugins/sensu-plugins-ssl. If you are trying to say verify cert exipiration you will notice that in some cases it does not do what you always expect it to do. For example it might appear that when using using `-k` option you see different expiration times. This is due to the fact that when using `-k` it does not check expiration of all of the certs in the chain. Rather than duplicate this behavior in this check use the other repo where we handle those more complicated ssl checks better. For more information see: https://github.com/sensu-plugins/sensu-plugins-http/issues/67
+This check is not really geared to check all of the complexities of ssl which is why there is a separate repo and set of checks for that: https://github.com/sensu-plugins/sensu-plugins-ssl. If you are trying to say verify cert exipiration you will notice that in some cases it does not do what you always expect it to do. For example it might appear that when using using `-k` option you see different expiration times. This is due to the fact that when using `-k` it does not check expiration of all of the certs in the chain. Rather than duplicate this behavior in this check use the other repo where we handle those more complicated ssl checks better. For more information see: https://github.com/sensu-plugins/sensu-plugins-http/issues/67

data/bin/check-https-cert.rb

@@ -24,11 +24,17 @@
 #   Check an insecure certificate that will warn 1 week prior and critical 3 days prior
 #      ./check-https-cert.rb -u https://my.site.com -k -w 7 -c 3
 #
+#   Check that a certificate has successfully expired
+#      ./check-https-cert.rb -u https://my.site.com -k -e
+#
 # NOTES:
 #
 # LICENSE:
 #   Copyright 2014 Rhommel Lamas <roml@rhommell.com>
-#   Updated by Phil Porada 2017 to provide more clear documentation and messages
+#   Updated 2017 Phil Porada <philporada@gmail.com>
+#     - Provide more clear usage documentation and messages
+#     - Added check for successfully expired certificate
+#     - Added long flags
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 #
@@ -60,8 +66,16 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
          default: 25,
          description: 'Critical EXPIRE days before cert expires'
 
+  option :expired,
+         short: '-e',
+         long: '--expired',
+         boolean: true,
+         description: 'Expect certificate to be expired',
+         default: false
+
   option :insecure,
          short: '-k',
+         long: '--insecure',
          boolean: true,
          description: 'Enabling insecure connections',
          default: false
@@ -81,14 +95,24 @@ class CheckHttpCert < Sensu::Plugin::Check::CLI
     end
     days_until = ((@cert.not_after - Time.now) / (60 * 60 * 24)).to_i
 
-    if days_until <= 0
-      critical "TLS/SSL certificate expired #{days_until.abs} days ago."
-    elsif days_until < config[:critical].to_i
-      critical "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
-    elsif days_until < config[:warning].to_i
-      warning "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
-    else
-      ok "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
+    if config[:expired]
+      if days_until >= 0
+        critical "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
+      else
+        ok "TLS/SSL certificate expired #{days_until.abs} days ago."
+      end
+    end
+
+    unless config[:expired]
+      if days_until <= 0
+        critical "TLS/SSL certificate expired #{days_until.abs} days ago."
+      elsif days_until < config[:critical].to_i
+        critical "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
+      elsif days_until < config[:warning].to_i
+        warning "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
+      else
+        ok "TLS/SSL certificate expires on #{@cert.not_after} - #{days_until} days left."
+      end
     end
   rescue
     critical "Could not connect to #{config[:url]}"

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

@@ -1,7 +1,7 @@
 module SensuPluginsHttp
   module Version
     MAJOR = 2
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-http
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin