activeldap 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a46a7f1f206eab425b0a3ec483c44c66622a65958fc34fe658313e152563e9b
-  data.tar.gz: e7fafc57db50aaaf81dc7f087328b87b8d5a78ed96b552c91bb7bd4234876eb5
+  metadata.gz: 6e102a4e1e1913dcbc4ba91e6efdcf1c810273ab0df7843dda96e7a25448115e
+  data.tar.gz: 641ed3e13f779e61a8ca2bb7b7451a2a262e6118cf3ebae09e05bca731ed3531
 SHA512:
-  metadata.gz: d89e9298c051c069236b7949d7597d61c57da5e69bee171bf51cbe24607edc2a319ed65604d34bd5928da4674a3558a0e75e9fe3e874a1f812a8a40bf97877db
-  data.tar.gz: 0ea20f5c3f37691493ee5a05324d94645de90520cf15a44ba35e7f9692b8f26b113639a4d34df6679a76a84a6a44a7a86b87faa62d59c3c9176ec678750a9d8d
+  metadata.gz: 8cdb1be2238d42a244c1e4bfd1d02741b3944f16bbfdd4b787fa07d7b16fb9c054f91316b540eec1e27660a16fe84a6fed30cdbb103d04bab565f4f1ed366026
+  data.tar.gz: bd5abb24368bc0e966398d8352b323f665ee6c9ff7ccb3d7cbaea556b87c0c9885458dcaba804176ba8992ad513e812a4e3a357c380fa14801e2b7838cbbc790

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 6.0.2: 2020-05-19 {#release-6-0-2}
+
+### Improvements
+
+  * Added `options` to {ActiveLdap::Persistance#reload}.
+    [GitHub#176][Reported by Kevin McCormack]
+
+  * jndi: Improved DN escaping.
+    [GitHub#178][Patch by Kevin McCormack]
+
+### Thanks
+
+  * Kevin McCormack
+
 ## 6.0.1: 2020-04-21 {#release-6-0-1}
 
 ### Improvements

data/lib/active_ldap/adapter/jndi_connection.rb

@@ -136,6 +136,7 @@ module ActiveLdap
         end
 
         escaped_base = escape_dn(base)
+
         loop do
           @context.search(escaped_base, filter, controls).each do |search_result|
             yield(build_raw_search_result(search_result))
@@ -166,26 +167,23 @@ module ActiveLdap
         records.each do |record|
           attributes.put(record.to_java_attribute)
         end
-        escaped_dn = escape_dn(dn)
         @context.set_request_controls([])
-        @context.create_subcontext(escaped_dn, attributes)
+        @context.create_subcontext(escape_dn(dn), attributes)
       end
 
       def modify(dn, records)
-        escaped_dn = escape_dn(dn)
         items = records.collect(&:to_java_modification_item)
         @context.set_request_controls([])
-        @context.modify_attributes(escaped_dn, items.to_java(ModificationItem))
+        @context.modify_attributes(escape_dn(dn), items.to_java(ModificationItem))
       end
 
       def modify_rdn(dn, new_rdn, delete_old_rdn)
-        escaped_dn = escape_dn(dn)
         # should use mutex
         delete_rdn_key = "java.naming.ldap.deleteRDN"
         @context.set_request_controls([])
         begin
           @context.add_to_environment(delete_rdn_key, delete_old_rdn.to_s)
-          @context.rename(escaped_dn, new_rdn)
+          @context.rename(escape_dn(dn), escape_dn(new_rdn))
         ensure
           @context.remove_from_environment(delete_rdn_key)
         end
@@ -230,34 +228,9 @@ module ActiveLdap
       end
 
       def escape_dn(dn)
-        parsed_dn = nil
-        begin
-          parsed_dn = DN.parse(dn)
-        rescue DistinguishedNameInvalid
-          return dn
-        end
-
-        escaped_rdns = parsed_dn.rdns.collect do |rdn|
-          escaped_rdn_strings = rdn.collect do |key, value|
-            escaped_value = DN.escape_value(value)
-            # We may need to escape the followings too:
-            #   * ,
-            #   * =
-            #   * +
-            #   * <
-            #   * >
-            #   * #
-            #   * ;
-            #
-            # See javax.naming.ldap.Rdn.unescapeValue()
-            escaped_value = escaped_value.gsub(/\\\\/) do
-              "\\5C"
-            end
-            "#{key}=#{escaped_value}"
-          end
-          escaped_rdn_strings.join("+")
-        end
-        escaped_rdns.join(",")
+        javax.naming.ldap.LdapName.new(dn)
+      rescue Java::JavaLang::IllegalArgumentException, Java::JavaxNaming::InvalidNameException
+        dn
       end
 
       def build_paged_results_control(page_size, page_cookie=nil)

data/lib/active_ldap/persistence.rb

@@ -81,9 +81,10 @@ module ActiveLdap
       end
     end
 
-    def reload
+    def reload(options={})
       clear_association_cache
-      _, attributes = search(:value => id).find do |_dn, _attributes|
+      search_options = options.merge(value: id)
+      _, attributes = search(search_options).find do |_dn, _attributes|
         dn == _dn
       end
       if attributes.nil?

data/lib/active_ldap/version.rb

@@ -1,3 +1,3 @@
 module ActiveLdap
-  VERSION = "6.0.1"
+  VERSION = "6.0.2"
 end

data/test/test_base.rb

@@ -383,6 +383,19 @@ class TestBase < Test::Unit::TestCase
     end
   end
 
+  def test_set_dn_with_unnormalized_dn_attribute_with_forward_slash 
+    make_temporary_user do |user,|
+      new_dn = "uid=temp/user1,#{user.class.base}"
+      assert_not_equal(user.dn.to_s, new_dn)
+
+      user.uid = 'temp/user1'
+      assert_equal(user.dn.to_s, new_dn)
+
+      assert_true(user.save!)
+      assert_true(user.class.find(user.uid).update_attributes!(gidNumber: 100069))
+    end
+ end
+
   def test_destroy_with_empty_base_and_prefix_of_class
     make_temporary_user do |user,|
       base = user.class.base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeldap
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Will Drewry
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel