Adjusted the SignServer error messages

ebourg · Nov 13, 2024 · bc1bedd · bc1bedd
1 parent 863e958
commit bc1bedd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/jsign-crypto/src/main/java/net/jsign/KeyStoreType.java b/jsign-crypto/src/main/java/net/jsign/KeyStoreType.java
@@ -550,8 +550,11 @@ Provider getProvider(KeyStoreBuilder params) {
     SIGNSERVER(false, false, false) {
         @Override
         void validate(KeyStoreBuilder params) {
+            if (params.keystore() == null) {
+                throw new IllegalArgumentException("keystore " + params.parameterName() + " must specify the SignServer API endpoint (e.g. https://example.com/signserver/)");
+            }
             if (params.storepass() != null && params.storepass().split("\\|").length > 2) {
-                throw new IllegalArgumentException("storepass " + params.parameterName() + " must specify the SignServer username/password or the path to the keystore containing the TLS client certificate: <username>|<password>, <certificate>");
+                throw new IllegalArgumentException("storepass " + params.parameterName() + " must specify the SignServer username/password or the path to the keystore containing the TLS client certificate: <username>|<password> or <certificate>");
             }
         }
 

diff --git a/jsign-crypto/src/main/java/net/jsign/jca/SignServerSigningService.java b/jsign-crypto/src/main/java/net/jsign/jca/SignServerSigningService.java
@@ -37,7 +37,6 @@
 import net.jsign.DigestAlgorithm;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Objects.requireNonNull;
 
 /**
  * Signing service using the Keyfactor SignServer REST API.
@@ -58,9 +57,7 @@ public class SignServerSigningService implements SigningService {
      * @param credentials      the SignServer credentials
      */
     public SignServerSigningService(String endpoint, SignServerCredentials credentials) {
-        this.client = new RESTClient(
-                requireNonNull(endpoint, "You need to provide the SignServer endpoint URL as keystore parameter")
-                        + (endpoint.endsWith("/") ? "" : "/"))
+        this.client = new RESTClient(endpoint)
                 .authentication(conn -> {
                     if (conn instanceof HttpsURLConnection && credentials.keystore != null) {
                         try {

diff --git a/jsign-crypto/src/test/java/net/jsign/KeyStoreBuilderTest.java b/jsign-crypto/src/test/java/net/jsign/KeyStoreBuilderTest.java
@@ -309,15 +309,15 @@ public void testBuildGaraSign() throws Exception {
     public void testBuildSignServer() throws Exception {
         KeyStoreBuilder builder = new KeyStoreBuilder().storetype(SIGNSERVER);
 
-        Exception e = assertThrows(NullPointerException.class, builder::build);
-        assertEquals("message", "You need to provide the SignServer endpoint URL as keystore parameter", e.getMessage());
+        Exception e = assertThrows(IllegalArgumentException.class, builder::build);
+        assertEquals("message", "keystore parameter must specify the SignServer API endpoint (e.g. https://example.com/signserver/)", e.getMessage());
 
         builder.keystore("https://example.com/signserver");
 
         builder.storepass("username|password|certificate.p12");
 
         e = assertThrows(IllegalArgumentException.class, builder::build);
-        assertEquals("message", "storepass parameter must specify the SignServer username/password or the path to the keystore containing the TLS client certificate: <username>|<password>, <certificate>", e.getMessage());
+        assertEquals("message", "storepass parameter must specify the SignServer username/password or the path to the keystore containing the TLS client certificate: <username>|<password> or <certificate>", e.getMessage());
 
         builder.storepass("username|password");