uninterruptible 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e77ed731e5fa9282a2ae7976a81c8cebf3ca30
-  data.tar.gz: 7914f883f7209fabae8fb8a0e7309b76506f0e16
+  metadata.gz: ec0c8eaf7fcd4e6be024f10c74ea412c7b2e1c4a
+  data.tar.gz: 4dc641d56fcbdbf69237db8366ad89e094fd4008
 SHA512:
-  metadata.gz: 1c9d0f312b9d34745710d1c930bd275b633eb20d8b85ad387cf3b3bca75fa551189ac6a2291624a2f308a8cfcab70016411af6eccc7884cabf6ad3ff689e1990
-  data.tar.gz: 7ad3f76b3eb6fca1399aac4c9ba8554bf1677967ba5942d0917444eb0e6249ec44b198253a1d94dafe36419787d8a0ae5857863a7739c202b9aa8fd27c9692b0
+  metadata.gz: 445bb79aef41ed50720a674fc9df82461eed9a63231648d53fe4cb567cc9900638f359709f060712c8c332a47596d1be9971e676b63d417d03bf060abc659af2
+  data.tar.gz: c72b8005bd3a954ad35d98555566e3fcdb67055b2b7d6b1764273515ec4f4864e9bf150b5260b56d95a16588ce692b14538e16687b386678cb9d4938b0b13a17

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+# 2.2.1
+* Allow multiple certificates to be used in one build file
+
 # 2.2.0
 * Verify client TLS certificates
 * Allow trusted client CA to be set

data/lib/uninterruptible/tls_server_factory.rb

@@ -4,6 +4,20 @@ module Uninterruptible
   class TLSServerFactory
     attr_reader :configuration
 
+    # Extracts pulling multiple certificates out of one file
+    class CertificateChain
+      attr_reader :cert_file
+
+      def initialize(cert_file)
+        @cert_file = cert_file
+      end
+
+      def to_a
+        certs = cert_file.scan(/-----BEGIN CERTIFICATE-----.+?-----END CERTIFICATE-----/m)
+        certs.map { |cert| OpenSSL::X509::Certificate.new(cert) }
+      end
+    end
+
     # @param [Uninterruptible::Configuration] configuration Object with valid TLS configuration options
     #
     # @raise [Uninterruptible::ConfigurationError] Correct options are not set for TLS
@@ -30,7 +44,11 @@ module Uninterruptible
     # @return [OpenSSL::SSL::SSLContext] SSL context for the server config
     def ssl_context
       context = OpenSSL::SSL::SSLContext.new
-      context.cert = OpenSSL::X509::Certificate.new(configuration.tls_certificate)
+
+      certificates = CertificateChain.new(configuration.tls_certificate).to_a
+      context.cert = certificates.shift
+      context.extra_chain_cert = certificates # Remaining certificataes that aren't the primary. Could be empty.
+
       context.key = OpenSSL::PKey::RSA.new(configuration.tls_key)
       context.ssl_version = configuration.tls_version.to_sym
 

data/lib/uninterruptible/version.rb

@@ -1,3 +1,3 @@
 module Uninterruptible
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uninterruptible
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Dan Wentworth
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler