github-ldap 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c2327d79def9d64d8f90b46e6a12b7055ed6ac
-  data.tar.gz: 3e1a9c422a6d1729c526d21657c51ee15b7662c3
+  metadata.gz: 96b1f68d57cf80fa875ffc231b72822bba47c34d
+  data.tar.gz: 53c74070947453c23c1fb2163d88a1fa29df21ed
 SHA512:
-  metadata.gz: b347d766538664ea6d4a5b93cc4f4ef7eea792f601ae03e4aa8a4f824e0e3d9aa7867257cad27e7daee6a686e1e144b23b5531cb6f38a4b1394f4d3688f8c981
-  data.tar.gz: 424fa3a3f07d1871c464d9aae38cd48dc2dec3b0a6200060923ee20d13ba59e70c815fca37047d18577d40a034b2a3d4c068b9b39d71d5d13ebb96849d156460
+  metadata.gz: a20a3b6049bc7a8fe8415bed1aab25cdfcc1cd58778a71f62ab1ec966b9545715f38d14225b84d445b9b62e46e9f855adb144b9cf5e18196e19b3830c8770e64
+  data.tar.gz: 8c1dd5779c00b8b29b7331886ad575ae830ee1753bd9b538183d7bb489acc3b5320ebc8400987ba8d6ebe62243ae2f6465a3c20ce10aa81751cba1d7e44e4061

data/github-ldap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "github-ldap"
-  spec.version       = "1.1.1"
+  spec.version       = "1.1.2"
   spec.authors       = ["David Calavera"]
   spec.email         = ["david.calavera@gmail.com"]
   spec.description   = %q{Ldap authentication for humans}

data/lib/github/ldap/group.rb

@@ -63,8 +63,9 @@ module GitHub
       #
       # Returns an array of Net::LDAP::Entry.
       def member_entries
-        @member_entries ||= member_names.map do |m|
-          @ldap.domain(m).bind
+        @member_entries ||= member_names.each_with_object([]) do |m, a|
+          entry = @ldap.domain(m).bind
+          a << entry if entry
         end
       end
 

data/test/fixtures/github-with-missing-entries.ldif

@@ -0,0 +1,94 @@
+version: 1
+
+# Organizations
+
+dn: dc=github,dc=com
+cn: github
+objectClass: dcObject
+objectClass: organization
+dc: github
+o: GitHub Inc.
+
+# Admin user
+
+dn: uid=admin,dc=github,dc=com
+objectClass: top
+objectClass: person
+objectClass: organizationalPerson
+objectClass: inetOrgPerson
+cn: system administrator
+sn: administrator
+displayName: Directory Superuser
+uid: admin
+userPassword: secret
+
+# Groups
+
+dn: ou=groups,dc=github,dc=com
+objectclass: organizationalUnit
+
+dn: cn=enterprise,ou=groups,dc=github,dc=com
+cn: Enterprise
+objectClass: groupOfNames
+member: uid=calavera,ou=users,dc=github,dc=com
+member: cn=enterprise-devs,ou=groups,dc=github,dc=com
+member: cn=enterprise-ops,ou=groups,dc=github,dc=com
+
+dn: cn=enterprise-devs,ou=groups,dc=github,dc=com
+cn: enterprise-devs
+objectClass: groupOfNames
+member: uid=benburkert,ou=users,dc=github,dc=com
+member: cn=enterprise,ou=groups,dc=github,dc=com
+
+dn: cn=enterprise-ops,ou=groups,dc=github,dc=com
+cn: enterprise-ops
+objectClass: groupOfNames
+member: uid=sbryant,ou=users,dc=github,dc=com
+member: cn=spaniards,ou=groups,dc=github,dc=com
+
+# The last member of this group is missing on purpose.
+# See: https://github.com/github/github-ldap/pull/18
+dn: cn=spaniards,ou=groups,dc=github,dc=com
+cn: spaniards
+objectClass: groupOfNames
+member: uid=calavera,ou=users,dc=github,dc=com
+member: uid=rubiojr,ou=users,dc=github,dc=com
+member: uid=felipe,ou=users,dc=github,dc=com
+
+# Users
+
+dn: ou=users,dc=github,dc=com
+objectclass: organizationalUnit
+
+dn: uid=calavera,ou=users,dc=github,dc=com
+cn: David Calavera
+cn: David
+sn: Calavera
+uid: calavera
+userPassword: passworD1
+mail: calavera@github.com
+objectClass: inetOrgPerson
+
+dn: uid=benburkert,ou=users,dc=github,dc=com
+cn: benburkert
+sn: benburkert
+uid: benburkert
+userPassword: passworD1
+mail: benburkert@github.com
+objectClass: inetOrgPerson
+
+dn: uid=sbryant,ou=users,dc=github,dc=com
+cn: sbryant
+sn: sbryant
+uid: sbryant
+userPassword: passworD1
+mail: sbryant@github.com
+objectClass: inetOrgPerson
+
+dn: uid=rubiojr,ou=users,dc=github,dc=com
+cn: rubiojr
+sn: rubiojr
+uid: rubiojr
+userPassword: passworD1
+mail: rubiojr@github.com
+objectClass: inetOrgPerson

data/test/group_test.rb

@@ -51,3 +51,21 @@ class GitHubLdapLoopedGroupTest < GitHub::Ldap::Test
     assert_equal 4, @group.members.size
   end
 end
+
+class GitHubLdapMissingEntriesTest < GitHub::Ldap::Test
+  def self.test_server_options
+    {user_fixtures: FIXTURES.join('github-with-missing-entries.ldif').to_s}
+  end
+
+  def setup
+    @ldap = GitHub::Ldap.new(options)
+  end
+
+  def test_load_right_members
+    assert_equal 3, @ldap.domain("cn=spaniards,ou=groups,dc=github,dc=com").bind[:member].size
+  end
+
+  def test_ignore_missing_member_entries
+    assert_equal 2, @ldap.group("cn=spaniards,ou=groups,dc=github,dc=com").members.size
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-ldap
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ldap
@@ -105,6 +105,7 @@ files:
 - test/domain_test.rb
 - test/filter_test.rb
 - test/fixtures/github-with-looped-subgroups.ldif
+- test/fixtures/github-with-missing-entries.ldif
 - test/fixtures/github-with-subgroups.ldif
 - test/group_test.rb
 - test/ldap_test.rb
@@ -137,6 +138,7 @@ test_files:
 - test/domain_test.rb
 - test/filter_test.rb
 - test/fixtures/github-with-looped-subgroups.ldif
+- test/fixtures/github-with-missing-entries.ldif
 - test/fixtures/github-with-subgroups.ldif
 - test/group_test.rb
 - test/ldap_test.rb