Updated Branches: refs/heads/camel-2.11.x 83e0e5ca9 -> 3d93c7fb3 refs/heads/camel-2.12.x 2831c270c -> 87001effc refs/heads/master e4f90c068 -> 8b235e006
CAMEL-6654: Attachments with null filename should not be allowed. Thanks to Christian Posta for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8b235e00 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8b235e00 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8b235e00 Branch: refs/heads/master Commit: 8b235e006da8435c2a9f90b95bbedcdae1786cad Parents: e4f90c0 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Oct 1 10:37:59 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Oct 1 10:37:59 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/mail/MailBinding.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8b235e00/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java index 7fcfb21..e93c49e 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java @@ -321,7 +321,7 @@ public class MailBinding { LOG.trace("Part #{}: LineCount: {}", i, part.getLineCount()); } - if ((disposition != null && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE))) + if (validDisposition(disposition, fileName) || fileName != null) { LOG.debug("Mail contains file attachment: {}", fileName); if (!map.containsKey(fileName)) { @@ -335,6 +335,12 @@ public class MailBinding { } } + private boolean validDisposition(String disposition, String fileName) { + return disposition != null + && fileName != null + && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE)); + } + /** * Appends the Mail headers from the Camel {@link MailMessage} */
