Skip to content

Bug Fix: Fails to generate filter parser when given string includes multibyte chars. #66

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
merged 3 commits into from
Jul 22, 2013
Merged

Bug Fix: Fails to generate filter parser when given string includes multibyte chars. #66

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
e07b7dd
Add spec to reproduce FilterPraser.parse fails with multibyte char
May 14, 2013
d5a6c03
Simplify an example for FilterParser
May 16, 2013
4e88248
Fix: Fails to parser when given string includes multibyte chars.
May 16, 2013
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 lib/net/ldap/filter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@ def parse_filter_branch(scanner)
scanner.scan(/\s*/)
if op = scanner.scan(/<=|>=|!=|:=|=/)
scanner.scan(/\s*/)
if value = scanner.scan(/(?:[-\w*.+@=,#\$%&!'\s\xC3\x80-\xCA\xAF]|\\[a-fA-F\d]{2})+/)
if value = scanner.scan(/(?:[-\w*.+@=,#\$%&!'\s\xC3\x80-\xCA\xAF]|[^\x00-\x7F]|\\[a-fA-F\d]{2})+/u)
Copy link
Collaborator Author

@satoryu satoryu May 16, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refer to this thread on StackOverflow.

http://stackoverflow.com/questions/2124010/grep-regex-to-match-non-ascii-characters

# 20100313 AZ: Assumes that "(uid=george*)" is the same as
# "(uid=george* )". The standard doesn't specify, but I can find
# no examples that suggest otherwise.
Expand Down
20 changes: 20 additions & 0 deletions spec/unit/ldap/filter_parser_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# encoding: utf-8
require 'spec_helper'

describe Net::LDAP::Filter::FilterParser do

describe "#parse" do
context "Given ASCIIs as filter string" do
let(:filter_string) { "(cn=name)" }
specify "should generate filter object" do
expect(Net::LDAP::Filter::FilterParser.parse(filter_string)).to be_a Net::LDAP::Filter
end
end
context "Given string including multibyte chars as filter string" do
let(:filter_string) { "(cn=名前)" }
specify "should generate filter object" do
expect(Net::LDAP::Filter::FilterParser.parse(filter_string)).to be_a Net::LDAP::Filter
end
end
end
end