Started extracting MDN creation on reception; #140

Author: phax

phase2-lib/src/main/java/com/helger/phase2/processor/receiver/net/AS2ReceiverHandler.java

@@ -63,6 +63,7 @@
 import com.helger.phase2.cert.ECertificatePartnershipType;
 import com.helger.phase2.cert.ICertificateFactory;
 import com.helger.phase2.crypto.ICryptoHelper;
+import com.helger.phase2.crypto.MIC;
 import com.helger.phase2.disposition.AS2DispositionException;
 import com.helger.phase2.disposition.DispositionType;
 import com.helger.phase2.exception.AS2Exception;
@@ -406,7 +407,7 @@ protected void sendSyncMDN (@Nonnull final String sClientInfo,
         final IAS2Session aSession = m_aReceiverModule.getSession ();
 
         // Main MDN creation
-        final IMessageMDN aMdn = AS2Helper.createMDN (aSession, aMsg, aDisposition, sText);
+        final IMessageMDN aMdn = AS2Helper.createSyncMDN (aSession, aMsg, aDisposition, sText);
 
         if (aMsg.isRequestingAsynchMDN ())
         {
@@ -570,6 +571,18 @@ public void handleIncomingMessage (@Nonnull final String sClientInfo,
         // message
         decrypt (aMsg, aResHelper);
 
+        // TODO Calculate MIC before decompress #140
+        MIC aBeforeDecompressMIC;
+        try
+        {
+          aBeforeDecompressMIC = AS2Helper.createMICOnReception (aMsg);
+        }
+        catch (final Exception ex)
+        {
+          // Ignore error
+          aBeforeDecompressMIC = null;
+        }
+
         if (aCryptoHelper.isCompressed (aMsg.getContentType ()))
         {
           if (LOGGER.isTraceEnabled ())
@@ -697,7 +710,7 @@ public void handleIncomingMessage (@Nonnull final String sClientInfo,
 
             // Just send a HTTP OK
             HTTPHelper.sendSimpleHTTPResponse (aResponseHandler, CHttp.HTTP_OK);
-            LOGGER.info ("sent HTTP OK " + sClientInfo + aMsg.getLoggingText ());
+            LOGGER.info ("Sent HTTP OK " + sClientInfo + aMsg.getLoggingText ());
           }
         }
         catch (final Exception ex)
@@ -718,7 +731,7 @@ public void handleIncomingMessage (@Nonnull final String sClientInfo,
       {
         // close and delete the temporary shared stream if it exists
         final TempSharedFileInputStream sis = aMsg.getTempSharedFileInputStream ();
-        if (null != sis)
+        if (sis != null)
         {
           try
           {
@@ -767,11 +780,10 @@ public void handle (@Nonnull final AbstractActiveNetModule aOwner, @Nonnull fina
     }
     else
     {
-      if (aMsgDataSource instanceof ByteArrayDataSource)
+      if (aMsgDataSource instanceof final ByteArrayDataSource aBADS)
       {
         LOGGER.info ("received " +
-                     AS2IOHelper.getTransferRate (((ByteArrayDataSource) aMsgDataSource).directGetBytes ().length,
-                                                  aSW) +
+                     AS2IOHelper.getTransferRate (aBADS.directGetBytes ().length, aSW) +
                      " from " +
                      sClientInfo +
                      aMsg.getLoggingText ());

phase2-lib/src/main/java/com/helger/phase2/util/AS2Helper.java

@@ -239,6 +239,38 @@ public static void createMDNData (@Nonnull final IAS2Session aSession,
     // (size));
   }
 
+  @Nullable
+  public static MIC createMICOnReception (@Nonnull final AS2Message aMsg) throws Exception
+  {
+    final Partnership aPartnership = aMsg.partnership ();
+
+    final String sDispositionOptions = aMsg.getHeader (CHttpHeader.DISPOSITION_NOTIFICATION_OPTIONS);
+    final DispositionOptions aDispositionOptions = DispositionOptions.createFromString (sDispositionOptions);
+
+    ECryptoAlgorithmSign eSigningAlgorithm = aDispositionOptions.getFirstMICAlg ();
+    if (eSigningAlgorithm == null)
+    {
+      // Try from partnership (#93)
+      final String sSigningAlgorithm = aPartnership.getSigningAlgorithm ();
+      eSigningAlgorithm = ECryptoAlgorithmSign.getFromIDOrNull (sSigningAlgorithm);
+      if (eSigningAlgorithm == null)
+      {
+        LOGGER.warn ("The partnership signing algorithm name '" + sSigningAlgorithm + "' is unknown.");
+      }
+    }
+
+    if (eSigningAlgorithm == null)
+      return null;
+
+    // If the source message was signed or encrypted, include the headers -
+    // see message sending for details
+    final boolean bIncludeHeadersInMIC = aPartnership.getSigningAlgorithm () != null ||
+                                         aPartnership.getEncryptAlgorithm () != null ||
+                                         aPartnership.getCompressionType () != null;
+
+    return getCryptoHelper ().calculateMIC (aMsg.getData (), eSigningAlgorithm, bIncludeHeadersInMIC);
+  }
+
   /**
    * Create a new MDN
    *
@@ -255,10 +287,10 @@ public static void createMDNData (@Nonnull final IAS2Session aSession,
    *         In case of an error
    */
   @Nonnull
-  public static IMessageMDN createMDN (@Nonnull final IAS2Session aSession,
-                                       @Nonnull final AS2Message aMsg,
-                                       @Nonnull final DispositionType aDisposition,
-                                       @Nonnull final String sText) throws Exception
+  public static IMessageMDN createSyncMDN (@Nonnull final IAS2Session aSession,
+                                           @Nonnull final AS2Message aMsg,
+                                           @Nonnull final DispositionType aDisposition,
+                                           @Nonnull final String sText) throws Exception
   {
     ValueEnforcer.notNull (aSession, "AS2Session");
     ValueEnforcer.notNull (aMsg, "AS2Message");
@@ -324,29 +356,8 @@ public static IMessageMDN createMDN (@Nonnull final IAS2Session aSession,
     final String sDispositionOptions = aMsg.getHeader (CHttpHeader.DISPOSITION_NOTIFICATION_OPTIONS);
     final DispositionOptions aDispositionOptions = DispositionOptions.createFromString (sDispositionOptions);
 
-    ECryptoAlgorithmSign eSigningAlgorithm = aDispositionOptions.getFirstMICAlg ();
-    if (eSigningAlgorithm == null)
-    {
-      // Try from partnership (#93)
-      final String sSigningAlgorithm = aPartnership.getSigningAlgorithm ();
-      eSigningAlgorithm = ECryptoAlgorithmSign.getFromIDOrNull (sSigningAlgorithm);
-      if (eSigningAlgorithm == null)
-      {
-        LOGGER.warn ("The partnership signing algorithm name '" + sSigningAlgorithm + "' is unknown.");
-      }
-    }
-
-    MIC aMIC = null;
-    if (eSigningAlgorithm != null)
-    {
-      // If the source message was signed or encrypted, include the headers -
-      // see message sending for details
-      final boolean bIncludeHeadersInMIC = aPartnership.getSigningAlgorithm () != null ||
-                                           aPartnership.getEncryptAlgorithm () != null ||
-                                           aPartnership.getCompressionType () != null;
-
-      aMIC = getCryptoHelper ().calculateMIC (aMsg.getData (), eSigningAlgorithm, bIncludeHeadersInMIC);
-    }
+    // Calculate MIC
+    final MIC aMIC = createMICOnReception (aMsg);
     if (aMIC != null)
       aMDN.attrs ().putIn (AS2MessageMDN.MDNA_MIC, aMIC.getAsAS2String ());