Merge pull request #130 from assimbly/develop

Release 5.0.1
assimbly · Nov 29, 2024 · 62e50e3 · 62e50e3
2 parents 5e329b3 + e44e911
commit 62e50e3
Show file tree

Hide file tree

Showing 59 changed files with 160 additions and 171 deletions.
diff --git a/aggregate/pom.xml b/aggregate/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>custom-components</artifactId>
     <groupId>org.assimbly</groupId>
-	<version>5.0.0</version>
+	<version>5.0.1</version>
   </parent>
 
   <artifactId>aggregate</artifactId>

diff --git a/amazon/pom.xml b/amazon/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>amazon</artifactId>

diff --git a/auth/pom.xml b/auth/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
 	<artifactId>auth</artifactId>

diff --git a/cookies/pom.xml b/cookies/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>cookies</artifactId>

diff --git a/csvtoxml/pom.xml b/csvtoxml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>csvtoxml</artifactId>

diff --git a/docconverter/pom.xml b/docconverter/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>docconverter</artifactId>

diff --git a/edi/pom.xml b/edi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>edi</artifactId>

diff --git a/edifact/pom.xml b/edifact/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
 	<artifactId>edifact</artifactId>

diff --git a/edifactcommon/pom.xml b/edifactcommon/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>edifactcommon</artifactId>

diff --git a/edifactdotweb/pom.xml b/edifactdotweb/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>edifactdotweb</artifactId>

diff --git a/edifactstandards/pom.xml b/edifactstandards/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>edifactstandards</artifactId>

diff --git a/encoder/pom.xml b/encoder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>encoder</artifactId>

diff --git a/enrich/pom.xml b/enrich/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>enrich</artifactId>

diff --git a/enrich/src/main/java/org/assimbly/enrich/zipfile/ZipFileEnrichStrategy.java b/enrich/src/main/java/org/assimbly/enrich/zipfile/ZipFileEnrichStrategy.java
@@ -26,13 +26,18 @@ public class ZipFileEnrichStrategy implements AggregationStrategy {
     public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
         element_names = new ArrayList<>();
 
+        if (newExchange == null) {
+            // there’s no remote file to consume
+            return oldExchange;
+        }
+
         Message in = oldExchange.getIn();
         Message resource = newExchange.getIn();
 
         byte[] sourceZip = in.getBody(byte[].class);
-        byte[] resourceData = resource.getBody(byte[].class);
+        byte[] resourceData = newExchange.getContext().getTypeConverter().convertTo(byte[].class, resource.getBody());
 
-        String fileName = resource.getHeader(Exchange.FILE_NAME, String.class);
+        String fileName = resource.getHeader(Exchange.FILE_NAME_CONSUMED, String.class);
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 

diff --git a/exceltoxml/pom.xml b/exceltoxml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
 	<artifactId>exceltoxml</artifactId>

diff --git a/flv/pom.xml b/flv/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>flv</artifactId>

diff --git a/formtoxml/pom.xml b/formtoxml/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
   <artifactId>formtoxml</artifactId>

diff --git a/googledrive/pom.xml b/googledrive/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
 	<artifactId>googledrive</artifactId>

diff --git a/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveConfiguration.java b/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveConfiguration.java
@@ -22,6 +22,9 @@ public GoogleDriveConfiguration() {
     @UriParam
     protected String directoryId;
 
+    @UriParam
+    protected String flowId;
+
     // consumer options
 
     @UriParam(label = "consumer")
@@ -106,4 +109,12 @@ public String getGSuiteFiles() {
     public void setGSuiteFiles(String gSuiteFiles) {
         this.gSuiteFiles = gSuiteFiles;
     }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
 }
diff --git a/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveConsumer.java b/googledrive/src/main/java/org/assimbly/googledrive/GoogleDriveConsumer.java
@@ -111,7 +111,7 @@ protected int poll() throws Exception {
                 connectionAttempts += 1;
                 service = this.endpoint.getClient(true);
             } else {
-                LOG.error("GoogleJsonResponseException occurred. Connect to Google Drive directory failed:", e);
+                LOG.error("GoogleJsonResponseException occurred. Connect to Google Drive directory failed on flowId: "+configuration.getFlowId(), e);
             }
         }
 

diff --git a/jsontoxmllegacy/pom.xml b/jsontoxmllegacy/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>custom-components</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </parent>
 
     <artifactId>jsontoxmllegacy</artifactId>

diff --git a/mail/pom.xml b/mail/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>custom-components</artifactId>
 		<groupId>org.assimbly</groupId>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 	</parent>
 
 	<artifactId>mail</artifactId>
@@ -31,15 +31,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>jakarta.mail</groupId>
-			<artifactId>jakarta.mail-api</artifactId>
-			<version>${jakarta.mail.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.sun.mail</groupId>
+			<groupId>org.eclipse.angus</groupId>
 			<artifactId>jakarta.mail</artifactId>
-			<version>2.0.1</version>
+			<version>${angus.mail.version}</version>
 		</dependency>
 
 

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailBinding.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailBinding.java
@@ -149,7 +149,7 @@ public void populateMailMessage(MailEndpoint endpoint, MimeMessage mimeMessage,
                 replyToAddresses
                         .add(asEncodedInternetAddress(reply.trim(), determineCharSet(endpoint.getConfiguration(), exchange)));
             }
-            mimeMessage.setReplyTo(replyToAddresses.toArray(new InternetAddress[replyToAddresses.size()]));
+            mimeMessage.setReplyTo(replyToAddresses.toArray(new InternetAddress[0]));
         }
 
         // must have at least one recipients otherwise we do not know where to send the mail
@@ -369,6 +369,10 @@ protected void extractAttachmentsFromMultipart(Multipart mp, Map<String, Attachm
             } else {
                 String disposition = part.getDisposition();
                 String fileName = part.getFileName();
+                // fix file name if using malicious parameter name
+                if (fileName != null) {
+                    fileName = fileName.replaceAll("[\n\r\t]", "_");
+                }
 
                 if (isAttachment(disposition) && (fileName == null || fileName.isEmpty())) {
                     if (generateMissingAttachmentNames != null
@@ -395,7 +399,7 @@ protected void extractAttachmentsFromMultipart(Multipart mp, Map<String, Attachm
                     LOG.trace("Part #{}: LineCount: {}", i, part.getLineCount());
                 }
 
-                if (validDisposition(disposition, fileName) || fileName != null && !fileName.isEmpty()) {
+                if (validDisposition(disposition, fileName) || (fileName != null && !fileName.isEmpty())) {
                     LOG.debug("Mail contains file attachment: {}", fileName);
                     if (handleDuplicateAttachmentNames != null) {
                         if (handleDuplicateAttachmentNames
@@ -831,7 +835,7 @@ private static void appendRecipientToMimeMessage(
         }
 
         mimeMessage.addRecipients(asRecipientType(type),
-                recipientsAddresses.toArray(new InternetAddress[recipientsAddresses.size()]));
+                recipientsAddresses.toArray(new InternetAddress[0]));
     }
 
     private static String[] splitRecipients(String recipients) {
@@ -858,7 +862,7 @@ protected static boolean hasAlternativeBody(MailConfiguration configuration, Exc
 
     protected static String getAlternativeBody(MailConfiguration configuration, Exchange exchange) {
         String alternativeBodyHeader = configuration.getAlternativeBodyHeader();
-        return exchange.getIn().getHeader(alternativeBodyHeader, String.class);
+        return exchange.getIn().getHeader(alternativeBodyHeader, java.lang.String.class);
     }
 
     /**

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailComponent.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailComponent.java
@@ -23,7 +23,6 @@
 
 import jakarta.mail.search.SearchTerm;
 
-import com.sun.mail.imap.SortTerm;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.SSLContextParametersAware;
@@ -32,6 +31,7 @@
 import org.apache.camel.support.HeaderFilterStrategyComponent;
 import org.apache.camel.util.PropertiesHelper;
 import org.apache.camel.util.StringHelper;
+import org.eclipse.angus.mail.imap.SortTerm;
 
 /**
  * Component for JavaMail.

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailConsumer.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailConsumer.java
@@ -33,9 +33,6 @@
 import jakarta.mail.Store;
 import jakarta.mail.search.SearchTerm;
 
-import com.sun.mail.imap.IMAPFolder;
-import com.sun.mail.imap.IMAPStore;
-import com.sun.mail.imap.SortTerm;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
 import org.apache.camel.Processor;
@@ -49,6 +46,9 @@
 import org.apache.camel.util.CastUtils;
 import org.apache.camel.util.KeyValueHolder;
 import org.apache.camel.util.ObjectHelper;
+import org.eclipse.angus.mail.imap.IMAPFolder;
+import org.eclipse.angus.mail.imap.IMAPStore;
+import org.eclipse.angus.mail.imap.SortTerm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailConverters.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailConverters.java
@@ -33,13 +33,13 @@
 import jakarta.mail.internet.MimeMultipart;
 import jakarta.mail.search.SearchTerm;
 
-import com.sun.mail.imap.SortTerm;
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
 import org.apache.camel.TypeConverter;
 import org.apache.camel.spi.TypeConverterRegistry;
 import org.apache.camel.support.ExchangeHelper;
 import org.apache.camel.util.TimeUtils;
+import org.eclipse.angus.mail.imap.SortTerm;
 
 /**
  * JavaMail specific converters.

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpoint.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpoint.java
@@ -19,7 +19,6 @@
 import jakarta.mail.Message;
 import jakarta.mail.search.SearchTerm;
 
-import com.sun.mail.imap.SortTerm;
 import org.apache.camel.Category;
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
@@ -31,6 +30,7 @@
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.ScheduledPollEndpoint;
+import org.eclipse.angus.mail.imap.SortTerm;
 
 import static org.assimbly.mail.component.mail.MailConstants.MAIL_GENERATE_MISSING_ATTACHMENT_NAMES_NEVER;
 import static org.assimbly.mail.component.mail.MailConstants.MAIL_HANDLE_DUPLICATE_ATTACHMENT_NAMES_NEVER;

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpointConfigurer.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailEndpointConfigurer.java
@@ -5,6 +5,7 @@
 import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
+import org.eclipse.angus.mail.imap.SortTerm;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
@@ -124,7 +125,7 @@ public boolean configure(CamelContext camelContext, Object obj, String name, Obj
             case "skipfailedmessage":
             case "skipFailedMessage": target.getConfiguration().setSkipFailedMessage(property(camelContext, boolean.class, value)); return true;
             case "sortterm":
-            case "sortTerm": target.setSortTerm(property(camelContext, com.sun.mail.imap.SortTerm[].class, value)); return true;
+            case "sortTerm": target.setSortTerm(property(camelContext, SortTerm[].class, value)); return true;
             case "sslcontextparameters":
             case "sslContextParameters": target.getConfiguration().setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true;
             case "startscheduler":
@@ -255,7 +256,7 @@ public Class<?> getOptionType(String name, boolean ignoreCase) {
             case "skipfailedmessage":
             case "skipFailedMessage": return boolean.class;
             case "sortterm":
-            case "sortTerm": return com.sun.mail.imap.SortTerm[].class;
+            case "sortTerm": return SortTerm[].class;
             case "sslcontextparameters":
             case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
             case "startscheduler":

diff --git a/mail/src/main/java/org/assimbly/mail/component/mail/MailSorter.java b/mail/src/main/java/org/assimbly/mail/component/mail/MailSorter.java
@@ -24,8 +24,8 @@
 import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.InternetAddress;
+import org.eclipse.angus.mail.imap.SortTerm;
 
-import com.sun.mail.imap.SortTerm;
 
 /**
  * Utility class for sorting of mail messages