diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-10-28 00:26:18 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-10-28 02:02:34 +0200 |
| commit | 50559c3829a28572a6ecdecce2ed6ec88d2a7046 (patch) | |
| tree | c17ef737ba460208a5168405526636d4208e0221 /base/server/cms/src/com | |
| parent | 443dcb1914f010ce8fc7c737dd8163e05a3d71db (diff) | |
Troubleshooting improvement for ConfigurationUtils.handleCerts().
To help troubleshooting, the ConfigurationUtils.handleCerts()
has been modified to throw the exception instead of returning an
integer.
https://fedorahosted.org/pki/ticket/2463
Diffstat (limited to 'base/server/cms/src/com')
| -rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java index 038afe8c5..9a39de051 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java @@ -3162,7 +3162,7 @@ public class ConfigurationUtils { cr.addCertificateRecord(record); } - public static int handleCerts(Cert cert) throws Exception { + public static void handleCerts(Cert cert) throws Exception { String certTag = cert.getCertTag(); String subsystem = cert.getSubsystem(); String nickname = cert.getNickname(); @@ -3170,7 +3170,7 @@ public class ConfigurationUtils { boolean enable = config.getBoolean(PCERT_PREFIX + certTag + ".enable", true); if (!enable) - return 0; + return; CMS.debug("handleCerts(): for cert tag '" + cert.getCertTag() + "' using cert type '" + cert.getType() + "'"); String b64 = cert.getCert(); @@ -3190,7 +3190,7 @@ public class ConfigurationUtils { if (findCertificate(tokenname, nickname)) { if (!certTag.equals("sslserver")) - return 0; + return; } X509CertImpl impl = CertUtil.createLocalCert(config, x509key, PCERT_PREFIX, certTag, cert.getType(), null); @@ -3291,7 +3291,7 @@ public class ConfigurationUtils { } else { CMS.debug("handleCerts(): b64 not set"); - return 1; + throw new PKIException("Missing " + certTag + " certificate to import"); } } else { @@ -3321,7 +3321,7 @@ public class ConfigurationUtils { CryptoUtil.importUserCertificate(impl, nickname, false); } catch (Exception ee) { CMS.debug("handleCerts(): Failed to import user certificate." + ee.toString()); - return 1; + throw new Exception("Unable to import " + certTag + " certificate: " + ee, ee); } } @@ -3339,7 +3339,6 @@ public class ConfigurationUtils { CryptoUtil.trustCertByNickname(NickName); CMS.reinit(ICertificateAuthority.ID); } - return 0; } public static void setCertPermissions(String tag) throws EBaseException, NotInitializedException, |