net-ldap 0.16.0 → 0.18.0

data/lib/net/ldap.rb

@@ -17,19 +17,19 @@ module Net # :nodoc:
 end
 require 'socket'
 
-require 'net/ber'
-require 'net/ldap/pdu'
-require 'net/ldap/filter'
-require 'net/ldap/dataset'
-require 'net/ldap/password'
-require 'net/ldap/entry'
-require 'net/ldap/instrumentation'
-require 'net/ldap/connection'
-require 'net/ldap/version'
-require 'net/ldap/error'
-require 'net/ldap/auth_adapter'
-require 'net/ldap/auth_adapter/simple'
-require 'net/ldap/auth_adapter/sasl'
+require_relative 'ber'
+require_relative 'ldap/pdu'
+require_relative 'ldap/filter'
+require_relative 'ldap/dataset'
+require_relative 'ldap/password'
+require_relative 'ldap/entry'
+require_relative 'ldap/instrumentation'
+require_relative 'ldap/connection'
+require_relative 'ldap/version'
+require_relative 'ldap/error'
+require_relative 'ldap/auth_adapter'
+require_relative 'ldap/auth_adapter/simple'
+require_relative 'ldap/auth_adapter/sasl'
 
 Net::LDAP::AuthAdapter.register([:simple, :anon, :anonymous], Net::LDAP::AuthAdapter::Simple)
 Net::LDAP::AuthAdapter.register(:sasl, Net::LDAP::AuthAdapter::Sasl)
@@ -412,7 +412,7 @@ class Net::LDAP
     ResultCodeStrongerAuthRequired         => "Stronger Auth Needed",
     ResultCodeReferral                     => "Referral",
     ResultCodeAdminLimitExceeded           => "Admin Limit Exceeded",
-    ResultCodeUnavailableCriticalExtension => "Unavailable crtical extension",
+    ResultCodeUnavailableCriticalExtension => "Unavailable critical extension",
     ResultCodeConfidentialityRequired      => "Confidentiality Required",
     ResultCodeSaslBindInProgress           => "saslBindInProgress",
     ResultCodeNoSuchAttribute              => "No Such Attribute",
@@ -712,7 +712,7 @@ class Net::LDAP
       begin
         @open_connection = new_connection
         payload[:connection] = @open_connection
-        payload[:bind]       = @open_connection.bind(@auth)
+        payload[:bind]       = @result = @open_connection.bind(@auth)
         yield self
       ensure
         @open_connection.close if @open_connection
@@ -1182,14 +1182,22 @@ class Net::LDAP
   # entries. This method sends an extra control code to tell the LDAP server
   # to do a tree delete. ('1.2.840.113556.1.4.805')
   #
+  # If the LDAP server does not support the DELETE_TREE control code, subordinate
+  # entries are deleted recursively instead.
+  #
   # Returns True or False to indicate whether the delete succeeded. Extended
   # status information is available by calling #get_operation_result.
   #
   #  dn = "mail=deleteme@example.com, ou=people, dc=example, dc=com"
   #  ldap.delete_tree :dn => dn
   def delete_tree(args)
-    delete(args.merge(:control_codes => [[Net::LDAP::LDAPControls::DELETE_TREE, true]]))
+    if search_root_dse[:supportedcontrol].include? Net::LDAP::LDAPControls::DELETE_TREE
+      delete(args.merge(:control_codes => [[Net::LDAP::LDAPControls::DELETE_TREE, true]]))
+    else
+      recursive_delete(args)
+    end
   end
+
   # 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.
@@ -1320,7 +1328,7 @@ class Net::LDAP
     # Force connect to see if there's a connection error
     connection.socket
     connection
-  rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, Net::LDAP::ConnectionRefusedError => e
+  rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
     @result = {
       :resultCode   => 52,
       :errorMessage => ResultStrings[ResultCodeUnavailable],
@@ -1340,4 +1348,19 @@ class Net::LDAP
     end
   end
 
+  # Recursively delete a dn and it's subordinate children.
+  # This is useful when a server does not support the DELETE_TREE control code.
+  def recursive_delete(args)
+    raise EmptyDNError unless args.is_a?(Hash) && args.key?(:dn)
+    # Delete Children
+    search(base: args[:dn], scope: Net::LDAP::SearchScope_SingleLevel) do |entry|
+      recursive_delete(dn: entry.dn)
+    end
+    # Delete Self
+    unless delete(dn: args[:dn])
+      raise Net::LDAP::Error, get_operation_result[:error_message].to_s
+    end
+    true
+  end
+
 end # class LDAP

data/lib/net/snmp.rb

@@ -1,5 +1,5 @@
 # -*- ruby encoding: utf-8 -*-
-require 'net/ldap/version'
+require_relative 'ldap/version'
 
 # :stopdoc:
 module Net

data/lib/net-ldap.rb

@@ -1,2 +1,2 @@
 # -*- ruby encoding: utf-8 -*-
-require 'net/ldap'
+require_relative 'net/ldap'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ldap
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Francis Cianfrocca
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flexmock
@@ -35,56 +35,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: '1.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.0.6
 description: |-
   Net::LDAP for Ruby (also called net-ldap) implements client access for the
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for
@@ -112,18 +112,11 @@ extra_rdoc_files:
 - License.rdoc
 - README.rdoc
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- CONTRIBUTING.md
 - Contributors.rdoc
-- Gemfile
 - Hacking.rdoc
 - History.rdoc
 - License.rdoc
 - README.rdoc
-- Rakefile
 - lib/net-ldap.rb
 - lib/net/ber.rb
 - lib/net/ber/ber_parser.rb
@@ -149,50 +142,6 @@ files:
 - lib/net/ldap/pdu.rb
 - lib/net/ldap/version.rb
 - lib/net/snmp.rb
-- net-ldap.gemspec
-- script/changelog
-- script/generate-fixture-ca
-- script/install-openldap
-- script/package
-- script/release
-- test/ber/core_ext/test_array.rb
-- test/ber/core_ext/test_string.rb
-- test/ber/test_ber.rb
-- test/fixtures/ca/ca.info
-- test/fixtures/ca/cacert.pem
-- test/fixtures/ca/cakey.pem
-- test/fixtures/openldap/memberof.ldif
-- test/fixtures/openldap/retcode.ldif
-- test/fixtures/openldap/slapd.conf.ldif
-- test/fixtures/seed.ldif
-- test/integration/test_add.rb
-- test/integration/test_ber.rb
-- test/integration/test_bind.rb
-- test/integration/test_delete.rb
-- test/integration/test_open.rb
-- test/integration/test_password_modify.rb
-- test/integration/test_return_codes.rb
-- test/integration/test_search.rb
-- test/support/vm/openldap/.gitignore
-- test/support/vm/openldap/README.md
-- test/support/vm/openldap/Vagrantfile
-- test/test_auth_adapter.rb
-- test/test_dn.rb
-- test/test_entry.rb
-- test/test_filter.rb
-- test/test_filter_parser.rb
-- test/test_helper.rb
-- test/test_ldap.rb
-- test/test_ldap_connection.rb
-- test/test_ldif.rb
-- test/test_password.rb
-- test/test_rename.rb
-- test/test_search.rb
-- test/test_snmp.rb
-- test/test_ssl_ber.rb
-- test/testdata.ldif
-- testserver/ldapserver.rb
-- testserver/testdata.ldif
 homepage: http://github.com/ruby-ldap/ruby-net-ldap
 licenses:
 - MIT
@@ -214,49 +163,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.4.7
 signing_key: 
 specification_version: 4
 summary: Net::LDAP for Ruby (also called net-ldap) implements client access for the
   Lightweight Directory Access Protocol (LDAP), an IETF standard protocol for accessing
   distributed directory services
-test_files:
-- test/ber/core_ext/test_array.rb
-- test/ber/core_ext/test_string.rb
-- test/ber/test_ber.rb
-- test/fixtures/ca/ca.info
-- test/fixtures/ca/cacert.pem
-- test/fixtures/ca/cakey.pem
-- test/fixtures/openldap/memberof.ldif
-- test/fixtures/openldap/retcode.ldif
-- test/fixtures/openldap/slapd.conf.ldif
-- test/fixtures/seed.ldif
-- test/integration/test_add.rb
-- test/integration/test_ber.rb
-- test/integration/test_bind.rb
-- test/integration/test_delete.rb
-- test/integration/test_open.rb
-- test/integration/test_password_modify.rb
-- test/integration/test_return_codes.rb
-- test/integration/test_search.rb
-- test/support/vm/openldap/.gitignore
-- test/support/vm/openldap/README.md
-- test/support/vm/openldap/Vagrantfile
-- test/test_auth_adapter.rb
-- test/test_dn.rb
-- test/test_entry.rb
-- test/test_filter.rb
-- test/test_filter_parser.rb
-- test/test_helper.rb
-- test/test_ldap.rb
-- test/test_ldap_connection.rb
-- test/test_ldif.rb
-- test/test_password.rb
-- test/test_rename.rb
-- test/test_search.rb
-- test/test_snmp.rb
-- test/test_ssl_ber.rb
-- test/testdata.ldif
-- testserver/ldapserver.rb
-- testserver/testdata.ldif
+test_files: []

data/.gitignore

@@ -1,9 +0,0 @@
-*~
-*.swp
-.rvmrc
-pkg/
-doc/
-publish/
-Gemfile.lock
-.bundle
-bin/

data/.rubocop.yml

@@ -1,20 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-  Exclude:
-    - 'pkg/**/*'
-
-Style/ExtraSpacing:
-  Enabled: false
-
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma