From 4c02d44290800be6abe163d23a2d718874b168bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Gal=C3=A1n?= Date: Fri, 27 Mar 2020 13:42:37 +0100 Subject: [PATCH 1/5] fix LdapPduError uninitialized constant --- lib/net/ldap/pdu.rb | 2 +- lib/net/ldap/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb index 382c7acb..097d57a9 100644 --- a/lib/net/ldap/pdu.rb +++ b/lib/net/ldap/pdu.rb @@ -123,7 +123,7 @@ def initialize(ber_object) when ExtendedResponse parse_extended_response(ber_object[1]) else - raise LdapPduError.new("unknown pdu-type: #{@app_tag}") + raise LdapError.new("unknown pdu-type: #{@app_tag}") end parse_controls(ber_object[2]) if ber_object[2] diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb index d0c61424..2886a6a1 100644 --- a/lib/net/ldap/version.rb +++ b/lib/net/ldap/version.rb @@ -1,5 +1,5 @@ module Net class LDAP - VERSION = "0.16.2" + VERSION = "0.16.21" end end From ca62abac2bdc7d3f571bcbfdf8413bf786a2b6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Gal=C3=A1n?= Date: Mon, 30 Mar 2020 08:59:41 +0200 Subject: [PATCH 2/5] fix LdapPduError uninitialized constant --- lib/net/ldap/pdu.rb | 2 +- lib/net/ldap/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb index 097d57a9..7028cbc5 100644 --- a/lib/net/ldap/pdu.rb +++ b/lib/net/ldap/pdu.rb @@ -123,7 +123,7 @@ def initialize(ber_object) when ExtendedResponse parse_extended_response(ber_object[1]) else - raise LdapError.new("unknown pdu-type: #{@app_tag}") + raise Net::LDAP::PDU::Error, "unknown pdu-type: #{@app_tag}" end parse_controls(ber_object[2]) if ber_object[2] diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb index 2886a6a1..2da39a34 100644 --- a/lib/net/ldap/version.rb +++ b/lib/net/ldap/version.rb @@ -1,5 +1,5 @@ module Net class LDAP - VERSION = "0.16.21" + VERSION = "0.16.2.1" end end From 114e8a4f12a5c08384cb82154ae97486b4c073bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Gal=C3=A1n?= Date: Mon, 30 Mar 2020 09:44:29 +0200 Subject: [PATCH 3/5] fix BER PARSER ERROR when the first paramater is an array --- lib/net/ldap/pdu.rb | 3 ++- lib/net/ldap/version.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb index 7028cbc5..aaf13ef1 100644 --- a/lib/net/ldap/pdu.rb +++ b/lib/net/ldap/pdu.rb @@ -84,7 +84,8 @@ class Error < RuntimeError; end def initialize(ber_object) begin - @message_id = ber_object[0].to_i + id = ber_object[0].is_a? Array ? ber_object[0][1] : ber_object[0] + @message_id = id.to_i # Grab the bottom five bits of the identifier so we know which type of # PDU this is. # diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb index 2da39a34..1826562a 100644 --- a/lib/net/ldap/version.rb +++ b/lib/net/ldap/version.rb @@ -1,5 +1,5 @@ module Net class LDAP - VERSION = "0.16.2.1" + VERSION = "0.16.2.2" end end From 8c20f67e4b0b22397125f508c1953428093cf564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Gal=C3=A1n?= Date: Mon, 30 Mar 2020 09:54:39 +0200 Subject: [PATCH 4/5] fix BER PARSER ERROR when the first paramater is an array --- lib/net/ldap/pdu.rb | 4 ++-- lib/net/ldap/version.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb index aaf13ef1..67be7099 100644 --- a/lib/net/ldap/pdu.rb +++ b/lib/net/ldap/pdu.rb @@ -84,7 +84,7 @@ class Error < RuntimeError; end def initialize(ber_object) begin - id = ber_object[0].is_a? Array ? ber_object[0][1] : ber_object[0] + id = ber_object[0] @message_id = id.to_i # Grab the bottom five bits of the identifier so we know which type of # PDU this is. @@ -95,7 +95,7 @@ def initialize(ber_object) @app_tag = ber_object[1].ber_identifier & 0x1f @ldap_controls = [] rescue Exception => ex - raise Net::LDAP::PDU::Error, "LDAP PDU Format Error: #{ex.message}" + raise Net::LDAP::PDU::Error, "LDAP PDU Format Error: #{ex.message} Ber Object is #{ber_object}" end case @app_tag diff --git a/lib/net/ldap/version.rb b/lib/net/ldap/version.rb index 1826562a..003b109c 100644 --- a/lib/net/ldap/version.rb +++ b/lib/net/ldap/version.rb @@ -1,5 +1,5 @@ module Net class LDAP - VERSION = "0.16.2.2" + VERSION = "0.16.2.3" end end From 8e7df5710ce3d3fd28370e79ad08987aa47778a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Gal=C3=A1n?= Date: Wed, 1 Apr 2020 14:18:30 +0200 Subject: [PATCH 5/5] Remove unnecesary split --- lib/net/ldap/pdu.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb index 67be7099..26f166b4 100644 --- a/lib/net/ldap/pdu.rb +++ b/lib/net/ldap/pdu.rb @@ -84,8 +84,7 @@ class Error < RuntimeError; end def initialize(ber_object) begin - id = ber_object[0] - @message_id = id.to_i + @message_id = ber_object[0] # Grab the bottom five bits of the identifier so we know which type of # PDU this is. #