ipa-kra-install: fix check_host_keys #766
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
MartinBasti
reviewed
May 9, 2017
ipaserver/secrets/kem.py
Outdated
| @@ -85,8 +85,8 @@ def check_host_keys(self, host): | |||
|
|
|||
| ldap_filter = self.build_filter(IPA_CHECK_QUERY, {'host': host}) | |||
| r = conn.search_s(self.keysbase, scope, ldap_filter) | |||
| if len(r) != 1: | |||
| raise ValueError("Incorrect number of results (%d) searching for" | |||
| if len(r) < 1: | |||
There was a problem hiding this comment.
Hello,
I think that if not r: is more pythonic and I'd also rephrase the error message, to "No public keys were found ...."
It is just nitpick, thanks.
There was a problem hiding this comment.
Nitpicks for now, but AFAIK pylint 1.7.1 will report these checks as errors.
ipa-kra-install on a replica checks that the keys are available before going further to avoid race condition due to replication. The issue is that the check_host_keys method expects to find exactly one key for cn=env/host but 2 may exist: one below cn=custodia and one below cn=dogtag,cn=custodia. The fix is to check that at least one key exist (not exactly one key). https://pagure.io/freeipa/issue/6934
flo-renaud
force-pushed
the
fixkrareplicainstall
branch
from
3acd6f0
to
3e5250c
Compare
|
Hi @MartinBasti @martbab |
MartinBasti
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.
ipa-kra-install on a replica checks that the keys are available before
going further to avoid race condition due to replication. The issue is
that the check_host_keys method expects to find exactly one key for
cn=env/host but 2 may exist: one below cn=custodia and one below
cn=dogtag,cn=custodia.
The fix is to check that at least one key exist (not exactly one key).
https://pagure.io/freeipa/issue/6934