issue #591

Author: rathnapandi

CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 # [1.14.15]  In progress
 
 ### Fixed
-
+- Extend the functionality of "override_certificates" environment property [#591](https://github.com/Axway-API-Management-Plus/apim-cli/issues/591)
 
 ### Added
 - API import supports `-safeUpdate` to prevent updates when an existing API path belongs to a different API name [#556](https://github.com/Axway-API-Management-Plus/apim-cli/issues/556)

modules/apim-adapter/src/main/java/com/axway/apim/api/model/CaCert.java

@@ -1,5 +1,6 @@
 package com.axway.apim.api.model;
 
+import com.axway.apim.lib.utils.Utils;
 import com.fasterxml.jackson.annotation.JsonFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -180,10 +181,15 @@ public String getCertFile() {
                 filename = "UnknownCertificate_" + UUID.randomUUID();
                 LOG.warn("Created a random filename: {}.ctr", filename);
             } else {
+                filename = Utils.replaceSpecialChars(filename);
                 filename = filename.replace(" ", "");
-                filename = filename.replace("*", "");
-                filename = filename.replace("/", "");
-                if (filename.startsWith(".")) filename = filename.replaceFirst("\\.", "");
+                if (filename.startsWith(".")) {
+                    filename = filename.replaceFirst("\\.", "");
+                }
+                if (filename.isEmpty()) {
+                    LOG.warn("Certificate CN contained only invalid filename characters for alias: {}", this.getAlias());
+                    filename = "UnknownCertificate_" + UUID.randomUUID();
+                }
             }
             certFile = filename + ".crt";
             return certFile;

modules/apim-adapter/src/test/java/com/axway/apim/api/model/CaCertTest.java

@@ -18,5 +18,17 @@ public void testCertCommonNameWithClash(){
         Assert.assertTrue(!fileName.contains("/"));
     }
 
+    @Test
+    public void testCertCommonNameWithBackslash() {
+        CaCert caCert = new CaCert();
+        caCert.setAlias("CN=DigitalGuardian\\,OU=Trusted");
+
+        String fileName = caCert.getCertFile();
+
+        Assert.assertEquals(fileName, "DigitalGuardian.crt");
+        Assert.assertFalse(fileName.contains("\\"));
+        Assert.assertFalse(fileName.contains("/"));
+    }
+
 
 }