litmus_paper 0.0.3 → 0.1.0

data/config.ru

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('lib', File.dirname(__FILE__))
 require 'litmus_paper'
 
-use Rack::CommonLogger, LitmusPaper::Logger.new
+use Rack::CommonLogger, LitmusPaper.logger
 run LitmusPaper::App

data/lib/litmus_paper/configuration.rb

@@ -6,6 +6,7 @@ module LitmusPaper
     end
 
     def evaluate(file = @config_file_path)
+      LitmusPaper.logger.info "Loading file #{file}"
       config_contents = File.read(file)
       instance_eval(config_contents)
       @services
@@ -13,6 +14,8 @@ module LitmusPaper
 
     def include_files(glob_pattern)
       full_glob_pattern = File.expand_path(glob_pattern, File.dirname(@config_file_path))
+      LitmusPaper.logger.info "Searching for files matching: #{full_glob_pattern}"
+
       Dir.glob(full_glob_pattern).each do |file|
         evaluate(file)
       end

data/lib/litmus_paper/dependency/http.rb

@@ -5,12 +5,20 @@ module LitmusPaper
         @uri = uri
         @expected_content = Regexp.new(options.fetch(:content, '.*'))
         @method = options.fetch(:method, 'GET')
+        @ca_file = options[:ca_file]
       end
 
       def available?
         response = _make_request
-        _successful_response?(response) && _body_matches?(response)
-      rescue Exception
+        success = _successful_response?(response)
+        matches = _body_matches?(response)
+
+        LitmusPaper.logger.info("Available check to #{@uri} failed with status #{response.code}") unless success
+        LitmusPaper.logger.info("Available check to #{@uri} did not match #{@expected_content}") unless matches
+
+        success && matches
+      rescue Exception => e
+        LitmusPaper.logger.info("Available check to #{@uri} failed with #{e.message}")
         false
       end
 
@@ -19,7 +27,15 @@ module LitmusPaper
         request = Net::HTTP.const_get(@method.capitalize).new(uri.normalize.path)
         request.set_form_data({})
 
-        Net::HTTP.start(uri.host, uri.port) do |http|
+        connection = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          connection.use_ssl = true
+          connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          connection.ca_file = @ca_file unless @ca_file.nil?
+          connection.verify_callback = proc { |preverify_ok, ssl_context| _verify_ssl_certificate(preverify_ok, ssl_context) }
+        end
+
+        connection.start do |http|
           http.request(request)
         end
       end
@@ -32,6 +48,15 @@ module LitmusPaper
         (response.body =~ @expected_content) ? true : false
       end
 
+      def _verify_ssl_certificate(preverify_ok, ssl_context)
+        if preverify_ok != true || ssl_context.error != 0
+          err_msg = "SSL Verification failed -- Preverify: #{preverify_ok}, Error: #{ssl_context.error_string} (#{ssl_context.error})"
+          LitmusPaper.logger.info err_msg
+          false
+        end
+        true
+      end
+
       def to_s
         "Dependency::HTTP(#{@uri})"
       end

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/litmus_paper.rb

@@ -1,5 +1,6 @@
 require 'pathname'
 require 'net/http'
+require 'net/https'
 require 'uri'
 require 'forwardable'
 
@@ -24,8 +25,11 @@ require 'litmus_paper/status_file'
 module LitmusPaper
   class << self
     attr_reader :services, :config_dir
+    attr_accessor :logger
   end
 
+  self.logger = Logger.new
+
   def self.configure(filename)
     @config_file = filename
 

data/spec/litmus_paper/dependency/http_spec.rb

@@ -22,6 +22,23 @@ describe LitmusPaper::Dependency::HTTP do
       end
     end
 
+    context "https" do
+      it "can make https request" do
+        begin
+          `env SSL_TEST_PORT=9295 PID_FILE=/tmp/https-test-server.pid bundle exec spec/script/https_test_server.rb`
+          SpecHelper.wait_for_service :host => '127.0.0.1', :port => 9295
+
+          check = LitmusPaper::Dependency::HTTP.new(
+            "https://localhost:9295/",
+            :ca_file => TEST_CA_CERT
+          )
+          check.should be_available
+        ensure
+          system "kill -9 `cat /tmp/https-test-server.pid`"
+        end
+      end
+    end
+
     it "is true when response is 200" do
       check = LitmusPaper::Dependency::HTTP.new("#{@url}/status/200")
       check.should be_available

data/spec/script/https_test_server.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'webrick'
+require 'webrick/https'
+require 'openssl'
+
+private_key_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "ssl", "server.key"))
+cert_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "ssl", "server.crt"))
+
+pkey = OpenSSL::PKey::RSA.new(File.read(private_key_file))
+cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+
+pid_file = ENV["PID_FILE"]
+
+s = WEBrick::HTTPServer.new(
+  :Port => (ENV['SSL_TEST_PORT'] || 8443),
+  :Logger => WEBrick::Log::new(nil, WEBrick::Log::ERROR),
+  :DocumentRoot => File.join(File.dirname(__FILE__)),
+  :ServerType => WEBrick::Daemon,
+  :SSLEnable => true,
+  :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
+  :SSLCertificate => cert,
+  :SSLPrivateKey => pkey,
+  :SSLCertName => [ [ "CN",WEBrick::Utils::getservername ] ],
+  :StartCallback => proc { File.open(pid_file, "w") { |f| f.write $$.to_s }}
+)
+s.mount_proc("/") { |req,resp| resp.body = "hello world" }
+trap("INT"){ s.shutdown }
+s.start

data/spec/spec_helper.rb

@@ -44,3 +44,4 @@ LitmusPaper.config_dir = "/tmp/litmus_paper"
 
 TEST_CONFIG = File.expand_path('support/test.config', File.dirname(__FILE__))
 TEST_D_CONFIG = File.expand_path('support/test.d.config', File.dirname(__FILE__))
+TEST_CA_CERT = File.expand_path('ssl/server.crt', File.dirname(__FILE__))

data/spec/ssl/server.crt

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICKTCCAZICCQCmNl8pjL8nPzANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJB
+VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMRIwEAYDVQQDEwlsb2NhbGhvc3QwHhcNMTIwNjA0MjExOTU2WhcN
+MTMwNjA0MjExOTU2WjBZMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0
+ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRIwEAYDVQQDEwls
+b2NhbGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK9fPamtXwFv341C
+jHFvJ4QxkKqWDACimkksBorVBUdMqsYwR/b9Ig4EHjAir8pfP3fjl98z4qRoWotx
+gCSj6OARoMsfS1+JGK8AsQyimq3uCErEyPAgHgfJ7+XORl0pgg3Z67pfzAqBs7aF
+p8pbEAkMVBdA62qhFVWAZhsTUxdVAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAa98H
+JPpxhaVFzAYkG+AyuCyskCSzXWvBAlJZXYejMZlSCGiZb3F94KeAlfRT9xCH2U6i
+/AxXVwO3mdeTP9s4Q90ehPZ8yS+LUVh6kVUneADRx5f410sz/FYF5j2hbdom2Sca
+42BOBxnbIKmkzJcm1uEU5fRag6GbWdzpoLNKHmA=
+-----END CERTIFICATE-----

data/spec/ssl/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCvXz2prV8Bb9+NQoxxbyeEMZCqlgwAoppJLAaK1QVHTKrGMEf2
+/SIOBB4wIq/KXz9345ffM+KkaFqLcYAko+jgEaDLH0tfiRivALEMopqt7ghKxMjw
+IB4Hye/lzkZdKYIN2eu6X8wKgbO2hafKWxAJDFQXQOtqoRVVgGYbE1MXVQIDAQAB
+AoGANyPdAYKvgoYoZgPsoKXwaNIkyF4RPAnkNOmQzQoZdMeYUmRP3ErO8FU/IKdn
+WlwEWq/GyrlHo6XkAkAXqG2ZBITsQaWKRky8nuydsJTXyt3z09R17WpH6dYNSyw5
+wc9UyGg+u5+hHiAOuMMVPEpePB4gBAo/XIBHe4ApqY5ZkakCQQDpI+DV2UmNLUG3
+qKavyncY382Fctc/m2GbNn2+B+6tDDGFcs4XwwPGEHaP66U3Aa9AU2MS2dPSDRl1
+IPvpQsTLAkEAwJFOvxKsxMwZT7vhCNkc8fKGI5wkjXRpCL5pEDUdDHExUbmaCGra
+PfNMEBkIDL4wGVNLLDZtl3/AgiyGzTIwXwJBAOP/BVK841QgDSOp2BEUJDJ8M8Ys
+z9nRf7vFp2Se50fuI8PIyUmtmlQpJ3mJzpGjoRp8Mehug9rompvUPOcaN88CQH9a
+2niV0jtpPEg2WlLuvCzrl3lPmAERfzGwNG3qoqaK6fJBzLRKbsHP+XsgAuniko79
+PlckPACZFelBp3ln+wMCQQCvuEg+qo97LutnrUWID67PHEp+2W7SButs6yMerSac
+TYokvi2xz9auzRvxHofQiBIKsMji51uLmW8CfFaC8kS4
+-----END RSA PRIVATE KEY-----

data/spec/support/stdout_logger.rb

@@ -0,0 +1,8 @@
+class StdoutLogger
+  def write(message)
+    puts message
+  end
+
+  alias info write
+  alias debug write
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: litmus_paper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Braintreeps
@@ -178,7 +178,10 @@ files:
 - spec/litmus_paper/service_spec.rb
 - spec/litmus_paper/status_file_spec.rb
 - spec/litmus_paper_spec.rb
+- spec/script/https_test_server.rb
 - spec/spec_helper.rb
+- spec/ssl/server.crt
+- spec/ssl/server.key
 - spec/support/always_available_dependency.rb
 - spec/support/config.d/passing_test.config
 - spec/support/config.d/test.config
@@ -186,6 +189,7 @@ files:
 - spec/support/http_test_server.rb
 - spec/support/http_test_server_config.ru
 - spec/support/never_available_dependency.rb
+- spec/support/stdout_logger.rb
 - spec/support/stub_facter.rb
 - spec/support/test.config
 - spec/support/test.d.config
@@ -236,7 +240,10 @@ test_files:
 - spec/litmus_paper/service_spec.rb
 - spec/litmus_paper/status_file_spec.rb
 - spec/litmus_paper_spec.rb
+- spec/script/https_test_server.rb
 - spec/spec_helper.rb
+- spec/ssl/server.crt
+- spec/ssl/server.key
 - spec/support/always_available_dependency.rb
 - spec/support/config.d/passing_test.config
 - spec/support/config.d/test.config
@@ -244,6 +251,7 @@ test_files:
 - spec/support/http_test_server.rb
 - spec/support/http_test_server_config.ru
 - spec/support/never_available_dependency.rb
+- spec/support/stdout_logger.rb
 - spec/support/stub_facter.rb
 - spec/support/test.config
 - spec/support/test.d.config