Support for multiple certificate keystores accessed by identifier.

Server/src/main/java/CheckCertificate.java

@@ -221,7 +221,7 @@ public int CheckCertStore(String host, int port, String uri, String targetKeySto
 
     private void checkUsingApacheHttp(String host, int port, String uri, String targetKeyStore, String keyStorePwd) throws Exception {
         System.out.println("Trying using Apache HTTP Client...");
-        Map<String, String> httpOptions = new HashMap<String, String>();
+        Map<String, Object> httpOptions = new HashMap<String, Object>();
         if (auth_user != null) {
             httpOptions.put(HTTPUtil.PARAM_HTTP_USER, auth_user);
             httpOptions.put(HTTPUtil.PARAM_HTTP_PWD, auth_pwd);

Server/src/main/java/org/openas2/Session.java

@@ -51,7 +51,7 @@ public interface Session {
      * @see CertificateFactory
      * @see Component
      */
-    CertificateFactory getCertificateFactory() throws ComponentNotFoundException;
+    CertificateFactory getCertificateFactory(String componentID) throws ComponentNotFoundException;
 
     /**
      * Gets the <code>Component</code> currently registered with an ID

Server/src/main/java/org/openas2/app/cert/AliasedCertCommand.java

@@ -11,7 +11,7 @@ public abstract class AliasedCertCommand extends BaseCommand {
     public CommandResult execute(Object[] params) {
 
         try {
-            CertificateFactory certFx = getSession().getCertificateFactory();
+            CertificateFactory certFx = getSession().getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
 
             if (certFx instanceof AliasedCertificateFactory) {
                 return execute((AliasedCertificateFactory) certFx, params);

Server/src/main/java/org/openas2/cmd/XMLCommandRegistry.java

@@ -63,7 +63,10 @@ public void refresh() throws OpenAS2Exception {
 
     protected void loadCommand(Node node, MultiCommand parent) throws OpenAS2Exception {
         Command cmd = (Command) XMLUtil.getComponent(node, getSession());
-
+        if (cmd == null) {
+            // Must be disabled so do nothing
+            return;
+        }
         if (parent != null) {
             parent.getCommands().add(cmd);
         } else {

Server/src/main/java/org/openas2/cmd/processor/restapi/ApiResource.java

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import org.openas2.cert.AliasedCertificateFactory;
+import org.openas2.cert.CertificateFactory;
 import org.openas2.cmd.CommandResult;
 import org.openas2.cmd.processor.RestCommandProcessor;
 
@@ -225,7 +226,7 @@ private CommandResult importCertificateByStream(String itemId, MultivaluedMap<St
             params.add("importbystream");
             params.add(itemId);
             String payload = formParams.getFirst("data");
-            AliasedCertificateFactory certFx = (AliasedCertificateFactory) getProcessor().getSession().getCertificateFactory();
+            AliasedCertificateFactory certFx = (AliasedCertificateFactory) getProcessor().getSession().getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
             ByteArrayInputStream bais = new ByteArrayInputStream(Base64.getDecoder().decode(payload));
 
             java.security.cert.CertificateFactory cf = java.security.cert.CertificateFactory.getInstance("X.509");

Server/src/main/java/org/openas2/processor/receiver/AS2ReceiverHandler.java

@@ -311,7 +311,7 @@ protected AS2Message createMessage(Socket s) {
     }
 
     protected String decryptAndVerify(AS2Message msg) throws OpenAS2Exception {
-        CertificateFactory certFx = getModule().getSession().getCertificateFactory();
+        CertificateFactory certFx = getModule().getSession().getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
         ICryptoHelper ch;
         String mic = null;
 
@@ -633,7 +633,7 @@ public void createMDNData(Session session, MessageMDN mdn, String micAlg, String
         reportPart.setHeader(MimeUtil.MIME_CONTENT_TYPE_KEY, unfoldHeaders?MimeUtility.unfold(reportMultiPart.getContentType()):reportMultiPart.getContentType());
         // Sign the data if needed
         if (signatureProtocol != null) {
-            CertificateFactory certFx = session.getCertificateFactory();
+            CertificateFactory certFx = session.getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
 
             try {
                 // The receiver of the original message is the sender of the MDN - sign with the receivers private key

Server/src/main/java/org/openas2/processor/receiver/NetModule.java

@@ -102,7 +102,7 @@ public boolean healthcheck(List<String> failures) {
             if (logger.isTraceEnabled()) {
                 logger.trace("Helthcheck about to try URL: " + urlString);
             }
-            Map<String, String> options = new HashMap<String, String>();
+            Map<String, Object> options = new HashMap<String, Object>();
             options.put(HTTPUtil.HTTP_PROP_OVERRIDE_SSL_CHECKS, "true");
             ResponseWrapper rw = HTTPUtil.execRequest(HTTPUtil.Method.GET, urlString, null, null, null, options, 0L, false);
             if (200 != rw.getStatusCode()) {

Server/src/main/java/org/openas2/processor/sender/AS2SenderModule.java

@@ -183,7 +183,7 @@ private void sendMessage(String url, Message msg, MimeBodyPart securedData) thro
             logger.info("Connecting to: " + url + msg.getLogMsgID());
         }
 
-        Map<String, String> httpOptions = getHttpOptions();
+        Map<String, Object> httpOptions = getHttpOptions();
         httpOptions.put(HTTPUtil.PARAM_HTTP_USER, msg.getPartnership().getAttribute(HTTPUtil.PARAM_HTTP_USER));
         httpOptions.put(HTTPUtil.PARAM_HTTP_PWD, msg.getPartnership().getAttribute(HTTPUtil.PARAM_HTTP_PWD));
         long maxSize = msg.getPartnership().getNoChunkedMaxSize();
@@ -331,7 +331,7 @@ protected MimeBodyPart secure(Message msg) throws Exception {
             dataBP = AS2Util.getCryptoHelper().compress(msg, dataBP, compressionType, contentTxfrEncoding);
         }
         // Encrypt and/or sign the data if requested
-        CertificateFactory certFx = getSession().getCertificateFactory();
+        CertificateFactory certFx = getSession().getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
 
         // Sign the data if requested
         if (sign) {

Server/src/main/java/org/openas2/processor/sender/MDNSenderModule.java

@@ -142,7 +142,7 @@ private boolean sendAsyncMDN(MessageMDN mdn, String url, DispositionType disposi
                 logger.debug("ASYNC MDN attempting connection to: " + url + mdn.getMessage().getLogMsgID());
             }
             long maxSize = msg.getPartnership().getNoChunkedMaxSize();
-            Map<String, String> httpOptions = getHttpOptions();
+            Map<String, Object> httpOptions = getHttpOptions();
             httpOptions.put(HTTPUtil.PARAM_HTTP_USER, msg.getPartnership().getAttribute(HTTPUtil.PARAM_HTTP_USER));
             httpOptions.put(HTTPUtil.PARAM_HTTP_PWD, msg.getPartnership().getAttribute(HTTPUtil.PARAM_HTTP_PWD));
             // Convert the MimebodyPart to a string so we know how big it is to set Content-Length

Server/src/main/java/org/openas2/test/MimeBodyPartEncodingTest.java

@@ -105,7 +105,7 @@ public static void main(String[] args) {
             session.getPartnershipFactory().updatePartnership(msg, true);
             msg.updateMessageID();
 
-            CertificateFactory certFx = session.getCertificateFactory();
+            CertificateFactory certFx = session.getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
             String x509_alias = msg.getPartnership().getAlias(Partnership.PTYPE_SENDER);
             X509Certificate senderCert = certFx.getCertificate(x509_alias);
 

Server/src/main/java/org/openas2/util/AS2Util.java

@@ -54,13 +54,20 @@ public static ICryptoHelper getCryptoHelper() throws Exception {
 
     public static String generateMessageID(Message msg, boolean isMDN) throws InvalidParameterException {
         String idFormat = null;
-        CompositeParameters params = new CompositeParameters(false).add("date", new DateParameters()).add("msg", new MessageParameters(msg)).add("rand", new RandomParameters());
+        CompositeParameters params = new CompositeParameters(
+                false).add("date",
+                new DateParameters()).add("msg",
+                new MessageParameters(msg)).add("rand",new RandomParameters()
+        );
         if (isMDN) {
             params.add("mdn", new MessageMDNParameters(msg.getMDN()));
             idFormat = msg.getPartnership().getAttributeOrProperty(Properties.AS2_MDN_MESSAGE_ID_FORMAT, null);
         }
         if (idFormat == null) {
-            idFormat = msg.getPartnership().getAttributeOrProperty(Properties.AS2_MESSAGE_ID_FORMAT, "<OPENAS2-$date.ddMMyyyyHHmmssZ$-$rand.UUID$@$msg.sender.as2_id$_$msg.receiver.as2_id$>");
+            idFormat = msg.getPartnership().getAttributeOrProperty(
+                Properties.AS2_MESSAGE_ID_FORMAT,
+                "<OPENAS2-$date.ddMMyyyyHHmmssZ$-$rand.UUID$@$msg.sender.as2_id$_$msg.receiver.as2_id$>"
+            );
         }
         String id = ParameterParser.parse(idFormat, params);
         // RFC822 requires enclosing message in <> but AS2 spec provides for this to be
@@ -497,7 +504,7 @@ public static boolean processMDN(AS2Message msg, byte[] data, OutputStream out,
             logger.error(msg.getLogMsg(), e1);
             return AS2Util.resend(session, sourceClass, SenderModule.DO_SEND, msg, new OpenAS2Exception(e1), true, false);
         }
-        CertificateFactory cFx = session.getCertificateFactory();
+        CertificateFactory cFx = session.getCertificateFactory(CertificateFactory.COMPID_AS2_CERTIFICATE_FACTORY);
         String x509_alias = mdn.getPartnership().getAlias(Partnership.PTYPE_RECEIVER);
         X509Certificate senderCert = cFx.getCertificate(x509_alias);
 

Server/src/test/java/org/openas2/app/BaseServerSetup.java

@@ -14,7 +14,7 @@
 import org.openas2.util.Properties;
 
 
-public class BaserServerSetup {
+public class BaseServerSetup {
     private static final TestResource RESOURCE = TestResource.forGroup("SingleServerTest");
     static String myCompanyOid = "MyCompany_OID";
     static String myPartnerOid = "PartnerA_OID";