Fixed selftest error handling.

The selftest has been modified to throw an exception and provide
more specific error message if a test fails in order to help
troubleshoot the problem.

https://fedorahosted.org/pki/ticket/1328

2 files changed, 20 insertions, 20 deletions

diff --git a/base/common/src/com/netscape/certsrv/apps/CMS.java b/base/common/src/com/netscape/certsrv/apps/CMS.java
index 84fc3f743..94f5c1687 100644
--- a/base/common/src/com/netscape/certsrv/apps/CMS.java
+++ b/base/common/src/com/netscape/certsrv/apps/CMS.java
@@ -1377,23 +1377,23 @@ public final class CMS {
      * Verifies all system certs
      * with tags defined in <subsystemtype>.cert.list
      */
-    public static boolean verifySystemCerts() {
-        return _engine.verifySystemCerts();
+    public static void verifySystemCerts() throws Exception {
+        _engine.verifySystemCerts();
     }
 
     /**
      * Verify a system cert by tag name
      * with tags defined in <subsystemtype>.cert.list
      */
-    public static boolean verifySystemCertByTag(String tag) {
-        return _engine.verifySystemCertByTag(tag);
+    public static void verifySystemCertByTag(String tag) throws Exception {
+        _engine.verifySystemCertByTag(tag);
     }
 
     /**
      * Verify a system cert by certificate nickname
      */
-    public static boolean verifySystemCertByNickname(String nickname, String certificateUsage) {
-        return _engine.verifySystemCertByNickname(nickname, certificateUsage);
+    public static void verifySystemCertByNickname(String nickname, String certificateUsage) throws Exception {
+        _engine.verifySystemCertByNickname(nickname, certificateUsage);
     }
 
     /**
diff --git a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
index e9b5b765f..e024208fd 100644
--- a/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
+++ b/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java
@@ -29,14 +29,6 @@ import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Vector;
 
-import netscape.ldap.LDAPConnection;
-import netscape.ldap.LDAPException;
-import netscape.ldap.LDAPSSLSocketFactoryExt;
-import netscape.security.util.ObjectIdentifier;
-import netscape.security.x509.Extension;
-import netscape.security.x509.GeneralName;
-import netscape.security.x509.X509CertInfo;
-
 import org.mozilla.jss.CryptoManager.CertificateUsage;
 import org.mozilla.jss.util.PasswordCallback;
 
@@ -80,6 +72,14 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.cmsutil.net.ISocketFactory;
 import com.netscape.cmsutil.password.IPasswordStore;
 
+import netscape.ldap.LDAPConnection;
+import netscape.ldap.LDAPException;
+import netscape.ldap.LDAPSSLSocketFactoryExt;
+import netscape.security.util.ObjectIdentifier;
+import netscape.security.x509.Extension;
+import netscape.security.x509.GeneralName;
+import netscape.security.x509.X509CertInfo;
+
 /**
  * This interface represents the CMS core framework. The
  * framework contains a set of services that provide
@@ -798,24 +798,24 @@ public interface ICMSEngine extends ISubsystem {
     /**
      * Verifies all system certificates
      *
-     * @return true if all passed, false otherwise
+     * @throws Exception if something is wrong
      */
-    public boolean verifySystemCerts();
+    public void verifySystemCerts() throws Exception;
 
     /**
      * Verifies a system certificate by its tag name
      * as defined in <subsystemtype>.cert.list
      *
-     * @return true if passed, false otherwise
+     * @throws Exception if something is wrong
      */
-    public boolean verifySystemCertByTag(String tag);
+    public void verifySystemCertByTag(String tag) throws Exception;
 
     /**
      * Verifies a system certificate by its nickname
      *
-     * @return true if passed, false otherwise
+     * @throws Exception if something is wrong
      */
-    public boolean verifySystemCertByNickname(String nickname, String certificateUsage);
+    public void verifySystemCertByNickname(String nickname, String certificateUsage) throws Exception;
 
     /**
      * get the CertificateUsage as defined in JSS CryptoManager