Skip to content
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

Jump to bottom

Active Directory fixes for alternate encoding RFC4514 #324

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Active Directory fixes for alternate encoding RFC4514 #324

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f6e1a5
Merge pull request #1 from sunbirddcim/merge-upstream-master
straggler7 Jul 10, 2019
a4bf8d1
Update the Filter Parser for Sec 2.4 RFC 4514
cmdrclueless Jul 10, 2019
019f2aa
Change the version to reflect that it's not stock
cmdrclueless Jul 10, 2019
4944574
Revert "Change the version to reflect that it's not stock"
cmdrclueless Jul 10, 2019
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
9 changes: 7 additions & 2 deletions lib/net/ldap/filter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ def match(entry)
##
# Converts escaped characters (e.g., "\\28") to unescaped characters
# @note slawson20170317: Don't attempt to unescape 16 byte binary data which we assume are objectGUIDs
# The binary form of 5936AE79-664F-44EA-BCCB-5C39399514C6 triggers a BINARY -> UTF-8 conversion error
# The binary form of 5936AE79-664F-44EA-BCCB-5C39399514C6 triggers a BINARY -> UTF-8 conversion error
def unescape(right)
right = right.to_s
if right.length == 16 && right.encoding == Encoding::BINARY
Expand Down Expand Up @@ -759,10 +759,15 @@ 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]|[^\x00-\x7F]|\\[a-fA-F\d]{2})+/u)
if value = scanner.scan(/(?:[-\[\]{}\w*.+\/:@=,#\$%&!'^~\s\xC3\x80-\xCA\xAF]|[^\x00-\x7F]|\x5C(?:[\x20-\x23]|[\x2B\x2C]|[\x3B-\x3E]|\x5C)|\\[a-fA-F\d]{2})+/u)
# 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.
#
# 20190710 CmdrClueless
# RFC-4514, Section 2.4 adds to the scanner regex above
# \x5C(?:[\x20-\x23]|[\x2B\x2C]|[\x3B-\x3E]|\x5C)
# This is commonly done by ActiveDirectory, with a DN such as CN=#Supers,CN=Users,DC=test,DC=com
value.strip!
case op
when "="
Expand Down