Skip to content

Commit

Permalink
ldap_attrs: escape ldap search filter (ansible-collections#5435)
Browse files Browse the repository at this point in the history
* escape ldap search filter

* move escape to separate line

* add changelog fragment

* Update changelogs/fragments/5435-escape-ldap-param.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

* fix encoding

* fixup! fix encoding

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 1a97ca1)
  • Loading branch information
rekup authored and felixfontein committed Nov 4, 2022
1 parent d119905 commit 30eda7f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/5435-escape-ldap-param.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- ldap_attrs - fix bug which caused a ``Bad search filter`` error. The error was occuring when the ldap attribute value contained special characters such as ``(`` or ``*`` (https://github.com/ansible-collections/community.general/issues/5434, https://github.com/ansible-collections/community.general/pull/5435).
6 changes: 4 additions & 2 deletions plugins/modules/net_tools/ldap/ldap_attrs.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,15 @@
import traceback

from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.text.converters import to_native, to_bytes
from ansible.module_utils.common.text.converters import to_native, to_bytes, to_text
from ansible_collections.community.general.plugins.module_utils.ldap import LdapGeneric, gen_specs

import re

LDAP_IMP_ERR = None
try:
import ldap
import ldap.filter

HAS_LDAP = True
except ImportError:
Expand Down Expand Up @@ -262,7 +263,8 @@ def exact(self):
def _is_value_present(self, name, value):
""" True if the target attribute has the given value. """
try:
filterstr = "(%s=%s)" % (name, value.decode())
escaped_value = ldap.filter.escape_filter_chars(to_text(value))
filterstr = "(%s=%s)" % (name, escaped_value)
dns = self.connection.search_s(self.dn, ldap.SCOPE_BASE, filterstr)
is_present = len(dns) == 1
except ldap.NO_SUCH_OBJECT:
Expand Down

0 comments on commit 30eda7f

Please sign in to comment.