socialcast-net-ldap 0.1.7 → 0.1.8

data/Gemfile.lock

@@ -2,22 +2,22 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    diff-lcs (1.1.2)
-    flexmock (0.8.11)
+    diff-lcs (1.2.4)
+    flexmock (1.3.2)
     hoe (2.8.0)
       rake (>= 0.8.7)
     hoe-git (1.3.0)
       hoe (>= 2.2.0)
     metaid (1.0)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
 
 PLATFORMS
   ruby

data/Manifest.txt

@@ -25,7 +25,6 @@ lib/net/ldap/password.rb
 lib/net/ldap/pdu.rb
 lib/net/ldif.rb
 lib/net/snmp.rb
-spec/integration/ssl_ber_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 spec/unit/ber/ber_spec.rb

data/lib/net/ldap.rb

@@ -246,7 +246,7 @@ require 'net/ldap/entry'
 # and then keeps it open while it executes a user-supplied block.
 # Net::LDAP#open closes the connection on completion of the block.
 class Net::LDAP
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 
   class LdapError < StandardError; end
 
@@ -1124,9 +1124,10 @@ class Net::LDAP::Connection #:nodoc:
     end
   end
 
-  def self.wrap_with_ssl(io)
+  def self.wrap_with_ssl(io, options = {})
     raise Net::LDAP::LdapError, "OpenSSL is unavailable" unless Net::LDAP::HasOpenSSL
     ctx = OpenSSL::SSL::SSLContext.new
+    ctx.ssl_version = options[:ssl_version] if options.has_key?(:ssl_version)
     conn = OpenSSL::SSL::SSLSocket.new(io, ctx)
     conn.connect
     conn.sync_close = true
@@ -1165,7 +1166,7 @@ class Net::LDAP::Connection #:nodoc:
   def setup_encryption(args)
     case args[:method]
     when :simple_tls
-      @conn = self.class.wrap_with_ssl(@conn)
+      @conn = self.class.wrap_with_ssl(@conn, args)
       # additional branches requiring server validation and peer certs, etc.
       # go here.
     when :start_tls
@@ -1178,7 +1179,7 @@ class Net::LDAP::Connection #:nodoc:
       pdu = Net::LDAP::PDU.new(be)
       raise Net::LDAP::LdapError, "no start_tls result" if pdu.nil?
       if pdu.result_code.zero?
-        @conn = self.class.wrap_with_ssl(@conn)
+        @conn = self.class.wrap_with_ssl(@conn, args)
       else
         raise Net::LDAP::LdapError, "start_tls failed: #{pdu.result_code}"
       end
@@ -1328,7 +1329,7 @@ class Net::LDAP::Connection #:nodoc:
   # in the protocol.
   #++
   def search(args = {})
-    search_filter = (args && args[:filter]) || 
+    search_filter = (args && args[:filter]) ||
       Net::LDAP::Filter.eq("objectclass", "*")
     search_filter = Net::LDAP::Filter.construct(search_filter) if search_filter.is_a?(String)
     search_base = (args && args[:base]) || "dc=example, dc=com"
@@ -1518,7 +1519,7 @@ class Net::LDAP::Connection #:nodoc:
 
 		request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber]
 		request << new_superior.to_ber unless new_superior == nil
-  	
+
     pkt = [next_msgid.to_ber, request.to_ber_appsequence(12)].to_ber_sequence
     @conn.write pkt
 

data/spec/spec.opts

@@ -1,2 +1,2 @@
 --format specdoc
---colour
+--colour

data/spec/unit/ldap_spec.rb

@@ -7,11 +7,11 @@ describe Net::LDAP::Connection do
         flexmock(TCPSocket).
           should_receive(:new).and_raise(Errno::ECONNREFUSED)
       end
-      
+
       it "should raise LdapError" do
         lambda {
           Net::LDAP::Connection.new(
-            :server => 'test.mocked.com', 
+            :server => 'test.mocked.com',
             :port   => 636)
         }.should raise_error(Net::LDAP::LdapError)
       end
@@ -21,11 +21,11 @@ describe Net::LDAP::Connection do
         flexmock(TCPSocket).
           should_receive(:new).and_raise(SocketError)
       end
-      
+
       it "should raise LdapError" do
         lambda {
           Net::LDAP::Connection.new(
-            :server => 'test.mocked.com', 
+            :server => 'test.mocked.com',
             :port   => 636)
         }.should raise_error(Net::LDAP::LdapError)
       end
@@ -35,14 +35,35 @@ describe Net::LDAP::Connection do
         flexmock(TCPSocket).
           should_receive(:new).and_raise(NameError)
       end
-      
+
       it "should rethrow the exception" do
         lambda {
           Net::LDAP::Connection.new(
-            :server => 'test.mocked.com', 
+            :server => 'test.mocked.com',
             :port   => 636)
         }.should raise_error(NameError)
       end
     end
   end
-end
+  describe "wrap_with_ssl" do
+    before(:each) do
+        @conn = flexmock(TCPSocket).should_receive(:new).and_return(flexmock('tcpsocket'))
+        @ssl_con = flexmock('sslsocket')
+        @ssl_con.should_receive(:connect)
+        @ssl_con.should_receive(:sync_close=)
+        flexmock(OpenSSL::SSL::SSLSocket).should_receive(:new).and_return(@ssl_con)
+      end
+    it "allows no options to be passed" do
+      flexmock(OpenSSL::SSL::SSLContext).new_instances.should_receive(:ssl_version=).never
+      Net::LDAP::Connection.wrap_with_ssl(@conn).should eql(@ssl_con)
+    end
+    it "allows options to be passed" do
+      flexmock(OpenSSL::SSL::SSLContext).new_instances.should_receive(:ssl_version=).never
+      Net::LDAP::Connection.wrap_with_ssl(@conn, {}).should eql(@ssl_con)
+    end
+    it "communicates over the ssl_version configured" do
+      flexmock(OpenSSL::SSL::SSLContext).new_instances.should_receive(:ssl_version=).with(:SSLv3)
+      Net::LDAP::Connection.wrap_with_ssl(@conn, {:ssl_version => :SSLv3}).should eql(@ssl_con)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-net-ldap
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
@@ -168,8 +168,6 @@ files:
   bGliL25ldC9sZGlmLnJi
 - !binary |-
   bGliL25ldC9zbm1wLnJi
-- !binary |-
-  c3BlYy9pbnRlZ3JhdGlvbi9zc2xfYmVyX3NwZWMucmI=
 - !binary |-
   c3BlYy9zcGVjLm9wdHM=
 - !binary |-
@@ -226,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socialcast-net-ldap
-rubygems_version: 1.8.24
+rubygems_version: 1.8.27
 signing_key: 
 specification_version: 3
 summary: Pure Ruby LDAP support library with most client features and some server

data/spec/integration/ssl_ber_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-require 'net/ldap'
-
-describe "BER serialisation (SSL)" do
-  # Transmits str to #to and reads it back from #from. 
-  #
-  def transmit(str)
-    to.write(str)
-    to.close
-    
-    from.read
-  end
-    
-  attr_reader :to, :from
-  before(:each) do
-    @from, @to = IO.pipe
-    
-    flexmock(OpenSSL::SSL::SSLSocket).
-      new_instances.should_receive(:connect => nil)
-              
-    @to   = Net::LDAP::Connection.wrap_with_ssl(to)
-    @from = Net::LDAP::Connection.wrap_with_ssl(from)
-  end
-  
-  it "should transmit strings" do
-    transmit('foo').should == 'foo'
-  end 
-  it "should correctly transmit numbers" do
-    to.write 1234.to_ber
-    from.read_ber.should == 1234
-  end 
-end