deac/ruby-net-ldap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Accept filters with only one clause to an & or |

Browse source
This commit is contained in:
Jamstah 2011-01-06 14:06:31 +00:00
parent 5bc73d3aa3
commit f3204bde6d
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/net/ldap/filter.rb
View file

@ -716,7 +716,7 @@ class Net::LDAP::Filter
filter = nil filter = nil
branches = parse_branches(scanner) branches = parse_branches(scanner)
if branches.size >= 2 if branches.size >= 1
filter = branches.shift filter = branches.shift
while not branches.empty? while not branches.empty?
filter = filter.__send__(op, branches.shift) filter = filter.__send__(op, branches.shift)

5
spec/unit/ldap/filter_spec.rb
View file

@ -24,7 +24,8 @@ describe Net::LDAP::Filter do
'(o:dn:=Ace Industry)', '(o:dn:=Ace Industry)',
'(:dn:2.4.8.10:=Dino)', '(:dn:2.4.8.10:=Dino)',
'(cn:dn:1.2.3.4.5:=John Smith)', '(cn:dn:1.2.3.4.5:=John Smith)',
'(sn:dn:2.4.6.8.10:=Barbara Jones)', '(sn:dn:2.4.6.8.10:=Barbara Jones)',
'(&(sn:dn:2.4.6.8.10:=Barbara Jones))'
].each do |filter_str| ].each do |filter_str|
context "from_rfc2254(#{filter_str.inspect})" do context "from_rfc2254(#{filter_str.inspect})" do
attr_reader :filter attr_reader :filter
@ -80,4 +81,4 @@ describe Net::LDAP::Filter do
Net::LDAP::Filter.escape('!&*:|~').should == "\\21\\26\\2A\\3A\\7C\\7E" Net::LDAP::Filter.escape('!&*:|~').should == "\\21\\26\\2A\\3A\\7C\\7E"
end end
end end
end end

14
test/test_filter.rb
View file

@ -45,6 +45,10 @@ class TestFilter < Test::Unit::TestCase
Filter.from_rfc2254("(! (mail=*))").to_rfc2254) Filter.from_rfc2254("(! (mail=*))").to_rfc2254)
end end
def test_filter_with_single_clause
assert_equal("(cn=name)", Net::LDAP::Filter.construct("(&(cn=name))").to_s)
end
def test_filters_from_ber def test_filters_from_ber
[ [
Net::LDAP::Filter.eq("objectclass", "*"), Net::LDAP::Filter.eq("objectclass", "*"),
@ -69,11 +73,11 @@ class TestFilter < Test::Unit::TestCase
Net::LDAP::Filter.eq("objectclass", "aaa*"), Net::LDAP::Filter.eq("objectclass", "aaa*"),
Net::LDAP::Filter.eq("objectclass", "aaa*bbb*"), Net::LDAP::Filter.eq("objectclass", "aaa*bbb*"),
Net::LDAP::Filter.eq("objectclass", "aaa*bbb*ccc*"), Net::LDAP::Filter.eq("objectclass", "aaa*bbb*ccc*"),
].each {|ber| ].each do |ber|
f = Net::LDAP::Filter.parse_ber(ber.to_ber.read_ber(Net::LDAP::AsnSyntax)) f = Net::LDAP::Filter.parse_ber(ber.to_ber.read_ber(Net::LDAP::AsnSyntax))
assert(f == ber) assert(f == ber)
assert_equal(f.to_ber, ber.to_ber) assert_equal(f.to_ber, ber.to_ber)
} end
end end
def test_ber_from_rfc2254_filter def test_ber_from_rfc2254_filter
@ -102,10 +106,10 @@ class TestFilter < Test::Unit::TestCase
Net::LDAP::Filter.construct("objectclass=aaa*"), Net::LDAP::Filter.construct("objectclass=aaa*"),
Net::LDAP::Filter.construct("objectclass=aaa*bbb*"), Net::LDAP::Filter.construct("objectclass=aaa*bbb*"),
Net::LDAP::Filter.construct("objectclass=aaa*bbb*ccc*"), Net::LDAP::Filter.construct("objectclass=aaa*bbb*ccc*"),
].each {|ber| ].each do |ber|
f = Net::LDAP::Filter.parse_ber(ber.to_ber.read_ber(Net::LDAP::AsnSyntax)) f = Net::LDAP::Filter.parse_ber(ber.to_ber.read_ber(Net::LDAP::AsnSyntax))
assert(f == ber) assert(f == ber)
assert_equal(f.to_ber, ber.to_ber) assert_equal(f.to_ber, ber.to_ber)
} end
end end
end end