ldap_fluff 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5648d1eb100608b85c3815cc5ae5a215cd1ce5b0
-  data.tar.gz: afb387b8210f7120263b218bb2e3def00a7deb80
+  metadata.gz: 54e77169e6958e3e3c2abaa3963fb82e2e897d90
+  data.tar.gz: 393ddfd24ecb0f28f0d301b3edb30a8788adebb2
 SHA512:
-  metadata.gz: 11596e7ac3c290ab3270432bfc0f13fbed11d39a8ebd4daa9f5f699656405b1f5f27c9637afc8a4b08c4829a72e2cbea2084b50d38ff271c48bfa5d1354784cc
-  data.tar.gz: 58d72eb169b5df0a0d4f00cb29b44c56e82b7436b5b85e530daf4e17698768e1a3fd211f3e2c07ee0b1d7de344ef3477371196cbe1209aa5de1fae974559728a
+  metadata.gz: 5e90e3e250a2385281f112968328d60b8039dd7c701c9a0d866f77962022bd68a1e57c82229c396e93617fc12d4ca51ec0d38aaa7e32b15ab4f990c7dca83d21
+  data.tar.gz: b7e6b676a1b16506271951f7a7f299b6f2e4bb7ebe89fffd79925f4e77c67dd690f6bbc5b2005066ccbe08a4fceea7706dce09cd0dc2304ab27d5ee3874ceb3f

data/lib/ldap_fluff/generic_member_service.rb

@@ -22,8 +22,9 @@ class LdapFluff::GenericMemberService
   end
 
   def find_by_dn(dn)
-    entry, base = dn.split(',', 2)
+    entry, base = dn.split(/(?<!\\),/, 2)
     entry_attr, entry_value = entry.split('=', 2)
+    entry_value = entry_value.gsub('\,', ',')
     user = @ldap.search(:filter => name_filter(entry_value, entry_attr), :base => base)
     raise self.class::UIDNotFoundException if (user.nil? || user.empty?)
     user

data/test/ad_member_services_test.rb

@@ -120,6 +120,17 @@ class TestADMemberService < MiniTest::Test
     @ldap.verify
   end
 
+  def test_find_by_dn_comma_in_cn
+    # In at least one AD installation, users who have commas in their CNs are
+    # returned by the server in answer to a group membership query with
+    # backslashes before the commas in the CNs. Such escaped commas should not
+    # be used when splitting the DN.
+    @ldap.expect(:search, [:result], [:filter => Net::LDAP::Filter.eq('cn', 'Bar, Foo'), :base => 'dc=example,dc=com'])
+    @adms.ldap = @ldap
+    assert_equal([:result], @adms.find_by_dn('cn=Bar\, Foo,dc=example,dc=com'))
+    @ldap.verify
+  end
+
   def test_find_by_dn_missing_entry
     @ldap.expect(:search, nil, [:filter => Net::LDAP::Filter.eq('cn', 'Foo Bar'), :base => 'dc=example,dc=com'])
     @adms.ldap = @ldap

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldap_fluff
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Jordan O'Mara
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
@@ -70,6 +70,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple library for binding & group querying on top of various LDAP implementations
 email:
 - jomara@redhat.com
@@ -118,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='