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: search_s based _is_value_present #5385

Merged
merged 10 commits into from
Oct 25, 2022
Merged

ldap_attrs: search_s based _is_value_present #5385

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f818788
search_s based _is_value_present
mrvanes Oct 19, 2022
2b48cfa
Fix formatted string and ldap import
mrvanes Oct 19, 2022
d001572
Add changelog fragment
mrvanes Oct 19, 2022
c32c107
Remove superfluous import ldap
mrvanes Oct 19, 2022
1e8c33b
Improve fragment
mrvanes Oct 19, 2022
2d1fd51
Code format {x} prefix
mrvanes Oct 21, 2022
f097855
Lower-case fixes
mrvanes Oct 21, 2022
014a65c
Fix suggestions to changelog
mrvanes Oct 23, 2022
4458bde
Break with the past and let bools be bools
mrvanes Oct 23, 2022
6e6cfa1
Let ldap_attrs break on invalid DN's
mrvanes Oct 23, 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/5385-search_s-based-_is_value_present.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- ldap_attrs - Fixes issue 977 by ignoring the {x} prefix on attribute values (https://github.com/ansible-collections/community.general/pull/5385).
mrvanes marked this conversation as resolved.
Show resolved Hide resolved
8 changes: 5 additions & 3 deletions plugins/modules/net_tools/ldap/ldap_attrs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.text.converters import to_native, to_bytes
from ansible_collections.community.general.plugins.module_utils.ldap import LdapGeneric, gen_specs

import re

LDAP_IMP_ERR = None
Expand Down Expand Up @@ -263,9 +264,10 @@ def exact(self):
def _is_value_present(self, name, value):
""" True if the target attribute has the given value. """
try:
is_present = bool(
self.connection.compare_s(self.dn, name, value))
except ldap.NO_SUCH_ATTRIBUTE:
filterstr = "(%s=%s)" % (name, value.decode())
dns = self.connection.search_s(self.dn, ldap.SCOPE_BASE, filterstr)
is_present = bool(len(dns) == 1)
mrvanes marked this conversation as resolved.
Show resolved Hide resolved
except (ldap.INVALID_DN_SYNTAX, ldap.NO_SUCH_OBJECT):
is_present = False

return is_present
Expand Down