ssl_expiry 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fdb65705e9581b535c9f95c49af80e877986f5c81d3c04fec43461b0cabb996
-  data.tar.gz: 5a845d4782168e0b5dcaaa3a5e773dbd5c9642e5a567592bcf7b7301efc4b66a
+  metadata.gz: 96cbba1150d51acb0a1f4d27f9634e3b7f92f2ea4fa4f41bae2e848484a0c078
+  data.tar.gz: 5c0cb052de1b6da7e3881dcbc7aafafa048e991404c9c535f9a401c9248e3c85
 SHA512:
-  metadata.gz: ecd76b1f645446801da8a509c38152dfe3b6f8446f035b38090a3afc5b7e552fa4480b91d27632f943e6b6c97146c5f167a509569fe4ce57ddb66b0396dd3af8
-  data.tar.gz: 49d2ce2be9e83d3884f68de032ed23b186ea319525157444851f81ef8fb6e43631b150e750821d4f2ee739467ac35419791c6ea73c08289811fb75d6219c5f4e
+  metadata.gz: c86634f01a0cb849634e2ba8b5d0eac5f931f8193a928a1d6584f926679e6d49b6772f3af77e3f161bd38bc9d2ee5a29c9436dc0030c2d8b1cdf7983851874f9
+  data.tar.gz: 7038c81c4247218ae59484d62e853b892135ae52ec2ef2e66d1f207c9ec55dd250dcbe93f0facf1bbbdde89604c1e88a444574baf25bcbd8619f06f5d306e11e

data/.rubocop.yml

@@ -1,23 +1,23 @@
 Layout/IndentationWidth:
   Width: 4
 
-Metrics/AbcSize:
-  Max: 50
+Layout/LineLength:
+  Enabled: false
 
-Metrics/LineLength:
+Metrics/AbcSize:
   Enabled: false
 
 Metrics/BlockLength:
-  Max: 40
+  Enabled: false
 
 Metrics/CyclomaticComplexity:
-  Max: 20
+  Enabled: false
 
 Metrics/MethodLength: 
-  Max: 60
+  Enabled: false
 
 Metrics/PerceivedComplexity:
-  Max: 20
+  Enabled: false
 
 Style/GlobalVars:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.3 (February 7, 2020)
+
+IMPROVEMENTS:
+
+* Allow the specification of a custom port. ([@TGWolf][])
+
 ## 1.0.2 (June 28, 2019)
 
 IMPROVEMENTS:

data/README.md

@@ -72,6 +72,14 @@ There is a command line tool included with this gem.
   ----------------------------------------------------------------------------------------------------
 ```
 
+### Custom port
+
+If you want to check an SSL expiry on a custom port you can do this by adding the port to the end of the domain.
+
+```
+  check-ssl -d antiphoton.com:8080
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/ssl_expiry.rb

@@ -14,18 +14,25 @@ module SSLExpiry
     # Docs to follow
     #
     class SSLExpiry
-        def self.get_cert(domain_name, verify = false)
+        def self.get_cert(domain_name, supplied_port = nil, verify = false)
             begin
                 cert = nil
 
                 uri = URI::HTTPS.build(host: domain_name)
-                http = Net::HTTP.new(uri.host, uri.port)
+
+                port = if supplied_port.nil?
+                           uri.port
+                       else
+                           supplied_port
+                       end
+
+                http = Net::HTTP.new(uri.host, port)
 
                 http.use_ssl = true
                 http.verify_mode = verify ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
-                http.open_timeout = 10
-                http.read_timeout = 10
-                http.ssl_timeout  = 10
+                http.open_timeout = 5
+                http.read_timeout = 5
+                http.ssl_timeout  = 5
 
                 http.start do |h|
                     cert = h.peer_cert
@@ -48,7 +55,13 @@ module SSLExpiry
 
             domains.each do |domain|
                 begin
-                    cert = get_cert(domain)
+                    parts = domain.split(':')
+
+                    cert = if parts.length == 2
+                               get_cert(parts[0], parts[1])
+                           else
+                               get_cert(parts[0])
+                           end
                 rescue SSLError => e
                     results[domain] = { 'status' => 400, 'error' => e.message }
                     next
@@ -72,7 +85,7 @@ module SSLExpiry
             delim = '-' * width
 
             puts(delim)
-            printf(" %-30s | %s\n", 'Domain', 'Status')
+            printf(" %-30<header1>s | %<header2>s\n", header1: 'Domain', header2: 'Status')
             puts(delim)
             results.each do |domain, details|
                 status = if details['status'] == 400
@@ -80,7 +93,7 @@ module SSLExpiry
                          else
                              format('expires on %<expires_in>s (in %<expires_on>s days) [CN=%<common_name>s]', expires_in: details['expires_on'], expires_on: details['expires_in'], common_name: details['common_name'])
                          end
-                printf(" %-30s | %s\n", domain, status)
+                printf(" %-30<domain>s | %<status>s\n", domain: domain, status: status)
             end
             puts(delim)
         end

data/lib/ssl_expiry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SSLExpiry
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
 end

data/testing/check-ssl

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+require 'optparse'
+require 'ssl_expiry'
+
+# -------------------------------------------------------------------------------- #
+# Process Arguments                                                                #
+# -------------------------------------------------------------------------------- #
+# This function will process the input from the command line and work out what it  #
+# is that the user wants to see.                                                   #
+#                                                                                  #
+# This is the main processing function where all the processing logic is handled.  #
+# -------------------------------------------------------------------------------- #
+
+def process_arguments
+    options = {}
+    # Enforce the presence of
+    mandatory = %I[domain]
+
+    optparse = OptionParser.new do |opts|
+        opts.banner = "Usage: #{$PROGRAM_NAME}"
+
+        opts.on('-h', '--help', 'Display this screen') do
+            puts opts
+            exit(1)
+        end
+        opts.on('-d', '--domain string', 'The domain name to check') do |domain|
+            options[:domain] = domain
+        end
+    end
+
+    begin
+        optparse.parse!
+        options[:message] = ARGF.read unless STDIN.tty? # override message parameter if data is piped in
+        missing = mandatory.select { |param| options[param].nil? }
+        raise OptionParser::MissingArgument.new(missing.join(', ')) unless missing.empty?
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+        puts e.to_s
+        puts optparse
+        exit
+    end
+
+    results = SSLExpiry::SSLExpiry.check_certificates(options[:domain])
+    SSLExpiry::SSLExpiry.display_results(results)
+end
+
+# -------------------------------------------------------------------------------- #
+# Main()                                                                           #
+# -------------------------------------------------------------------------------- #
+# The main function where all of the heavy lifting and script config is done.      #
+# -------------------------------------------------------------------------------- #
+
+def main
+    process_arguments
+end
+
+main
+
+# -------------------------------------------------------------------------------- #
+# End of Script                                                                    #
+# -------------------------------------------------------------------------------- #
+# This is the end - nothing more to see here.                                      #
+# -------------------------------------------------------------------------------- #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssl_expiry
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tim Gurney aka Wolf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - spec/spec_helper.rb
 - spec/ssl_expiry_spec.rb
 - ssl_expiry.gemspec
+- testing/check-ssl
 homepage: https://github.com/AntiPhotonltd/ssl_expiry
 licenses:
 - MIT
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A simple gem checking for ssl expiry.