From a7b8e5e8c2fd0ce0fa80ca0451657bd0826152ea Mon Sep 17 00:00:00 2001
From: a7b81a9086 <>
Date: Fri, 11 Jun 2021 15:01:17 +0200
Subject: [PATCH 1/3] Add support for ldapwhoami (RFC4532)

---
 lib/net/ldap.rb            | 19 +++++++++++++++++++
 lib/net/ldap/connection.rb | 16 ++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index 1547597f..f2f228b1 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -306,6 +306,7 @@ class Net::LDAP
     3 => :string, # SearchFilter-extensible
     4 => :string, # SearchFilter-extensible
     7 => :string, # serverSaslCreds
+    11 => :string, # responseValue
   }
   constructed = {
     0 => :array, # RFC-2251 Control and Filter-AND
@@ -341,6 +342,7 @@ class Net::LDAP
 
   StartTlsOid = '1.3.6.1.4.1.1466.20037'
   PasswdModifyOid = '1.3.6.1.4.1.4203.1.11.1'
+  WhoamiOid = '1.3.6.1.4.1.4203.1.11.3'
 
   # https://tools.ietf.org/html/rfc4511#section-4.1.9
   # https://tools.ietf.org/html/rfc4511#appendix-A
@@ -1198,6 +1200,23 @@ def delete_tree(args)
     end
   end
 
+  # Return the authorization identity of the client that issues the
+  # ldapwhoami request.  The method does not support any arguments.
+  #
+  # Returns True or False to indicate whether the request was successfull.
+  # The result is available in the extended status information when calling
+  # #get_operation_result.
+  #
+  #  ldap.ldapwhoami
+  #  puts ldap.get_operation_result.extended_response
+  def ldapwhoami(args = {})
+    instrument "ldapwhoami.net_ldap", args do |payload|
+      @result = use_connection(args, &:ldapwhoami)
+      @result.success?
+    end
+  end
+  alias_method :whoami, :ldapwhoami
+
   # This method is experimental and subject to change. Return the rootDSE
   # record from the LDAP server as a Net::LDAP::Entry, or an empty Entry if
   # the server doesn't return the record.
diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb
index 5315b31c..44a2b1c9 100644
--- a/lib/net/ldap/connection.rb
+++ b/lib/net/ldap/connection.rb
@@ -685,6 +685,22 @@ def delete(args)
     pdu
   end
 
+  def ldapwhoami
+    ext_seq = [Net::LDAP::WhoamiOid.to_ber_contextspecific(0)]
+    request = ext_seq.to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
+
+    message_id = next_msgid
+
+    write(request, nil, message_id)
+    pdu = queued_read(message_id)
+
+    if !pdu || pdu.app_tag != Net::LDAP::PDU::ExtendedResponse
+      raise Net::LDAP::ResponseMissingOrInvalidError, "response missing or invalid"
+    end
+
+    pdu
+  end
+
   # Internal: Returns a Socket like object used internally to communicate with
   # LDAP server.
   #

From 82ff8e6570c50d13264232c459302d770957dca5 Mon Sep 17 00:00:00 2001
From: a7b81a9086 <>
Date: Sun, 13 Jun 2021 12:48:27 +0200
Subject: [PATCH 2/3] Do not break Net::LDAP#modify_password

---
 lib/net/ldap.rb            | 1 -
 lib/net/ldap/connection.rb | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index f2f228b1..d9c63914 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -306,7 +306,6 @@ class Net::LDAP
     3 => :string, # SearchFilter-extensible
     4 => :string, # SearchFilter-extensible
     7 => :string, # serverSaslCreds
-    11 => :string, # responseValue
   }
   constructed = {
     0 => :array, # RFC-2251 Control and Filter-AND
diff --git a/lib/net/ldap/connection.rb b/lib/net/ldap/connection.rb
index 44a2b1c9..5e1e48a3 100644
--- a/lib/net/ldap/connection.rb
+++ b/lib/net/ldap/connection.rb
@@ -686,6 +686,7 @@ def delete(args)
   end
 
   def ldapwhoami
+    Net::LDAP::AsnSyntax[139] = :string
     ext_seq = [Net::LDAP::WhoamiOid.to_ber_contextspecific(0)]
     request = ext_seq.to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
 
@@ -698,6 +699,7 @@ def ldapwhoami
       raise Net::LDAP::ResponseMissingOrInvalidError, "response missing or invalid"
     end
 
+    Net::LDAP::AsnSyntax[139] = nil
     pdu
   end
 

From d8b3fd893108eb33afe1b1eee79da00415e6c4f8 Mon Sep 17 00:00:00 2001
From: "7682d49]" <>
Date: Sun, 13 Jun 2021 13:02:34 +0200
Subject: [PATCH 3/3] Increase ClassLength-limit to make rubocop pass

---
 .rubocop_todo.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7699e8a6..7b7e4e01 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -221,7 +221,7 @@ Metrics/BlockNesting:
 # Offense count: 11
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 445
+  Max: 451
 
 # Offense count: 23
 Metrics/CyclomaticComplexity: