exceptionfactory commented on a change in pull request #5471: URL: https://github.com/apache/nifi/pull/5471#discussion_r738424864
########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") Review comment: Recommend adjusting the wording to indicate `STARTTLS`, and also mention the fallback behavior as described in the [Java Mail API ](https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html)documentation. ```suggestion .description("Flag indicating whether STARTTLS should be enabled. If the server does not support STARTTLS, the connection continues without the use of TLS") ``` ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() Review comment: Recommend removing this property and setting the Content-Type to `text/plain`. Since the service builds the message text using concatenated records, the content will not be HTML. ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.ssl.enable", SMTP_SSL); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_STARTTLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + TO, + FROM, Review comment: Recommend moving `FROM` before `TO` for more natural ordering. ```suggestion FROM, TO, ``` ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.ssl.enable", SMTP_SSL); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_STARTTLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + TO, + FROM, + CC, + BCC, + SUBJECT, + SMTP_HOSTNAME, + SMTP_PORT, + SMTP_USERNAME, + SMTP_PASSWORD, + SMTP_AUTH, + SMTP_STARTTLS, + SMTP_SSL, + HEADER_XMAILER, + CONTENT_TYPE, + RecordSinkService.RECORD_WRITER_FACTORY + )); + } + + @Override + protected Collection<ValidationResult> customValidate(final ValidationContext context) { + final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context)); + + final String to = context.getProperty(TO).getValue(); + final String cc = context.getProperty(CC).getValue(); + final String bcc = context.getProperty(BCC).getValue(); + + if (to == null && cc == null && bcc == null) { + errors.add(new ValidationResult.Builder().subject("To, CC, BCC").valid(false).explanation("Must specify at least one To/CC/BCC address").build()); + } + + return errors; + } + + @OnEnabled + public void onEnabled(final ConfigurationContext context) { + writerFactory = context.getProperty(RECORD_WRITER_FACTORY).asControllerService(RecordSetWriterFactory.class); + } + + private void sendMessage(final ConfigurationContext context, final String messageText) { + final Properties properties = getMailProperties(context); + final Session mailSession = createMailSession(properties); + final Message message = new MimeMessage(mailSession); + + try { + message.setFrom(InternetAddress.parse(context.getProperty(FROM).evaluateAttributeExpressions().getValue())[0]); + + final InternetAddress[] toAddresses = toInetAddresses(context, TO); + message.setRecipients(Message.RecipientType.TO, toAddresses); + + final InternetAddress[] ccAddresses = toInetAddresses(context, CC); + message.setRecipients(Message.RecipientType.CC, ccAddresses); + + final InternetAddress[] bccAddresses = toInetAddresses(context, BCC); + message.setRecipients(Message.RecipientType.BCC, bccAddresses); + + message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions().getValue()); + message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions().getValue()); + + final String contentType = context.getProperty(CONTENT_TYPE).evaluateAttributeExpressions().getValue(); + message.setContent(messageText, contentType); + message.setSentDate(new Date()); + + send(message); + } catch (final ProcessException | MessagingException e) { + throw new RuntimeException("Failed to send E-mail Notification", e); + } + } + + @Override + public WriteResult sendData(final RecordSet recordSet, final Map<String, String> attributes, final boolean sendZeroResults) throws IOException { + WriteResult writeResult; + try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) { + try (final RecordSetWriter writer = writerFactory.createWriter(getLogger(), recordSet.getSchema(), out, attributes)) { + writer.beginRecordSet(); + Record r; + while ((r = recordSet.next()) != null) { + writer.write(r); + writer.flush(); + } + writeResult = writer.finishRecordSet(); + writer.flush(); + sendMessage(getConfigurationContext(), out.toString()); + } + } catch (SchemaNotFoundException e) { + throw new IOException(e); + } + return writeResult; + } + + @Override + public void reset() { + RecordSinkService.super.reset(); + } + + /** + * Wrapper for static method {@link Transport#send(Message)} to add testability of this class. + * + * @param msg the message to send + * @throws MessagingException on error + */ + protected void send(final Message msg) throws MessagingException { + Transport.send(msg); + } + + /** + * Uses the mapping of jakarta.mail properties to NiFi PropertyDescriptors to build the required Properties object to be used for sending this email + * + * @param context context + * @return mail properties + */ + private Properties getMailProperties(final ConfigurationContext context) { + final Properties properties = new Properties(); + + for (Map.Entry<String, PropertyDescriptor> entry : propertyToContext.entrySet()) { + // Evaluate the property descriptor against the variable registry + String property = entry.getKey(); + String propValue = context.getProperty(entry.getValue()).evaluateAttributeExpressions().getValue(); + + // Nullable values are not allowed, so filter out + if (null != propValue) { + properties.setProperty(property, propValue); + } + } + + return properties; + } + + /** + * Based on the input properties, determine whether an authenticate or unauthenticated session should be used. If authenticated, creates a Password Authenticator for use in sending the email. + * + * @param properties mail properties + * @return session + */ + private Session createMailSession(final Properties properties) { + final boolean auth = Boolean.parseBoolean(properties.getProperty("mail.smtp.auth")); + + /* + * Conditionally create a password authenticator if the 'auth' parameter is set. + */ + return auth ? Session.getInstance(properties, new Authenticator() { + @Override + public PasswordAuthentication getPasswordAuthentication() { + final String username = properties.getProperty("mail.smtp.user"); + final String password = properties.getProperty("mail.smtp.password"); + return new PasswordAuthentication(username, password); + } + }) : Session.getInstance(properties); // without auth + } + + /** + * @param context the current context + * @param propertyDescriptor the property to evaluate + * @return an InternetAddress[] parsed from the supplied property + * @throws AddressException if the property cannot be parsed to a valid InternetAddress[] + */ + private InternetAddress[] toInetAddresses(final ConfigurationContext context, PropertyDescriptor propertyDescriptor) throws AddressException { Review comment: Recommend renaming the method to `toInternetAddresses()`, since `InetAddress` is a different kind of object, not used here, but avoids confusion. ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.ssl.enable", SMTP_SSL); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_STARTTLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + TO, + FROM, + CC, + BCC, + SUBJECT, + SMTP_HOSTNAME, + SMTP_PORT, + SMTP_USERNAME, + SMTP_PASSWORD, + SMTP_AUTH, + SMTP_STARTTLS, + SMTP_SSL, + HEADER_XMAILER, + CONTENT_TYPE, + RecordSinkService.RECORD_WRITER_FACTORY + )); + } + + @Override + protected Collection<ValidationResult> customValidate(final ValidationContext context) { + final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context)); + + final String to = context.getProperty(TO).getValue(); + final String cc = context.getProperty(CC).getValue(); + final String bcc = context.getProperty(BCC).getValue(); + + if (to == null && cc == null && bcc == null) { + errors.add(new ValidationResult.Builder().subject("To, CC, BCC").valid(false).explanation("Must specify at least one To/CC/BCC address").build()); + } + + return errors; + } + + @OnEnabled + public void onEnabled(final ConfigurationContext context) { + writerFactory = context.getProperty(RECORD_WRITER_FACTORY).asControllerService(RecordSetWriterFactory.class); + } + + private void sendMessage(final ConfigurationContext context, final String messageText) { + final Properties properties = getMailProperties(context); + final Session mailSession = createMailSession(properties); + final Message message = new MimeMessage(mailSession); + + try { + message.setFrom(InternetAddress.parse(context.getProperty(FROM).evaluateAttributeExpressions().getValue())[0]); + + final InternetAddress[] toAddresses = toInetAddresses(context, TO); + message.setRecipients(Message.RecipientType.TO, toAddresses); + + final InternetAddress[] ccAddresses = toInetAddresses(context, CC); + message.setRecipients(Message.RecipientType.CC, ccAddresses); + + final InternetAddress[] bccAddresses = toInetAddresses(context, BCC); + message.setRecipients(Message.RecipientType.BCC, bccAddresses); + + message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions().getValue()); + message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions().getValue()); + + final String contentType = context.getProperty(CONTENT_TYPE).evaluateAttributeExpressions().getValue(); + message.setContent(messageText, contentType); + message.setSentDate(new Date()); + + send(message); + } catch (final ProcessException | MessagingException e) { + throw new RuntimeException("Failed to send E-mail Notification", e); + } + } + + @Override + public WriteResult sendData(final RecordSet recordSet, final Map<String, String> attributes, final boolean sendZeroResults) throws IOException { + WriteResult writeResult; + try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) { + try (final RecordSetWriter writer = writerFactory.createWriter(getLogger(), recordSet.getSchema(), out, attributes)) { + writer.beginRecordSet(); + Record r; + while ((r = recordSet.next()) != null) { + writer.write(r); + writer.flush(); + } + writeResult = writer.finishRecordSet(); + writer.flush(); + sendMessage(getConfigurationContext(), out.toString()); + } + } catch (SchemaNotFoundException e) { + throw new IOException(e); + } + return writeResult; + } + + @Override + public void reset() { + RecordSinkService.super.reset(); + } + + /** + * Wrapper for static method {@link Transport#send(Message)} to add testability of this class. + * + * @param msg the message to send + * @throws MessagingException on error + */ + protected void send(final Message msg) throws MessagingException { + Transport.send(msg); + } + + /** + * Uses the mapping of jakarta.mail properties to NiFi PropertyDescriptors to build the required Properties object to be used for sending this email + * + * @param context context + * @return mail properties + */ + private Properties getMailProperties(final ConfigurationContext context) { + final Properties properties = new Properties(); + + for (Map.Entry<String, PropertyDescriptor> entry : propertyToContext.entrySet()) { + // Evaluate the property descriptor against the variable registry + String property = entry.getKey(); + String propValue = context.getProperty(entry.getValue()).evaluateAttributeExpressions().getValue(); + + // Nullable values are not allowed, so filter out + if (null != propValue) { + properties.setProperty(property, propValue); + } + } + + return properties; + } + + /** + * Based on the input properties, determine whether an authenticate or unauthenticated session should be used. If authenticated, creates a Password Authenticator for use in sending the email. + * + * @param properties mail properties + * @return session + */ + private Session createMailSession(final Properties properties) { + final boolean auth = Boolean.parseBoolean(properties.getProperty("mail.smtp.auth")); + + /* + * Conditionally create a password authenticator if the 'auth' parameter is set. + */ Review comment: Not sure this comment is necessary, the implementation seems clear enough, and the method comment explains the behavior. ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); Review comment: With the addition of the `mail.smtp.ssl.enable` property, it looks like the `mail.smtps.port` property should also be set according to the [Java Mail API](https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html) documentation. ```suggestion propertyToContext.put("mail.smtp.port", SMTP_PORT); propertyToContext.put("mail.smtps.port", SMTP_PORT); ``` ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + Review comment: Recommend adding the `Tags` and `CapabilityDescription` annotations here for documentation purposes. ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.ssl.enable", SMTP_SSL); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_STARTTLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + TO, + FROM, + CC, + BCC, + SUBJECT, + SMTP_HOSTNAME, + SMTP_PORT, + SMTP_USERNAME, + SMTP_PASSWORD, + SMTP_AUTH, Review comment: Recommend moving AUTH before USERNAME and PASSWORD: ```suggestion SMTP_AUTH, SMTP_USERNAME, SMTP_PASSWORD, ``` ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.ssl.enable", SMTP_SSL); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_STARTTLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + TO, + FROM, + CC, + BCC, + SUBJECT, + SMTP_HOSTNAME, + SMTP_PORT, + SMTP_USERNAME, + SMTP_PASSWORD, + SMTP_AUTH, + SMTP_STARTTLS, + SMTP_SSL, + HEADER_XMAILER, + CONTENT_TYPE, + RecordSinkService.RECORD_WRITER_FACTORY + )); + } + + @Override + protected Collection<ValidationResult> customValidate(final ValidationContext context) { + final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context)); + + final String to = context.getProperty(TO).getValue(); + final String cc = context.getProperty(CC).getValue(); + final String bcc = context.getProperty(BCC).getValue(); + + if (to == null && cc == null && bcc == null) { + errors.add(new ValidationResult.Builder().subject("To, CC, BCC").valid(false).explanation("Must specify at least one To/CC/BCC address").build()); + } + + return errors; + } + + @OnEnabled + public void onEnabled(final ConfigurationContext context) { + writerFactory = context.getProperty(RECORD_WRITER_FACTORY).asControllerService(RecordSetWriterFactory.class); + } + + private void sendMessage(final ConfigurationContext context, final String messageText) { + final Properties properties = getMailProperties(context); + final Session mailSession = createMailSession(properties); + final Message message = new MimeMessage(mailSession); + + try { + message.setFrom(InternetAddress.parse(context.getProperty(FROM).evaluateAttributeExpressions().getValue())[0]); + + final InternetAddress[] toAddresses = toInetAddresses(context, TO); + message.setRecipients(Message.RecipientType.TO, toAddresses); + + final InternetAddress[] ccAddresses = toInetAddresses(context, CC); + message.setRecipients(Message.RecipientType.CC, ccAddresses); + + final InternetAddress[] bccAddresses = toInetAddresses(context, BCC); + message.setRecipients(Message.RecipientType.BCC, bccAddresses); + + message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions().getValue()); + message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions().getValue()); + + final String contentType = context.getProperty(CONTENT_TYPE).evaluateAttributeExpressions().getValue(); + message.setContent(messageText, contentType); + message.setSentDate(new Date()); + + send(message); + } catch (final ProcessException | MessagingException e) { + throw new RuntimeException("Failed to send E-mail Notification", e); + } + } + + @Override + public WriteResult sendData(final RecordSet recordSet, final Map<String, String> attributes, final boolean sendZeroResults) throws IOException { + WriteResult writeResult; + try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) { + try (final RecordSetWriter writer = writerFactory.createWriter(getLogger(), recordSet.getSchema(), out, attributes)) { + writer.beginRecordSet(); + Record r; + while ((r = recordSet.next()) != null) { + writer.write(r); + writer.flush(); + } + writeResult = writer.finishRecordSet(); + writer.flush(); + sendMessage(getConfigurationContext(), out.toString()); + } + } catch (SchemaNotFoundException e) { + throw new IOException(e); Review comment: Recommend adding a message to this `IOException` for better troubleshooting. Actually, should this be a ProcessException instead since it is more of runtime behavior issue that an IO issue? ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,381 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("from") + .displayName("From") + .description("Specifies the Email address to use as the sender. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("to") + .displayName("To") + .description("The recipients to include in the To-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("cc") + .displayName("CC") + .description("The recipients to include in the CC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("bcc") + .displayName("BCC") + .description("The recipients to include in the BCC-Line of the email. " + + "Comma separated sequence of addresses following RFC822 syntax.") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("subject") + .displayName("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("smtp-hostname") + .displayName("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("smtp-port") + .displayName("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("smtp-auth") + .displayName("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("smtp-username") + .displayName("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("smtp-password") + .displayName("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .dependsOn(SMTP_AUTH, "true") + .build(); + public static final PropertyDescriptor SMTP_STARTTLS = new PropertyDescriptor.Builder() + .name("smtp-starttls") + .displayName("SMTP STARTTLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SSL = new PropertyDescriptor.Builder() + .name("smtp-ssl") + .displayName("SMTP SSL") + .description("Flag indicating whether SSL should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("smtp-xmailer-header") + .displayName("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("content-type") + .displayName("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.ssl.enable", SMTP_SSL); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_STARTTLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + TO, + FROM, + CC, + BCC, + SUBJECT, + SMTP_HOSTNAME, + SMTP_PORT, + SMTP_USERNAME, + SMTP_PASSWORD, + SMTP_AUTH, + SMTP_STARTTLS, + SMTP_SSL, + HEADER_XMAILER, + CONTENT_TYPE, + RecordSinkService.RECORD_WRITER_FACTORY + )); + } + + @Override + protected Collection<ValidationResult> customValidate(final ValidationContext context) { + final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context)); + + final String to = context.getProperty(TO).getValue(); + final String cc = context.getProperty(CC).getValue(); + final String bcc = context.getProperty(BCC).getValue(); + + if (to == null && cc == null && bcc == null) { + errors.add(new ValidationResult.Builder().subject("To, CC, BCC").valid(false).explanation("Must specify at least one To/CC/BCC address").build()); + } + + return errors; + } + + @OnEnabled + public void onEnabled(final ConfigurationContext context) { + writerFactory = context.getProperty(RECORD_WRITER_FACTORY).asControllerService(RecordSetWriterFactory.class); + } + + private void sendMessage(final ConfigurationContext context, final String messageText) { + final Properties properties = getMailProperties(context); + final Session mailSession = createMailSession(properties); + final Message message = new MimeMessage(mailSession); + + try { + message.setFrom(InternetAddress.parse(context.getProperty(FROM).evaluateAttributeExpressions().getValue())[0]); + + final InternetAddress[] toAddresses = toInetAddresses(context, TO); + message.setRecipients(Message.RecipientType.TO, toAddresses); + + final InternetAddress[] ccAddresses = toInetAddresses(context, CC); + message.setRecipients(Message.RecipientType.CC, ccAddresses); + + final InternetAddress[] bccAddresses = toInetAddresses(context, BCC); + message.setRecipients(Message.RecipientType.BCC, bccAddresses); + + message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions().getValue()); + message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions().getValue()); + + final String contentType = context.getProperty(CONTENT_TYPE).evaluateAttributeExpressions().getValue(); + message.setContent(messageText, contentType); + message.setSentDate(new Date()); + + send(message); + } catch (final ProcessException | MessagingException e) { + throw new RuntimeException("Failed to send E-mail Notification", e); Review comment: It might be helpful to include the SMTP host and port properties as part of the message for tracking purposes. ```suggestion final String message = String.format("Send Failed using SMTP Host [%s] Port [%s]", properties.get("mail.smtp.host"), properties.get("mail.smtp.port")); throw new RuntimeException(message, e); ``` ########## File path: nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/main/java/org/apache/nifi/record/sink/EmailRecordSink.java ########## @@ -0,0 +1,360 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.record.sink; + +import org.apache.nifi.annotation.lifecycle.OnEnabled; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.ValidationContext; +import org.apache.nifi.components.ValidationResult; +import org.apache.nifi.controller.AbstractControllerService; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.expression.ExpressionLanguageScope; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.schema.access.SchemaNotFoundException; +import org.apache.nifi.serialization.RecordSetWriter; +import org.apache.nifi.serialization.RecordSetWriterFactory; +import org.apache.nifi.serialization.WriteResult; +import org.apache.nifi.serialization.record.Record; +import org.apache.nifi.serialization.record.RecordSet; + +import javax.mail.Authenticator; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.PasswordAuthentication; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +public class EmailRecordSink extends AbstractControllerService implements RecordSinkService { + + public static final PropertyDescriptor SMTP_HOSTNAME = new PropertyDescriptor.Builder() + .name("SMTP Hostname") + .description("The hostname of the SMTP Server that is used to send Email Notifications") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(true) + .build(); + public static final PropertyDescriptor SMTP_PORT = new PropertyDescriptor.Builder() + .name("SMTP Port") + .description("The Port used for SMTP communications") + .required(true) + .defaultValue("25") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.PORT_VALIDATOR) + .build(); + public static final PropertyDescriptor SMTP_USERNAME = new PropertyDescriptor.Builder() + .name("SMTP Username") + .description("Username for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .build(); + public static final PropertyDescriptor SMTP_PASSWORD = new PropertyDescriptor.Builder() + .name("SMTP Password") + .description("Password for the SMTP account") + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .required(false) + .sensitive(true) + .build(); + public static final PropertyDescriptor SMTP_AUTH = new PropertyDescriptor.Builder() + .name("SMTP Auth") + .description("Flag indicating whether authentication should be used") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("true") + .build(); + public static final PropertyDescriptor SMTP_TLS = new PropertyDescriptor.Builder() + .name("SMTP TLS") + .description("Flag indicating whether TLS should be enabled") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.BOOLEAN_VALIDATOR) + .defaultValue("false") + .build(); + public static final PropertyDescriptor SMTP_SOCKET_FACTORY = new PropertyDescriptor.Builder() + .name("SMTP Socket Factory") + .description("Socket Factory to use for SMTP Connection") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("javax.net.ssl.SSLSocketFactory") + .build(); + public static final PropertyDescriptor HEADER_XMAILER = new PropertyDescriptor.Builder() + .name("SMTP X-Mailer Header") + .description("X-Mailer used in the header of the outgoing email") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("NiFi") + .build(); + public static final PropertyDescriptor CONTENT_TYPE = new PropertyDescriptor.Builder() + .name("Content Type") + .description("Mime Type used to interpret the contents of the email, such as text/plain or text/html") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .defaultValue("text/plain") + .build(); + public static final PropertyDescriptor FROM = new PropertyDescriptor.Builder() + .name("From") + .description("Specifies the Email address to use as the sender") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor TO = new PropertyDescriptor.Builder() + .name("To") + .description("The recipients to include in the To-Line of the email") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor CC = new PropertyDescriptor.Builder() + .name("CC") + .description("The recipients to include in the CC-Line of the email") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor BCC = new PropertyDescriptor.Builder() + .name("BCC") + .description("The recipients to include in the BCC-Line of the email") + .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + public static final PropertyDescriptor SUBJECT = new PropertyDescriptor.Builder() + .name("Subject") + .description("The email subject") + .required(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .defaultValue("Message from NiFi") + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .build(); + + private volatile RecordSetWriterFactory writerFactory; + + /** + * Mapping of the mail properties to the NiFi PropertyDescriptors that will be evaluated at runtime + */ + private static final Map<String, PropertyDescriptor> propertyToContext = new HashMap<>(); + + static { + propertyToContext.put("mail.smtp.host", SMTP_HOSTNAME); + propertyToContext.put("mail.smtp.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.port", SMTP_PORT); + propertyToContext.put("mail.smtp.socketFactory.class", SMTP_SOCKET_FACTORY); + propertyToContext.put("mail.smtp.auth", SMTP_AUTH); + propertyToContext.put("mail.smtp.starttls.enable", SMTP_TLS); + propertyToContext.put("mail.smtp.user", SMTP_USERNAME); + propertyToContext.put("mail.smtp.password", SMTP_PASSWORD); + } + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + return Collections.unmodifiableList(Arrays.asList( + RecordSinkService.RECORD_WRITER_FACTORY, + SMTP_HOSTNAME, + SMTP_PORT, + SMTP_USERNAME, + SMTP_PASSWORD, + SMTP_AUTH, + SMTP_TLS, + SMTP_SOCKET_FACTORY, + HEADER_XMAILER, + CONTENT_TYPE, + FROM, + TO, + CC, + BCC, + SUBJECT + )); + } + + @Override + protected Collection<ValidationResult> customValidate(final ValidationContext context) { + final List<ValidationResult> errors = new ArrayList<>(super.customValidate(context)); + + final String to = context.getProperty(TO).getValue(); + final String cc = context.getProperty(CC).getValue(); + final String bcc = context.getProperty(BCC).getValue(); + + if (to == null && cc == null && bcc == null) { + errors.add(new ValidationResult.Builder().subject("To, CC, BCC").valid(false).explanation("Must specify at least one To/CC/BCC address").build()); + } + + return errors; + } + + @OnEnabled + public void onEnabled(final ConfigurationContext context) { + writerFactory = context.getProperty(RECORD_WRITER_FACTORY).asControllerService(RecordSetWriterFactory.class); + } + + public void sendMessage(final ConfigurationContext context, final String messageText) { + final Properties properties = getMailProperties(context); + final Session mailSession = createMailSession(properties); + final Message message = new MimeMessage(mailSession); + + try { + message.setFrom(InternetAddress.parse(context.getProperty(FROM).evaluateAttributeExpressions().getValue())[0]); + + final InternetAddress[] toAddresses = toInetAddresses(context, TO); + message.setRecipients(Message.RecipientType.TO, toAddresses); + + final InternetAddress[] ccAddresses = toInetAddresses(context, CC); + message.setRecipients(Message.RecipientType.CC, ccAddresses); + + final InternetAddress[] bccAddresses = toInetAddresses(context, BCC); + message.setRecipients(Message.RecipientType.BCC, bccAddresses); + + message.setHeader("X-Mailer", context.getProperty(HEADER_XMAILER).evaluateAttributeExpressions().getValue()); + message.setSubject(context.getProperty(SUBJECT).evaluateAttributeExpressions().getValue()); + + final String contentType = context.getProperty(CONTENT_TYPE).evaluateAttributeExpressions().getValue(); + message.setContent(messageText, contentType); + message.setSentDate(new Date()); + + send(message); + } catch (final ProcessException | MessagingException e) { + throw new RuntimeException("Failed to send E-mail Notification", e); + } + } + + @Override + public WriteResult sendData(RecordSet recordSet, Map<String, String> attributes, boolean sendZeroResults) throws IOException { + WriteResult writeResult; + try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) { + try (final RecordSetWriter writer = writerFactory.createWriter(getLogger(), recordSet.getSchema(), out, attributes)) { + writer.beginRecordSet(); + Record r; + while ((r = recordSet.next()) != null) { + writer.write(r); + writer.flush(); + } + writeResult = writer.finishRecordSet(); + writer.flush(); + sendMessage(getConfigurationContext(), out.toString()); + } + } catch (SchemaNotFoundException e) { + throw new IOException(e); + } + return writeResult; + } + + @Override + public void reset() { + RecordSinkService.super.reset(); + } + + /** + * Wrapper for static method {@link Transport#send(Message)} to add testability of this class. + * + * @param msg the message to send + * @throws MessagingException on error + */ + protected void send(final Message msg) throws MessagingException { + Transport.send(msg); + } + + /** + * Uses the mapping of javax.mail properties to NiFi PropertyDescriptors to build the required Properties object to be used for sending this email + * + * @param context context + * @return mail properties + */ + private Properties getMailProperties(final ConfigurationContext context) { + final Properties properties = new Properties(); + + for (Map.Entry<String, PropertyDescriptor> entry : propertyToContext.entrySet()) { + // Evaluate the property descriptor against the variable registry + String property = entry.getKey(); + String propValue = context.getProperty(entry.getValue()).evaluateAttributeExpressions().getValue(); + + // Nullable values are not allowed, so filter out + if (null != propValue) { Review comment: Although the property values are validated, the expression language evaluation could still result in an empty string, so recommend using something like StringUtils.isNotBlank(). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@nifi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
