You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/11/11 18:03:03 UTC
[camel] branch master updated (131c798 -> 7c7a983)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 131c798 CAMEL-14168 - Regen and fixed adoc
new 6f1b82f Use SecureRandom to generate the as2 message Id
new 80df113 Make sure the temp file is jailed to the tmpdir
new 91a7fb4 Updating Asciidoctor
new 7c7a983 Updating plexus utils
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/component/as2/api/util/AS2Utils.java | 4 ++--
.../main/java/org/apache/camel/component/jira/FileConverter.java | 6 +++++-
parent/pom.xml | 2 +-
tooling/parent/pom.xml | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
[camel] 04/04: Updating plexus utils
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7c7a98326e5c00782bcfaed1125d907d0891f504
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Nov 11 18:02:34 2019 +0000
Updating plexus utils
---
tooling/parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml
index 76bef76..0d72a36 100644
--- a/tooling/parent/pom.xml
+++ b/tooling/parent/pom.xml
@@ -45,7 +45,7 @@
<maven-resolver-version>1.0.3</maven-resolver-version>
<plexus-build-api-version>0.0.7</plexus-build-api-version>
<plexus-container-default-version>1.6</plexus-container-default-version>
- <plexus-utils-version>3.0.22</plexus-utils-version>
+ <plexus-utils-version>3.1.0</plexus-utils-version>
</properties>
<dependencyManagement>
[camel] 01/04: Use SecureRandom to generate the as2 message Id
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f1b82fe708e0facbc8b6b4855861ab09fd10043
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Nov 11 15:15:34 2019 +0000
Use SecureRandom to generate the as2 message Id
---
.../main/java/org/apache/camel/component/as2/api/util/AS2Utils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
index a5d4c40..2e50e67 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/AS2Utils.java
@@ -21,7 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.nio.charset.StandardCharsets;
-import java.util.Random;
+import java.security.SecureRandom;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -53,7 +53,7 @@ public final class AS2Utils {
public static final Pattern AS_NAME_PATTERN = Pattern.compile(AS2_NAME);
- private static Random generator = new Random();
+ private static SecureRandom generator = new SecureRandom();
private AS2Utils() {
}
Re: [camel] 03/04: Updating Asciidoctor
Posted by Andrea Cosentino <an...@gmail.com>.
It seems to be fine. I don't know why we didn't upgrade before :-)
I'll check the camel-website CI build.
Thanks!
Il mar 12 nov 2019, 10:37 Colm O hEigeartaigh <co...@apache.org> ha
scritto:
> Hi Andrea,
>
> "mvn clean install" passed for me locally. Was there anything else I should
> have checked for the docs?
>
> Colm.
>
> On Mon, Nov 11, 2019 at 6:41 PM Andrea Cosentino <an...@gmail.com>
> wrote:
>
> > Did you test everything build fine? This is crucial for the docs
> generated
> > and used on the website.
> >
> > Il lun 11 nov 2019, 19:03 <co...@apache.org> ha scritto:
> >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > coheigea pushed a commit to branch master
> > > in repository https://gitbox.apache.org/repos/asf/camel.git
> > >
> > > commit 91a7fb48e96673ea26d5ecfb4fd72f934f9b8ac7
> > > Author: Colm O hEigeartaigh <co...@apache.org>
> > > AuthorDate: Mon Nov 11 18:02:27 2019 +0000
> > >
> > > Updating Asciidoctor
> > > ---
> > > parent/pom.xml | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/parent/pom.xml b/parent/pom.xml
> > > index a5de5a8..821f3c1 100644
> > > --- a/parent/pom.xml
> > > +++ b/parent/pom.xml
> > > @@ -64,7 +64,7 @@
> > >
> > >
> >
> <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
> > > <arquillian-version>1.5.0.Final</arquillian-version>
> > >
> > >
> >
> <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
> > > - <asciidoctorj-version>1.5.6</asciidoctorj-version>
> > > + <asciidoctorj-version>2.1.0</asciidoctorj-version>
> > > <asm-version>5.0.4</asm-version>
> > > <aspectj-version>1.9.4</aspectj-version>
> > > <assertj-version>3.14.0</assertj-version>
> > >
> > >
> >
>
Re: [camel] 03/04: Updating Asciidoctor
Posted by Colm O hEigeartaigh <co...@apache.org>.
Hi Andrea,
"mvn clean install" passed for me locally. Was there anything else I should
have checked for the docs?
Colm.
On Mon, Nov 11, 2019 at 6:41 PM Andrea Cosentino <an...@gmail.com> wrote:
> Did you test everything build fine? This is crucial for the docs generated
> and used on the website.
>
> Il lun 11 nov 2019, 19:03 <co...@apache.org> ha scritto:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > coheigea pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/camel.git
> >
> > commit 91a7fb48e96673ea26d5ecfb4fd72f934f9b8ac7
> > Author: Colm O hEigeartaigh <co...@apache.org>
> > AuthorDate: Mon Nov 11 18:02:27 2019 +0000
> >
> > Updating Asciidoctor
> > ---
> > parent/pom.xml | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/parent/pom.xml b/parent/pom.xml
> > index a5de5a8..821f3c1 100644
> > --- a/parent/pom.xml
> > +++ b/parent/pom.xml
> > @@ -64,7 +64,7 @@
> >
> >
> <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
> > <arquillian-version>1.5.0.Final</arquillian-version>
> >
> >
> <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
> > - <asciidoctorj-version>1.5.6</asciidoctorj-version>
> > + <asciidoctorj-version>2.1.0</asciidoctorj-version>
> > <asm-version>5.0.4</asm-version>
> > <aspectj-version>1.9.4</aspectj-version>
> > <assertj-version>3.14.0</assertj-version>
> >
> >
>
Re: [camel] 03/04: Updating Asciidoctor
Posted by Andrea Cosentino <an...@gmail.com>.
Did you test everything build fine? This is crucial for the docs generated
and used on the website.
Il lun 11 nov 2019, 19:03 <co...@apache.org> ha scritto:
> This is an automated email from the ASF dual-hosted git repository.
>
> coheigea pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/camel.git
>
> commit 91a7fb48e96673ea26d5ecfb4fd72f934f9b8ac7
> Author: Colm O hEigeartaigh <co...@apache.org>
> AuthorDate: Mon Nov 11 18:02:27 2019 +0000
>
> Updating Asciidoctor
> ---
> parent/pom.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/parent/pom.xml b/parent/pom.xml
> index a5de5a8..821f3c1 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -64,7 +64,7 @@
>
> <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
> <arquillian-version>1.5.0.Final</arquillian-version>
>
> <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
> - <asciidoctorj-version>1.5.6</asciidoctorj-version>
> + <asciidoctorj-version>2.1.0</asciidoctorj-version>
> <asm-version>5.0.4</asm-version>
> <aspectj-version>1.9.4</aspectj-version>
> <assertj-version>3.14.0</assertj-version>
>
>
[camel] 03/04: Updating Asciidoctor
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91a7fb48e96673ea26d5ecfb4fd72f934f9b8ac7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Nov 11 18:02:27 2019 +0000
Updating Asciidoctor
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a5de5a8..821f3c1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -64,7 +64,7 @@
<arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
<arquillian-version>1.5.0.Final</arquillian-version>
<arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
- <asciidoctorj-version>1.5.6</asciidoctorj-version>
+ <asciidoctorj-version>2.1.0</asciidoctorj-version>
<asm-version>5.0.4</asm-version>
<aspectj-version>1.9.4</aspectj-version>
<assertj-version>3.14.0</assertj-version>
[camel] 02/04: Make sure the temp file is jailed to the tmpdir
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 80df11395d45e0a0e27b556bedf80cd18268f4e3
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Nov 11 15:41:01 2019 +0000
Make sure the temp file is jailed to the tmpdir
---
.../main/java/org/apache/camel/component/jira/FileConverter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/FileConverter.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/FileConverter.java
index 6e3bb1c..11048af 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/FileConverter.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/FileConverter.java
@@ -37,7 +37,11 @@ public final class FileConverter {
File file;
if (body instanceof byte[]) {
byte[] bos = (byte[]) body;
- file = new File(System.getProperty("java.io.tmpdir"), genericFile.getFileName());
+ String destDir = System.getProperty("java.io.tmpdir");
+ file = new File(destDir, genericFile.getFileName());
+ if (!file.getCanonicalPath().startsWith(destDir)) {
+ throw new IOException("File is not jailed to the destination directory");
+ }
Files.write(file.toPath(), bos, StandardOpenOption.CREATE);
// delete the temporary file on exit, as other routing may need the file for post processing
file.deleteOnExit();