From e59543bb28f14083cf73ca2ee2f2a99d03560038 Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Wed, 17 Dec 2014 09:43:29 -0800 Subject: [PATCH 1/3] fix nil tls_options --- lib/net/ldap/connection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb index 6371f636..ab7931d1 100644 --- a/lib/net/ldap/connection.rb +++ b/lib/net/ldap/connection.rb @@ -91,7 +91,7 @@ def self.wrap_with_ssl(io, tls_options = {}) def setup_encryption(args) case args[:method] when :simple_tls - @conn = self.class.wrap_with_ssl(@conn, args[:tls_options]) + @conn = self.class.wrap_with_ssl(@conn, args.fetch(:tls_options, {})) # additional branches requiring server validation and peer certs, etc. # go here. when :start_tls From 13ca7c9dee5bcb9e91c8f87c482f2eba885e7787 Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Wed, 17 Dec 2014 09:46:31 -0800 Subject: [PATCH 2/3] encryption defaults empty :tls_options --- lib/net/ldap/connection.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb index ab7931d1..0e3d7e05 100644 --- a/lib/net/ldap/connection.rb +++ b/lib/net/ldap/connection.rb @@ -89,9 +89,10 @@ def self.wrap_with_ssl(io, tls_options = {}) # generously contributing the :start_tls path. #++ def setup_encryption(args) + args[:tls_options] ||= {} case args[:method] when :simple_tls - @conn = self.class.wrap_with_ssl(@conn, args.fetch(:tls_options, {})) + @conn = self.class.wrap_with_ssl(@conn, args[:tls_options]) # additional branches requiring server validation and peer certs, etc. # go here. when :start_tls From f8987cbf2e47d0b725827e57677907088cd9d4a0 Mon Sep 17 00:00:00 2001 From: Jerry Cheung Date: Thu, 18 Dec 2014 15:19:51 -0800 Subject: [PATCH 3/3] update mock --- test/test_ldap_connection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_ldap_connection.rb b/test/test_ldap_connection.rb index 0bffb66a..424f6bb3 100644 --- a/test/test_ldap_connection.rb +++ b/test/test_ldap_connection.rb @@ -202,7 +202,7 @@ def test_queued_read_setup_encryption_with_start_tls and_return(result2) mock.should_receive(:write) conn = Net::LDAP::Connection.new(:socket => mock) - flexmock(Net::LDAP::Connection).should_receive(:wrap_with_ssl).with(mock, nil). + flexmock(Net::LDAP::Connection).should_receive(:wrap_with_ssl).with(mock, {}). and_return(mock) conn.next_msgid # simulates ongoing query