Github user trixpan commented on a diff in the pull request:
https://github.com/apache/nifi/pull/827#discussion_r74449761
--- Diff:
nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/main/java/org/apache/nifi/processors/email/ListenSMTP.java
---
@@ -31,101 +30,75 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.commons.lang3.StringUtils;
-
-import org.subethamail.smtp.server.SMTPServer;
-
-
-import org.apache.nifi.annotation.lifecycle.OnStopped;
-import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
-import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.processor.DataUnit;
+import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.nifi.annotation.lifecycle.OnScheduled;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessorInitializationContext;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.util.StandardValidators;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import org.apache.commons.io.IOUtils;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.behavior.WritesAttributes;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.annotation.lifecycle.OnStopped;
+import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.AbstractSessionFactoryProcessor;
+import org.apache.nifi.processor.DataUnit;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.ProcessSessionFactory;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.io.OutputStreamCallback;
+import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.ssl.SSLContextService;
-
-import org.apache.nifi.processors.email.smtp.event.SmtpEvent;
-import org.apache.nifi.processors.email.smtp.handler.SMTPResultCode;
-import
org.apache.nifi.processors.email.smtp.handler.SMTPMessageHandlerFactory;
+import org.springframework.util.StringUtils;
+import org.subethamail.smtp.MessageContext;
+import org.subethamail.smtp.server.SMTPServer;
@Tags({"listen", "email", "smtp"})
@InputRequirement(InputRequirement.Requirement.INPUT_FORBIDDEN)
-@CapabilityDescription("This processor implements a lightweight SMTP
server to an arbitrary port, " +
- "allowing nifi to listen for incoming email. " +
- "" +
- "Note this server does not perform any email validation. If direct
exposure to the internet is sought," +
- "it may be a better idea to use the combination of NiFi and an
industrial scale MTA (e.g. Postfix)")
+@CapabilityDescription("This processor implements a lightweight SMTP
server to an arbitrary port, "
+ + "allowing nifi to listen for incoming email. Note this server
does not perform any email "
+ + "validation. If direct exposure to the internet is sought, it
may be a better idea to use "
+ + "the combination of NiFi and an industrial scale MTA (e.g.
Postfix)")
@WritesAttributes({
- @WritesAttribute(attribute = "mime.type", description = "The value
used during HELO"),
- @WritesAttribute(attribute = "smtp.helo", description = "The value
used during HELO"),
- @WritesAttribute(attribute = "smtp.certificates.*.serial",
description = "The serial numbers for each of the " +
- "certificates used by an TLS peer"),
- @WritesAttribute(attribute = "smtp.certificates.*.principal",
description = "The principal for each of the " +
- "certificates used by an TLS peer"),
- @WritesAttribute(attribute = "smtp.from", description = "The value
used during MAIL FROM (i.e. envelope)"),
- @WritesAttribute(attribute = "smtp.to", description = "The value
used during RCPT TO (i.e. envelope)"),
- @WritesAttribute(attribute = "smtp.src", description = "The source
IP of the SMTP connection")})
-
-public class ListenSMTP extends AbstractProcessor {
- public static final String SMTP_HELO = "smtp.helo";
- public static final String SMTP_FROM = "smtp.from";
- public static final String SMTP_TO = "smtp.to";
- public static final String MIME_TYPE = "message/rfc822";
- public static final String SMTP_SRC_IP = "smtp.src";
-
-
- protected static final PropertyDescriptor SMTP_PORT = new
PropertyDescriptor.Builder()
+ @WritesAttribute(attribute = "smtp.helo", description = "The value
used during HELO"),
--- End diff --
@olegz My apologies but I missed the mime type completely...
The original description is wrong but in any case:
This is NOT the mime type of the attachments (these are extracted by
ExtractEmailAttachments)
Instead this was set with a non variable value "message/rfc822" (This is
the standard mime type of a text file containing an email message (which is
what this Listener produces)).
As with previous the addition of mime.type follows the pattern used
everywhere around as seen here:
https://github.com/apache/nifi/search?utf8=%E2%9C%93&q=%40WritesAttribute%28attribute+%3D+%22mime.type%22
Apologies for noting this earlier.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
