Fixing adding authenticator indicators to host #761
Closed
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
+ wrong author in the commit |
stlaz
reviewed
May 4, 2017
ipaserver/plugins/host.py
Outdated
| @@ -884,7 +884,8 @@ def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): | |||
| msg = 'Principal name already set, it is unchangeable.' | |||
| raise errors.ACIError(info=msg) | |||
| obj_classes = entry_attrs_old['objectclass'] | |||
| if 'krbprincipalaux' not in obj_classes: | |||
| if 'krbprincipalaux' not in set(item.lower() for item in | |||
There was a problem hiding this comment.
I do not see any reason to construct a set from the result.
|
I'd fix it on all places in host-mod: so that the plugin would be consistent. Rest of framework can be fixed other time. |
stlaz
reviewed
May 5, 2017
ipaserver/plugins/host.py
Outdated
| @@ -920,7 +920,7 @@ def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): | |||
| else: | |||
| _entry_attrs = ldap.get_entry(dn, ['objectclass']) | |||
| obj_classes = _entry_attrs['objectclass'] | |||
| if 'ieee802device' not in obj_classes: | |||
| if 'ieee802device' not in [item.lower() for item in obj_classes]: | |||
There was a problem hiding this comment.
My point was that this should be a generator expression.
There was a problem hiding this comment.
By generator expression, you mean this?
(item.lower() for item in obj_classes)
|
Done |
stlaz
reviewed
May 10, 2017
ipaserver/plugins/host.py
Outdated
| @@ -949,14 +950,16 @@ def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): | |||
| if 'objectclass' not in entry_attrs: | |||
| entry_attrs_old = ldap.get_entry(dn, ['objectclass']) | |||
| entry_attrs['objectclass'] = entry_attrs_old['objectclass'] | |||
| if 'krbticketpolicyaux' not in entry_attrs['objectclass']: | |||
| if 'krbticketpolicyaux' not in (item.lower() for item in | |||
| obj_classes): | |||
There was a problem hiding this comment.
obj_classes are possibly undefined here, looks like a copy-paste error to me.
stlaz
reviewed
May 10, 2017
ipaserver/plugins/host.py
Outdated
| entry_attrs['objectclass'].append('krbticketpolicyaux') | ||
|
|
||
| if 'krbprincipalauthind' in entry_attrs: | ||
| if 'objectclass' not in entry_attrs: | ||
| entry_attrs_old = ldap.get_entry(dn, ['objectclass']) | ||
| entry_attrs['objectclass'] = entry_attrs_old['objectclass'] | ||
| if 'krbprincipalaux' not in entry_attrs['objectclass']: | ||
| if 'krbprincipalaux' not in (item.lower() for item in | ||
| obj_classes): |
There was a problem hiding this comment.
obj_classes are possibly undefined here, looks like a copy-paste error to me.
There was a problem hiding this comment.
That exactly what happened. Thank you for pointing me that :)
It's fixed now. If you think it is, I can squash my commits into a single one.
|
Yes, that seems to have fixed that. Please do squash them now, I guess we can ACK this ;) |
The check for krbprincipalaux in the entries is now made case-insensitively. https://pagure.io/freeipa/issue/6911
|
Cool :)) thanks! |
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.
The check for krbprincipalaux in the entries is now made case-insensitively.
https://pagure.io/freeipa/issue/6911
https://bugzilla.redhat.com/show_bug.cgi?id=1441593#c2