Skip to content

Handle member_filter for entry without a UID set #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtodd merged 3 commits into from
Aug 20, 2014
Merged

Handle member_filter for entry without a UID set #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48c82e5
Add failing test for member_filter usage without uid
mtodd Aug 20, 2014
09f1a82
Conditionally amend filter if uids present
mtodd Aug 20, 2014
ba19f3f
Bump version to 1.3.1
mtodd Aug 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion github-ldap.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "github-ldap"
spec.version = "1.3.0"
spec.version = "1.3.1"
spec.authors = ["David Calavera"]
spec.email = ["david.calavera@gmail.com"]
spec.description = %q{Ldap authentication for humans}
Expand Down
15 changes: 11 additions & 4 deletions lib/github/ldap/filter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,17 @@ def group_filter(group_names)
# Returns a Net::LDAP::Filter.
def member_filter(entry = nil, uid_attr = @ldap.uid)
if entry
MEMBERSHIP_NAMES.map {|n| Net::LDAP::Filter.eq(n, entry.dn) }.
reduce(:|) |
entry[uid_attr]. map { |uid| Net::LDAP::Filter.eq("memberUid", uid) }.
reduce(:|)
filter =
MEMBERSHIP_NAMES. map {|n| Net::LDAP::Filter.eq(n, entry.dn) }.
reduce(:|)

if !entry[uid_attr].empty?
filter |=
entry[uid_attr].map { |uid| Net::LDAP::Filter.eq("memberUid", uid) }.
reduce(:|)
end

filter
else
(MEMBERSHIP_NAMES + %w(memberUid)).
map {|n| Net::LDAP::Filter.pres(n)}.reduce(:|)
Expand Down
6 changes: 6 additions & 0 deletions test/filter_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ def test_member_equal
@subject.member_filter(@entry).to_s
end

def test_member_without_uid
@entry.uid = nil
assert_equal "(|(member=#{@me})(uniqueMember=#{@me}))",
@subject.member_filter(@entry).to_s
end

def test_groups_reduced
assert_equal "(|(cn=Enterprise)(cn=People))",
@subject.group_filter(%w(Enterprise People)).to_s
Expand Down