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

Merge branch 'filter_escaping' of https://github.com/Jamstah/ruby-net-ldap into Jamstah-filter_escaping

Browse source
This commit is contained in:
Austin Ziegler 2011-03-17 22:37:44 -04:00
parent 50c76e1f82 0b0688d434
commit 2a63ae72b9
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,12 +229,11 @@ class Net::LDAP::Filter
# string using a single backslash ('\') as escape. # string using a single backslash ('\') as escape.
# #
ESCAPES = { ESCAPES = {
'!' => '21', # EXCLAMATION = %x21 ; exclamation mark ("!") "\0" => '00', # NUL = %x00 ; null character
'&' => '26', # AMPERSAND = %x26 ; ampersand (or AND symbol) ("&") '*' => '2A', # ASTERISK = %x2A ; asterisk ("*")
'*' => '2A', # ASTERISK = %x2A ; asterisk ("*") '(' => '28', # LPARENS = %x28 ; left parenthesis ("(")
':' => '3A', # COLON = %x3A ; colon (":") ')' => '29', # RPARENS = %x29 ; right parenthesis (")")
'|' => '7C', # VERTBAR = %x7C ; vertical bar (or pipe) ("|") '\\' => '5C', # ESC = %x5C ; esc (or backslash) ("\")
'~' => '7E', # TILDE = %x7E ; tilde ("~")
} }
# Compiled character class regexp using the keys from the above hash. # Compiled character class regexp using the keys from the above hash.
ESCAPE_RE = Regexp.new( ESCAPE_RE = Regexp.new(

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

@ -77,8 +77,8 @@ describe Net::LDAP::Filter do
end end
end end
describe "<- .escape(str)" do describe "<- .escape(str)" do
it "should escape !, &, *, :, | and ~" do it "should escape nul, *, (, ) and \\" do
Net::LDAP::Filter.escape('!&*:|~').should == "\\21\\26\\2A\\3A\\7C\\7E" Net::LDAP::Filter.escape("\0*()\\").should == "\\00\\2A\\28\\29\\5C"
end end
end end
end end

7
test/test_filter.rb
View file

@ -24,6 +24,13 @@ class TestFilter < Test::Unit::TestCase
assert_equal("(uid=george *)", Filter.eq("uid", "george *").to_s) assert_equal("(uid=george *)", Filter.eq("uid", "george *").to_s)
end end
def test_convenience_filters
assert_equal("(uid=\\2A)", Filter.equals("uid", "*").to_s)
assert_equal("(uid=\\28*)", Filter.begins("uid", "(").to_s)
assert_equal("(uid=*\\29)", Filter.ends("uid", ")").to_s)
assert_equal("(uid=*\\5C*)", Filter.contains("uid", "\\").to_s)
end
def test_c2 def test_c2
assert_equal("(uid=george *)", assert_equal("(uid=george *)",
Filter.from_rfc2254("uid=george *").to_rfc2254) Filter.from_rfc2254("uid=george *").to_rfc2254)