You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by mc...@apache.org on 2020/12/15 18:12:03 UTC
[incubator-hop] branch master updated: Added support to TLS 1.2 in
Mail Action and Mail Transform
This is an automated email from the ASF dual-hosted git repository.
mcasters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 608bc28 Added support to TLS 1.2 in Mail Action and Mail Transform
new a9179ab Merge pull request #471 from sramazzina/master
608bc28 is described below
commit 608bc2803285d9fb9cccf7cbf03b9c0cf93116ad
Author: sramazzina <se...@serasoft.it>
AuthorDate: Tue Dec 15 12:50:00 2020 +0100
Added support to TLS 1.2 in Mail Action and Mail Transform
---
.../main/java/org/apache/hop/workflow/actions/mail/ActionMail.java | 4 ++++
.../java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java | 2 ++
.../src/main/java/org/apache/hop/pipeline/transforms/mail/Mail.java | 4 ++++
.../main/java/org/apache/hop/pipeline/transforms/mail/MailDialog.java | 2 ++
4 files changed, 12 insertions(+)
diff --git a/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMail.java b/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMail.java
index 462cad5..6233b72 100644
--- a/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMail.java
+++ b/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMail.java
@@ -646,6 +646,10 @@ public class ActionMail extends ActionBase implements Cloneable, IAction {
if ( secureConnectionType.equals( "TLS" ) ) {
// Allow TLS authentication
props.put( "mail.smtp.starttls.enable", "true" );
+ } else if (secureConnectionType.equals("TLS 1.2")) {
+ // Allow TLS 1.2 authentication
+ props.put("mail.smtp.starttls.enable", "true");
+ props.put("mail.smtp.ssl.protocols", "TLSv1.2");
} else {
protocol = "smtps";
diff --git a/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java b/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java
index 3e433b3..68aaf22 100644
--- a/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java
+++ b/plugins/actions/mail/src/main/java/org/apache/hop/workflow/actions/mail/ActionMailDialog.java
@@ -504,6 +504,8 @@ public class ActionMailDialog extends ActionDialog implements IActionDialog {
wSecureConnectionType.setLayoutData(fdSecureConnectionType);
wSecureConnectionType.add( "SSL" );
wSecureConnectionType.add( "TLS" );
+ // Add support for TLS 1.2
+ wSecureConnectionType.add( "TLS 1.2" );
wSecureConnectionType.addSelectionListener( new SelectionAdapter() {
public void widgetSelected( SelectionEvent e ) {
setSecureConnectiontype();
diff --git a/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/Mail.java b/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/Mail.java
index 0f88b49..ef21d4f 100644
--- a/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/Mail.java
+++ b/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/Mail.java
@@ -520,6 +520,10 @@ public class Mail extends BaseTransform<MailMeta, MailData> implements ITransfor
if ( meta.getSecureConnectionType().equals( "TLS" ) ) {
// Allow TLS authentication
data.props.put( "mail.smtp.starttls.enable", "true" );
+ } else if (meta.getSecureConnectionType().equals("TLS 1.2")) {
+ // Allow TLS 1.2 authentication
+ data.props.put("mail.smtp.starttls.enable", "true");
+ data.props.put("mail.smtp.ssl.protocols", "TLSv1.2");
} else {
protocol = "smtps";
// required to get rid of a SSL exception :
diff --git a/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/MailDialog.java b/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/MailDialog.java
index 5c7b9ce..89f2eaf 100644
--- a/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/MailDialog.java
+++ b/plugins/transforms/mail/src/main/java/org/apache/hop/pipeline/transforms/mail/MailDialog.java
@@ -794,6 +794,8 @@ public class MailDialog extends BaseTransformDialog implements ITransformDialog
wSecureConnectionType.setLayoutData(fdSecureConnectionType);
wSecureConnectionType.add( "SSL" );
wSecureConnectionType.add( "TLS" );
+ // Add support for TLS 1.2
+ wSecureConnectionType.add( "TLS 1.2" );
wSecureConnectionType.addSelectionListener( new SelectionAdapter() {
public void widgetSelected( SelectionEvent e ) {
setSecureConnectiontype();