Some error strings were duplicate which makes it then harder to see what is the real root cause of it.
https://fedorahosted.org/freeipa/ticket/3988 --- I tried to leave the most general error messages as is (entry not found) and only specify the rare ones -> test suite is still passing. Martin
From 83354e577ceac4c590ffa00e9ead996255aeb2a2 Mon Sep 17 00:00:00 2001 From: Martin Kosek <[email protected]> Date: Tue, 29 Oct 2013 17:19:28 +0100 Subject: [PATCH] Remove ipa-pwd-extop and ipa-enrollment duplicate error strings Some error strings were duplicate which makes it then harder to see what is the real root cause of it. https://fedorahosted.org/freeipa/ticket/3988 --- .../ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c | 9 ++++++--- .../ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 19 +++++++++++-------- ipalib/plugins/cert.py | 8 ++++---- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c index 9f884bd39233adf90b0f4eff1868885d587d351a..56e969980046aba42d9a6036d0e059804dd6da8c 100644 --- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c +++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c @@ -184,7 +184,7 @@ ipa_join(Slapi_PBlock *pb) slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_RESULT, &res); if (ret == -1 || res != LDAP_SUCCESS) { LOG_TRACE("Search for host failed, err (%d)\n", res?res:ret); - errMesg = "Host not found.\n"; + errMesg = "Host not found (search failed).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } @@ -193,7 +193,7 @@ ipa_join(Slapi_PBlock *pb) slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es); if (!es) { LOG_TRACE("No entries ?!"); - errMesg = "Host not found.\n"; + errMesg = "Host not found (no result returned).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } @@ -204,7 +204,10 @@ ipa_join(Slapi_PBlock *pb) /* if there is none or more than one, freak out */ if (i != 1) { LOG_TRACE("Too many entries, or entry no found (%d)", i); - errMesg = "Host not found.\n"; + if (i == 0) + errMesg = "Host not found.\n"; + else + errMesg = "Host not found (too many entries).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c index 1058c313d1f2a193eb7fae621bc9c5d103fb6d5f..87518aa0b7c61f444a0e77f01c4cc3c411f8c71c 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c @@ -719,7 +719,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) bsdn = slapi_be_getsuffix(be, 0); if (bsdn == NULL) { LOG_TRACE("Search for Base DN failed\n"); - errMesg = "PrincipalName not found.\n"; + errMesg = "PrincipalName not found (search for Base DN failed).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } @@ -743,7 +743,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) if (ret == -1 || res != LDAP_SUCCESS) { LOG_TRACE("Search for Principal failed, err (%d)\n", res ? res : ret); - errMesg = "PrincipalName not found.\n"; + errMesg = "PrincipalName not found (search failed).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } @@ -752,7 +752,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es); if (!es) { LOG_TRACE("No entries ?!"); - errMesg = "PrincipalName not found.\n"; + errMesg = "PrincipalName not found (no result returned).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } @@ -763,7 +763,10 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) /* if there is none or more than one, freak out */ if (i != 1) { LOG_TRACE("Too many entries, or entry no found (%d)", i); - errMesg = "PrincipalName not found.\n"; + if (i == 0) + errMesg = "PrincipalName not found.\n"; + else + errMesg = "PrincipalName not found (too many entries).\n"; rc = LDAP_NO_SUCH_OBJECT; goto free_and_return; } @@ -857,7 +860,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) rtag = ber_scanf(ber, "{t[{t[i]t[o]}]", &ttmp, &ttmp, &tint, &ttmp, &tval); if (rtag == LBER_ERROR) { LOG_FATAL("ber_scanf failed\n"); - errMesg = "Invalid payload, failed to decode.\n"; + errMesg = "Invalid payload, failed to decode EncryptionKey.\n"; rc = LDAP_PROTOCOL_ERROR; goto free_and_return; } @@ -906,7 +909,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) rtag = ber_scanf(ber, "t[{t[i]", &ttmp, &ttmp, &tint); if (rtag == LBER_ERROR) { LOG_FATAL("ber_scanf failed\n"); - errMesg = "Invalid payload, failed to decode.\n"; + errMesg = "Invalid payload, failed to decode KrbSalt type.\n"; rc = LDAP_PROTOCOL_ERROR; goto free_and_return; } @@ -920,7 +923,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) rtag = ber_scanf(ber, "t[o]}]", &ttmp, &tval); if (rtag == LBER_ERROR) { LOG_FATAL("ber_scanf failed\n"); - errMesg = "Invalid payload, failed to decode.\n"; + errMesg = "Invalid payload, failed to decode KrbSalt contents.\n"; rc = LDAP_PROTOCOL_ERROR; goto free_and_return; } @@ -948,7 +951,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg) } if (rtag == LBER_ERROR) { LOG_FATAL("ber_scanf failed\n"); - errMesg = "Invalid payload, failed to decode.\n"; + errMesg = "Invalid payload, failed to decode s2kparams.\n"; rc = LDAP_PROTOCOL_ERROR; goto free_and_return; } diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index fbab0b4aa47132411f35bc9174987e30b3a7ee19..cef27d947783b2ab4950ddaf323712769a99da40 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -142,7 +142,8 @@ def get_csr_hostname(csr): subject = pkcs10.get_subject(request) return subject.common_name except NSPRError, nsprerr: - raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request:')) + raise errors.CertificateOperationError( + error=_('Failure decoding Certificate Signing Request: %s') % str(nsprerr)) def get_subjectaltname(csr): """ @@ -155,7 +156,8 @@ def get_subjectaltname(csr): return nss.x509_alt_name(extension.value)[0] return None except NSPRError, nsprerr: - raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request')) + raise errors.CertificateOperationError( + error=_('Failure decoding Certificate Signing Request: %s') % str(nsprerr)) def validate_csr(ugettext, csr): """ @@ -171,8 +173,6 @@ def validate_csr(ugettext, csr): request = pkcs10.load_certificate_request(csr) except TypeError, e: raise errors.Base64DecodeError(reason=str(e)) - except NSPRError: - raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request')) except Exception, e: raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request: %s') % str(e)) -- 1.8.3.1
_______________________________________________ Freeipa-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/freeipa-devel
