rspec-ssltls 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3acd97c78951ebb6bc4520cc7a7ca3b77c19e6c4
-  data.tar.gz: 58fcda42f895dbf34f023e141b2fce5c95b46cbd
+  metadata.gz: 7635f72b8316eb0801a357f252c363202ea50a8a
+  data.tar.gz: 5609957cc3fc4cb58dee2b719bce7405075e9722
 SHA512:
-  metadata.gz: 921d826cb7ca2c5083b59a913c40fbc953b22bc453a277c81ae9df78c43fccd9c9ec0266a989ecadb731e26232b566c9e5f6f5ca024f8c535893d0a88f06625f
-  data.tar.gz: 4f0885ddbb312f60fbea0029e1a4c30e1e5c7b52b7b635c6fff8c08b12a40ce534d0d0849cfe48aa9b213cb922f2ffe2c4238d967351d5e11a95c9098e85a47b
+  metadata.gz: 1a1e4b32a265f40da8651b5868952f27c24513a8ba8a79d522d4ecc12871cc1b15a5ee35f651ae4c94e6c9b7aecbf13dd8113ae16ab75bbb850c97b09912d931
+  data.tar.gz: fbbcaf923ef47cad4f88fd3888df07090dc9e8f129d326e5a36f6cb01822ef9acd86ce05d5c802d8e4210c8fb7149b5670a55c5bfd42686d060f9564e1f2e704

data/README.md

@@ -20,6 +20,7 @@ require 'spec_helper'
 describe 'www.example.com:443' do
   it { is_expected.to have_certificate.subject(CN: '*.example.com') }
   it { is_expected.to have_certificate.issuer(CN: 'ca.example.org') }
+  it { is_expected.to have_certificate.chain(0).subject(CN: '*.example.com') }
   it { is_expected.to support_protocol('TLSv1_2') }
   it { is_expected.to support_cipher('AES256-SHA').protocol('TLSv1') }
   it { is_expected.to support_cipher('DES-CBC3-SHA').protocol('SSLv3') }

data/lib/rspec_ssltls/have_certificate.rb

@@ -5,13 +5,14 @@ RSpec::Matchers.define :have_certificate do
   match do |dest|
     @chain_string ||= ''
     @result_string ||= ''
+    @chain_number ||= 0
     uri = URI.parse('https://' + dest)
     socket = TCPSocket.open(uri.host, uri.port)
     ssl_context = OpenSSL::SSL::SSLContext.new
     ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
     ssl_socket.sync_close = true
     ssl_socket.connect
-    @peer_cert = ssl_socket.peer_cert
+    @peer_cert = ssl_socket.peer_cert_chain[@chain_number]
     ssl_socket.close
     @peer_cert ? valid_cert? : false
   end
@@ -24,6 +25,12 @@ RSpec::Matchers.define :have_certificate do
     id_chain(:issuer, id)
   end
 
+  chain :chain do |n|
+    @chain_number = n
+    @chain_string =
+      RspecSsltls::Util.add_string(@chain_string, "chain[#{n}]")
+  end
+
   def valid_cert?
     @result_cert = {}
     @result_cert.merge!(subject: valid_identifier?(:subject, @subject))
@@ -58,7 +65,7 @@ RSpec::Matchers.define :have_certificate do
     instance_variable_set("@#{key}", id)
     kv = id.each_pair.map { |k, v| "#{k}=\"#{v}\"" }.join(', ')
     @chain_string =
-      RspecSsltls::Util.add_string(@chain_string, "#{key} #{kv}")
+      RspecSsltls::Util.add_string(@chain_string, "#{key} #{kv}", ' ')
   end
 
   description do

data/lib/rspec_ssltls/util.rb

@@ -2,11 +2,11 @@
 module RspecSsltls
   # Utility class
   class Util
-    def self.add_string(target, addition)
+    def self.add_string(target, addition, separator = ', ')
       if target.nil?
         ' ' + addition
       else
-        target + ', ' + addition
+        target + separator + addition
       end
     end
 

data/lib/rspec_ssltls/version.rb

@@ -1,4 +1,4 @@
 # Easily test your SSL/TLS with RSpec.
 module RspecSsltls
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/rspec_ssltls/have_certificate_spec.rb

@@ -37,13 +37,13 @@ example_cert.issuer = example_ca_cert_name
 describe 'rspec-ssltls matchers' do
   describe '#have_certificate' do
     it 'can evalutate having certificate' do
-      stub_ssl_socket(peer_cert: nil)
+      stub_ssl_socket(peer_cert_chain: [nil])
       expect('www.example.com:443').not_to have_certificate
-      stub_ssl_socket(peer_cert: example_cert)
+      stub_ssl_socket(peer_cert_chain: [example_cert])
       expect('www.example.com:443').to have_certificate
     end
     it 'can evalutate having certificate subject' do
-      stub_ssl_socket(peer_cert: example_cert)
+      stub_ssl_socket(peer_cert_chain: [example_cert])
       expect('www.example.com:443')
         .to have_certificate.subject(CN: '*.example.com')
       expect('www.example.com:443')
@@ -59,7 +59,7 @@ describe 'rspec-ssltls matchers' do
 
     # show default description
     it do
-      stub_ssl_socket(peer_cert: example_cert)
+      stub_ssl_socket(peer_cert_chain: [example_cert])
       expect('www.example.com:443')
         .to have_certificate.subject(CN: '*.example.com',
                                      C:  'JP',
@@ -70,7 +70,7 @@ describe 'rspec-ssltls matchers' do
     end
 
     it 'can evalutate having certificate issuer' do
-      stub_ssl_socket(peer_cert: example_cert)
+      stub_ssl_socket(peer_cert_chain: [example_cert])
       expect('www.example.com:443')
         .to have_certificate.issuer(CN: 'ca.example.org')
       expect('www.example.com:443')
@@ -86,7 +86,7 @@ describe 'rspec-ssltls matchers' do
 
     # show default description
     it do
-      stub_ssl_socket(peer_cert: example_cert)
+      stub_ssl_socket(peer_cert_chain: [example_cert])
       expect('www.example.com:443')
         .to have_certificate.issuer(CN: 'ca.example.org',
                                     C:  'US',
@@ -94,5 +94,38 @@ describe 'rspec-ssltls matchers' do
                                     OU: 'Example Org. Div.'
                                     )
     end
+
+    it 'can evalutate having certificate in chain' do
+      stub_ssl_socket(peer_cert_chain: [nil])
+      expect('www.example.com:443').not_to have_certificate.chain(0)
+      stub_ssl_socket(peer_cert_chain: [example_cert])
+      expect('www.example.com:443').to have_certificate.chain(0)
+    end
+    it 'can evalutate having certificate subject in chain' do
+      stub_ssl_socket(peer_cert_chain: [example_cert])
+      expect('www.example.com:443')
+        .to have_certificate.chain(0).subject(CN: '*.example.com')
+      expect('www.example.com:443')
+        .to have_certificate.chain(0).subject(CN: '*.example.com',
+                                              C:  'JP',
+                                              ST: 'Tokyo',
+                                              O:  'Example Co., Ltd.',
+                                              OU: 'Example Div.'
+                                              )
+      expect('www.example.com:443')
+        .not_to have_certificate.chain(0).subject(CN: 'www.example.com')
+    end
+
+    # show default description
+    it do
+      stub_ssl_socket(peer_cert_chain: [example_cert])
+      expect('www.example.com:443')
+        .to have_certificate.chain(0).subject(CN: '*.example.com',
+                                              C:  'JP',
+                                              ST: 'Tokyo',
+                                              O:  'Example Co., Ltd.',
+                                              OU: 'Example Div.'
+                                              )
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-ssltls
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec