#335 Certificate authority extensions are now configurable

And the command checks for a lot more of them by default

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/security/DeployCertificateAuthoritiesCommand.java

@@ -3,16 +3,33 @@
 import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.AbstractCommand;
 import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.ResourceFilenameFilter;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.mgmt.resource.security.CertificateAuthorityManager;
 import org.springframework.http.ResponseEntity;
 
 import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
 
 public class DeployCertificateAuthoritiesCommand extends AbstractCommand {
 
     public DeployCertificateAuthoritiesCommand() {
         setExecuteSortOrder(SortOrderConstants.DEPLOY_CERTIFICATE_AUTHORITIES);
+
+	    ResourceFilenameFilter filter = new ResourceFilenameFilter();
+	    Set<String> extensions = new HashSet<>();
+	    extensions.add(".cer");
+	    extensions.add(".crt");
+	    extensions.add(".der");
+	    extensions.add(".p12");
+	    extensions.add(".p7b");
+	    extensions.add(".p7r");
+	    extensions.add(".pem");
+	    extensions.add(".pfx");
+	    extensions.add(".spc");
+	    filter.setSupportedFilenameExtensions(extensions);
+	    setResourceFilenameFilter(filter);
     }
 
     @Override
@@ -21,16 +38,14 @@ public void execute(CommandContext context) {
 		    File dir = configDir.getCertificateAuthoritiesDir();
 		    if (dir.exists()) {
 			    CertificateAuthorityManager mgr = new CertificateAuthorityManager(context.getManageClient());
-			    for (File f : dir.listFiles()) {
-				    if (f.getName().endsWith("crt")) {
-					    if (logger.isInfoEnabled()) {
-						    logger.info("Creating certificate authority from file: " + f.getAbsolutePath());
-					    }
-					    String payload = copyFileToString(f, context);
-					    ResponseEntity<String> response = mgr.create(payload);
-					    if (logger.isInfoEnabled()) {
-						    logger.info("Created certificate authority, location: " + response.getHeaders().getLocation());
-					    }
+			    for (File f : listFilesInDirectory(dir)) {
+				    if (logger.isInfoEnabled()) {
+					    logger.info("Creating certificate authority from file: " + f.getAbsolutePath());
+				    }
+				    String payload = copyFileToString(f, context);
+				    ResponseEntity<String> response = mgr.create(payload);
+				    if (logger.isInfoEnabled()) {
+					    logger.info("Created certificate authority, location: " + response.getHeaders().getLocation());
 				    }
 			    }
 		    } else {

src/test/java/com/marklogic/appdeployer/command/security/ManageCertificateAuthoritiesTest.java

@@ -1,10 +1,12 @@
 package com.marklogic.appdeployer.command.security;
 
-import org.junit.Test;
-
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.command.ResourceFilenameFilter;
 import com.marklogic.mgmt.resource.security.CertificateAuthorityManager;
 import com.marklogic.rest.util.ResourcesFragment;
+import org.junit.Test;
+
+import java.util.Set;
 
 /**
  * All we can reliably do from a file-driven approach is create a certificate authority. The Management REST API in
@@ -14,24 +16,35 @@
  */
 public class ManageCertificateAuthoritiesTest extends AbstractAppDeployerTest {
 
-    @Test
-    public void test() {
-        // Run the command to create a certificate authority
-        initializeAppDeployer(new DeployCertificateAuthoritiesCommand());
-        appDeployer.deploy(appConfig);
-
-        // Get the ID of the created certificate authority
-        CertificateAuthorityManager mgr = new CertificateAuthorityManager(manageClient);
-        ResourcesFragment resources = mgr.getAsXml();
-        String id = resources.getListItemValue("MarkLogic TX Engineering", "idref");
-        assertNotNull("The certificate authority should have been created", id);
-
-        // Delete the certificate authority
-        mgr.delete(id);
-
-        // And then verify that it's gone
-        resources = mgr.getAsXml();
-        id = resources.getListItemValue("MarkLogic TX Engineering", "idref");
-        assertNull("The certificate authority should no longer exist", id);
-    }
+	@Test
+	public void test() {
+		// Run the command to create a certificate authority
+		initializeAppDeployer(new DeployCertificateAuthoritiesCommand());
+		appDeployer.deploy(appConfig);
+
+		// Get the ID of the created certificate authority
+		CertificateAuthorityManager mgr = new CertificateAuthorityManager(manageClient);
+		ResourcesFragment resources = mgr.getAsXml();
+		String id = resources.getListItemValue("MarkLogic TX Engineering", "idref");
+		assertNotNull("The certificate authority should have been created", id);
+
+		// Delete the certificate authority
+		mgr.delete(id);
+
+		// And then verify that it's gone
+		resources = mgr.getAsXml();
+		id = resources.getListItemValue("MarkLogic TX Engineering", "idref");
+		assertNull("The certificate authority should no longer exist", id);
+	}
+
+	@Test
+	public void verifyFileExtensions() {
+		DeployCertificateAuthoritiesCommand command = new DeployCertificateAuthoritiesCommand();
+		ResourceFilenameFilter filter = (ResourceFilenameFilter) command.getResourceFilenameFilter();
+		Set<String> extensions = filter.getSupportedFilenameExtensions();
+
+		for (String extension : new String[]{".cer", ".crt", ".der", ".p12", ".p7b", ".p7r", ".pem", ".pfx", ".spc"}) {
+			assertTrue(extensions.contains(extension));
+		}
+	}
 }