From 8983ce53e3fdee98926f81f3012146e33bb92d30 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: May 09 2017 12:28:13 +0000 Subject: ipa-kra-install: fix check_host_keys 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 Reviewed-By: Martin Basti --- diff --git a/ipaserver/secrets/kem.py b/ipaserver/secrets/kem.py index c1991c6..3363d82 100644 --- a/ipaserver/secrets/kem.py +++ b/ipaserver/secrets/kem.py @@ -72,7 +72,7 @@ class KEMLdap(iSecLdap): 'princ': principal}) r = conn.search_s(self.keysbase, scope, ldap_filter) if len(r) != 1: - raise ValueError("Incorrect number of results (%d) searching for" + raise ValueError("Incorrect number of results (%d) searching for " "public key for %s" % (len(r), principal)) ipa_public_key = r[0][1]['ipaPublicKey'][0] jwk = self._parse_public_key(ipa_public_key) @@ -85,9 +85,8 @@ class KEMLdap(iSecLdap): 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" - "public key for %s" % (len(r), host)) + if not r: + raise ValueError("No public keys were found for %s" % host) return True def _format_public_key(self, key):