Update get_attr_filter in LDAPSearch to handle nsaccountlock user searches #688
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ipaserver/plugins/baseldap.py
Outdated
| if name == 'nsaccountlock' and value == False: | ||
| # If nsaccountlock is False, set the value to True and | ||
| # search for nsaccountlock != True. This way we can search | ||
| # for any users where nsaccountlock=False or nsaccountlock=None. |
There was a problem hiding this comment.
No magic special cases please, the whole point of doing this in baseldap is that the fix would be generic. If the bit below doesn't work, we need to figure out how to make it work.
There was a problem hiding this comment.
OK, figured it out:
- The
nsaccountlockparam inuserplugin does not have a default value specified. - The check for default value below should actually look like this:
default = self.get_default_of(name, **options) if default is not None and value == default: fltr = ldap.combine_filters([fltr, '(!({}=*))'.format(name)])
redhatrises
force-pushed
the
ldap_search_nsaccountlock
branch
from
183eba4
to
a5a1428
Compare
|
@HonzaCholasta ready for your review. |
|
Bump for review |
|
Should this also go into the 4.5 branch? |
|
I guess it should. Could you please file a ticket? |
|
Thanks! |
HonzaCholasta
added
ack
|
Actually, please remove the change in Also please add the ticket link to commit messages. |
…rches - Update get_attr_filter in LDAPSearch to handle nsaccountlock by setting the default value for nsaccountlock to false as well as update the filter to check for the default value - Remove pytest xfail for test_find_enabled_user https://pagure.io/freeipa/issue/6896
redhatrises
force-pushed
the
ldap_search_nsaccountlock
branch
from
9346349
to
cbc48ae
Compare
|
@HonzaCholasta I removed the change to |
HonzaCholasta
added
ack
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update get_attr_filter in LDAPSearch to handle nsaccountlock by setting the default value for
nsaccountlock to false as well as update the filter to check for the default value
https://pagure.io/freeipa/issue/6896