fix(core): remove new-line characters from certificate name

2 files changed, 88 insertions, 63 deletions

diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
index dee5d90..703a08d 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/CertificateProviderServlet.java
@@ -11,6 +11,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang3.StringUtils;
+
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.config.KeyGroupEntry;
@@ -42,69 +44,7 @@ public class CertificateProviderServlet extends HttpServlet {
 
   public static final String PARAM_KEYID = "id";
 
-  /**
-   * Build the set of <code>KeyEntryID</code>s available to the given
-   * <code>keyGroupID</code>.
-   *
-   * @param keyGroupID The keygroup ID for which the available keys should be
-   *                   returned.
-   * @return The <code>Set</code> of <code>KeyEntryID</code>s identifying the
-   *         available keys.
-   * @throws ConfigurationException
-   */
-  @SuppressWarnings({ "rawtypes", "unchecked" })
-  private Set buildKeySet(String keyGroupID, X509Certificate cert, KeyModule module)
-      throws ConfigurationException {
-    final ConfigurationProvider config = ConfigurationProvider.getInstance();
-    Set keyGroupEntries;
-
-    // get the KeyGroup entries from the configuration
-    if (cert != null) {
-      final Principal issuer = cert.getIssuerDN();
-      final BigInteger serialNumber = cert.getSerialNumber();
-
-      keyGroupEntries = config.getKeyGroupEntries(issuer, serialNumber,
-          keyGroupID);
-    } else {
-      keyGroupEntries = config.getKeyGroupEntries(null, null, keyGroupID);
-    }
 
-    // map the KeyGroup entries to a set of KeyEntryIDs
-    if (keyGroupEntries == null) {
-      return null;
-    } else if (keyGroupEntries.size() == 0) {
-      return Collections.EMPTY_SET;
-    } else {
-
-      final Set keyEntryIDs = module.getPrivateKeyEntryIDs();
-      final Set keySet = new HashSet();
-      Iterator iter;
-
-      // filter out the keys that do not exist in the IAIK configuration
-      // by walking through the key entries and checking if the exist in
-      // the
-      // keyGroupEntries
-      for (iter = keyEntryIDs.iterator(); iter.hasNext();) {
-        final KeyEntryID entryID = (KeyEntryID) iter.next();
-        final KeyGroupEntry entry = new KeyGroupEntry(entryID.getModuleID(),
-            entryID.getCertificateIssuer(),
-            entryID.getCertificateSerialNumber());
-        if (keyGroupEntries.contains(entry)) {
-          keySet.add(entryID);
-        }
-      }
-      return keySet;
-    }
-  }
-
-  private X509Certificate getClientCertificate(HttpServletRequest request) {
-    final X509Certificate[] clientCert = (X509Certificate[]) request
-        .getAttribute(X509_CERTIFICATE_PROPERTY);
-    if (clientCert != null) {
-      return clientCert[0];
-    }
-    return null;
-  }
 
   @Override
   @SuppressWarnings("rawtypes")
@@ -157,7 +97,8 @@ public class CertificateProviderServlet extends HttpServlet {
           final byte[] certData = keyCert.getEncoded();
           response.setStatus(HttpServletResponse.SC_OK);
           response.setContentType("application/pkix-cert");
-          response.setHeader("Content-disposition", "attachment; filename=\"" + keyId + ".cer\"");
+          response.setHeader("Content-disposition", "attachment; filename=\""
+              + StringUtils.deleteWhitespace(keyId) + ".cer\"");
           response.getOutputStream().write(certData);
           response.getOutputStream().close();
           return;
@@ -175,4 +116,69 @@ public class CertificateProviderServlet extends HttpServlet {
       response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     }
   }
+
+  /**
+   * Build the set of <code>KeyEntryID</code>s available to the given
+   * <code>keyGroupID</code>.
+   *
+   * @param keyGroupID The keygroup ID for which the available keys should be
+   *                   returned.
+   * @return The <code>Set</code> of <code>KeyEntryID</code>s identifying the
+   *         available keys.
+   * @throws ConfigurationException
+   */
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  private Set buildKeySet(String keyGroupID, X509Certificate cert, KeyModule module)
+      throws ConfigurationException {
+    final ConfigurationProvider config = ConfigurationProvider.getInstance();
+    Set keyGroupEntries;
+
+    // get the KeyGroup entries from the configuration
+    if (cert != null) {
+      final Principal issuer = cert.getIssuerDN();
+      final BigInteger serialNumber = cert.getSerialNumber();
+
+      keyGroupEntries = config.getKeyGroupEntries(issuer, serialNumber, keyGroupID);
+    } else {
+      keyGroupEntries = config.getKeyGroupEntries(null, null, keyGroupID);
+
+    }
+
+    // map the KeyGroup entries to a set of KeyEntryIDs
+    if (keyGroupEntries == null) {
+      return null;
+    } else if (keyGroupEntries.size() == 0) {
+      return Collections.EMPTY_SET;
+    } else {
+
+      final Set keyEntryIDs = module.getPrivateKeyEntryIDs();
+      final Set keySet = new HashSet();
+      Iterator iter;
+
+      // filter out the keys that do not exist in the IAIK configuration
+      // by walking through the key entries and checking if the exist in
+      // the
+      // keyGroupEntries
+      for (iter = keyEntryIDs.iterator(); iter.hasNext();) {
+        final KeyEntryID entryID = (KeyEntryID) iter.next();
+        final KeyGroupEntry entry = new KeyGroupEntry(entryID.getModuleID(),
+            entryID.getCertificateIssuer(),
+            entryID.getCertificateSerialNumber());
+        if (keyGroupEntries.contains(entry)) {
+          keySet.add(entryID);
+        }
+      }
+      return keySet;
+    }
+  }
+
+  private X509Certificate getClientCertificate(HttpServletRequest request) {
+    final X509Certificate[] clientCert = (X509Certificate[]) request
+        .getAttribute(X509_CERTIFICATE_PROPERTY);
+    if (clientCert != null) {
+      return clientCert[0];
+    }
+    return null;
+  }
+
 }
diff --git a/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/utils/UtilsTest.java b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/utils/UtilsTest.java
new file mode 100644
index 0000000..7ddebaa
--- /dev/null
+++ b/moaSig/moa-sig/src/test/java/at/gv/egovernment/moa/spss/test/integration/utils/UtilsTest.java
@@ -0,0 +1,19 @@
+package at.gv.egovernment.moa.spss.test.integration.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+@RunWith(BlockJUnit4ClassRunner.class)
+public class UtilsTest {
+
+  @Test
+  public void characterCleanUp() {
+    String text = "Hello\nWorld\r\nThis is Java.\rNew lines gone!";
+    String result = StringUtils.deleteWhitespace(text);
+    assertEquals("HelloWorldThisisJava.Newlinesgone!", result);
+  }
+}