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

ldap_attrs: escape ldap search filter #5435

Merged
merged 6 commits into from
Nov 4, 2022
Merged

ldap_attrs: escape ldap search filter #5435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41c3c7b
escape ldap search filter
rekup Oct 28, 2022
d68c6fe
move escape to separate line
rekup Oct 28, 2022
622f3da
add changelog fragment
rekup Oct 28, 2022
d7a56f6
Update changelogs/fragments/5435-escape-ldap-param.yml
rekup Oct 28, 2022
9ebe7cb
fix encoding
rekup Oct 28, 2022
a0df4f3
fixup! fix encoding
rekup Oct 29, 2022
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: 2 additions & 0 deletions changelogs/fragments/5435-escape-ldap-param.yml
View file
Open in desktop
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/ldap_attrs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,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 @@ -264,7 +265,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